Replace "Battery Monitor" by "Power Manager Plugin" (MR 8)

config/gtk-3.0/gtk.css

@@ -2,3 +2,6 @@
     -gtk-icon-transform: scale(.6);
 }
 
+#xfce4-power-manager-plugin * {
+    -gtk-icon-transform: scale(.65);
+}

config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -19,6 +19,7 @@
         <value type="int" value="6"/>
         <value type="int" value="7"/>
         <value type="int" value="8"/>
+        <value type="int" value="9"/>
       </property>
       <property name="autohide-behavior" type="uint" value="0"/>
     </property>
@@ -50,8 +51,11 @@
     <property name="plugin-6" type="string" value="pulseaudio">
       <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
     </property>  
-    <property name="plugin-7" type="string" value="battery"/>
-    <property name="plugin-8" type="string" value="clock">
+    <property name="plugin-7" type="string" value="power-manager-plugin"/>
+    <property name="plugin-8" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-9" type="string" value="clock">
       <property name="digital-format" type="string" value="%_H:%M"/>
     </property>
     <property name="plugin-10" type="string" value="showdesktop"/>

config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml

@@ -4,5 +4,7 @@
   <property name="xfce4-power-manager" type="empty">
     <property name="brightness-switch-restore-on-exit" type="int" value="-1"/>
     <property name="brightness-switch" type="int" value="0"/>
+    <property name="show-tray-icon" type="bool" value="false"/>
+    <property name="show-panel-label" type="int" value="1"/>
   </property>
 </channel>