diff --git a/data/css/default.css b/data/css/default.css
index 2fc321bb..d7b680eb 100644
--- a/data/css/default.css
+++ b/data/css/default.css
@@ -31,6 +31,19 @@
     padding-left: 5px;
 }
 
+.wf-panel .battery overlay label {
+--bcol: rgb(from currentcolor calc(255 - r) calc(255 - g) calc(255 - b) );
+text-shadow: 1px  1px 0 var(--bcol),
+            -1px -1px 0 var(--bcol),
+            -1px  1px 0 var(--bcol),
+             1px -1px 0 var(--bcol),
+             0px  1px 0 var(--bcol),
+             0px -1px 0 var(--bcol),
+            -1px  0px 0 var(--bcol),
+             1px  0px 0 var(--bcol);
+	font-weight:bold;
+}
+
 .wf-panel .notification .time {
     padding-left: 5px;
     padding-right: 5px;
diff --git a/metadata/panel.xml b/metadata/panel.xml
index 0315f5cd..94891f1a 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -127,6 +127,10 @@
 			<value>full</value>
 			<_name>Full Information</_name>
 		</desc>
+		<desc>
+			<value>percentage_overlay</value>
+			<_name>Percentage over Icon</_name>
+		</desc>
 	</option>
 	<option name="battery_icon_size" type="int">
 		<_short>Battery Icon Size</_short>
diff --git a/src/panel/widgets/battery.cpp b/src/panel/widgets/battery.cpp
index 4b7d2008..b6a9da1c 100644
--- a/src/panel/widgets/battery.cpp
+++ b/src/panel/widgets/battery.cpp
@@ -145,9 +145,18 @@ void WayfireBatteryInfo::update_details()
     if (status_opt.value() == BATTERY_STATUS_PERCENT)
     {
         label.set_text(percentage_string);
+        overlay.remove_overlay(label);
+        button_box.append(label);
     } else if (status_opt.value() == BATTERY_STATUS_FULL)
     {
         label.set_text(description);
+        overlay.remove_overlay(label);
+        button_box.append(label);
+    } else if (status_opt.value() == BATTERY_STATUS_OVERLAY)
+    {
+        label.set_text(percentage_string);
+        button_box.remove(label);
+        overlay.add_overlay(label);
     }
 
     if (status_opt.value() == BATTERY_STATUS_ICON)
@@ -215,7 +224,8 @@ void WayfireBatteryInfo::init(Gtk::Box *container)
         return;
     }
 
-    button_box.append(icon);
+    button_box.append(overlay);
+    overlay.set_child(icon);
     icon.add_css_class("widget-icon");
     button.add_css_class("battery");
     button.add_css_class("flat");
diff --git a/src/panel/widgets/battery.hpp b/src/panel/widgets/battery.hpp
index d2b1e7d0..bf0d883d 100644
--- a/src/panel/widgets/battery.hpp
+++ b/src/panel/widgets/battery.hpp
@@ -4,6 +4,7 @@
 #include <gtkmm/image.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
+#include <gtkmm/overlay.h>
 
 #include <giomm/dbusproxy.h>
 #include <giomm/dbusconnection.h>
@@ -18,6 +19,7 @@ using DBusProxy = Glib::RefPtr<Gio::DBus::Proxy>;
 static const std::string BATTERY_STATUS_ICON    = "icon"; // icon
 static const std::string BATTERY_STATUS_PERCENT = "percentage"; // icon + percentage
 static const std::string BATTERY_STATUS_FULL    = "full"; // icon + percentage + TimeToFull/TimeToEmpty
+static const std::string BATTERY_STATUS_OVERLAY = "percentage_overlay";
 
 class wayfire_config;
 class WayfireBatteryInfo : public WayfireWidget
@@ -29,6 +31,7 @@ class WayfireBatteryInfo : public WayfireWidget
     Gtk::Button button;
     Gtk::Label label;
     Gtk::Box button_box;
+    Gtk::Overlay overlay;
 
     Gtk::Image icon;