diff --git a/shell/view/devices/network/mesh.py b/shell/view/devices/network/mesh.py
index 81c9914e..0ce4e718 100644
--- a/shell/view/devices/network/mesh.py
+++ b/shell/view/devices/network/mesh.py
@@ -16,14 +16,14 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 from sugar import profile
-from sugar.graphics import canvasicon
+from sugar.graphics.icon import CanvasIcon
 from sugar.graphics import style
 from model.devices import device
 
-class DeviceView(canvasicon.CanvasIcon):
+class DeviceView(CanvasIcon):
     def __init__(self, model):
-        canvasicon.CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE,
-                                       icon_name='network-mesh')
+        CanvasIcon.__init__(self, size=style.MEDIUM_ICON_SIZE,
+                            icon_name='network-mesh')
         self._model = model
 
         model.connect('notify::state', self._state_changed_cb)
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index e3f0c0fe..4d6bde48 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -145,24 +145,24 @@ class MeshDeviceView(PulsingIcon):
         if state == nmclient.DEVICE_STATE_ACTIVATING:
             self.props.pulse_time = 0.75
             self.props.colors = [
-                [ style.Color(self._device_stroke),
-                  style.Color(self._device_fill) ],
-                [ style.Color(self._device_stroke),
-                  style.Color('#e2e2e2') ]
+                [ style.Color(self._device_stroke).get_svg(),
+                  style.Color(self._device_fill).get_svg() ],
+                [ style.Color(self._device_stroke).get_svg(),
+                  '#e2e2e2' ]
             ]
         elif state == nmclient.DEVICE_STATE_ACTIVATED:
             self.props.pulse_time = 1.5
             self.props.colors = [
-                [ style.Color(self._device_stroke),
-                  style.Color(self._device_fill) ],
-                [ style.Color('#ffffff'),
-                  style.Color(self._device_fill) ]
+                [ style.Color(self._device_stroke).get_svg(),
+                  style.Color(self._device_fill).get_svg() ],
+                [ '#ffffff',
+                  style.Color(self._device_fill).get_svg() ]
             ]
         elif state == nmclient.DEVICE_STATE_INACTIVE:
             self.props.pulse_time = 0.0
             self.props.colors = [
-                [ style.Color(self._device_stroke),
-                  style.Color(self._device_fill) ]
+                [ style.Color(self._device_stroke).get_svg(),
+                  style.Color(self._device_fill).get_svg() ]
             ]
 
 class ActivityView(hippo.CanvasBox):