diff --git a/shell/view/devices/battery.py b/shell/view/devices/battery.py
index ec971a54..8ba9aec9 100644
--- a/shell/view/devices/battery.py
+++ b/shell/view/devices/battery.py
@@ -14,9 +14,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+from gettext import gettext as _
+
 import gtk
 
-from gettext import gettext as _
+from sugar import profile
 from sugar.graphics.icon import CanvasIcon
 from sugar.graphics.icon import get_icon_state
 from sugar.graphics import style
@@ -30,7 +32,8 @@ _STATUS_FULLY_CHARGED = 2
 
 class DeviceView(CanvasIcon):
     def __init__(self, model):
-        CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE)
+        CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE,
+                            xo_color=profile.get_color())
         self._model = model
         self._palette = BatteryPalette(_('My Battery life'))
         self.set_palette(self._palette)
diff --git a/shell/view/devices/network/mesh.py b/shell/view/devices/network/mesh.py
index f8f394a4..81c9914e 100644
--- a/shell/view/devices/network/mesh.py
+++ b/shell/view/devices/network/mesh.py
@@ -15,6 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+from sugar import profile
 from sugar.graphics import canvasicon
 from sugar.graphics import style
 from model.devices import device
@@ -22,7 +23,7 @@ from model.devices import device
 class DeviceView(canvasicon.CanvasIcon):
     def __init__(self, model):
         canvasicon.CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE,
-                icon_name='network-mesh')
+                                       icon_name='network-mesh')
         self._model = model
 
         model.connect('notify::state', self._state_changed_cb)
@@ -38,8 +39,7 @@ class DeviceView(canvasicon.CanvasIcon):
             self.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
             self.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()
         elif state == device.STATE_ACTIVATED:
-            self.props.fill_color = None
-            self.props.stroke_color = None
+            self.props.xo_color = profile.get_color()
         elif state == device.STATE_INACTIVE:
             self.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
             self.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()