diff --git a/shell/view/devices/battery.py b/shell/view/devices/battery.py
index 16863d39..cdd2e788 100644
--- a/shell/view/devices/battery.py
+++ b/shell/view/devices/battery.py
@@ -21,7 +21,7 @@ from sugar.graphics import canvasicon
 from sugar.graphics import style
 from sugar.graphics.palette import Palette
 
-_ICON_NAME = 'device-battery'
+_ICON_NAME = 'battery'
 
 _STATUS_CHARGING = 0
 _STATUS_DISCHARGING = 1
diff --git a/shell/view/devices/network/mesh.py b/shell/view/devices/network/mesh.py
index 1f108cb0..10830f2a 100644
--- a/shell/view/devices/network/mesh.py
+++ b/shell/view/devices/network/mesh.py
@@ -22,7 +22,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='theme:device-network-mesh')
+                icon_name='theme:network-mesh')
         self._model = model
 
         model.connect('notify::state', self._state_changed_cb)
diff --git a/shell/view/devices/network/wireless.py b/shell/view/devices/network/wireless.py
index 0be096d0..9f0abd8b 100644
--- a/shell/view/devices/network/wireless.py
+++ b/shell/view/devices/network/wireless.py
@@ -22,7 +22,7 @@ from model.devices.network import wireless
 from sugar.graphics.canvasicon import CanvasIcon
 from model.devices import device
 
-_ICON_NAME = 'device-network-wireless'
+_ICON_NAME = 'network-wireless'
 
 class DeviceView(CanvasIcon):
     def __init__(self, model):
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index e632770a..ff6d2907 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -36,7 +36,7 @@ from view.BuddyIcon import BuddyIcon
 from view.pulsingicon import PulsingIcon
 from view.home.snowflakelayout import SnowflakeLayout
 
-_ICON_NAME = 'device-network-wireless'
+_ICON_NAME = 'network-wireless'
 
 class AccessPointView(PulsingIcon):
     def __init__(self, model):
@@ -116,7 +116,7 @@ class AccessPointView(PulsingIcon):
             ]
 
 
-_MESH_ICON_NAME = 'theme:device-network-mesh'
+_MESH_ICON_NAME = 'theme:network-mesh'
 
 class MeshDeviceView(PulsingIcon):
     def __init__(self, nm_device):