diff --git a/shell/view/devices/battery.py b/shell/view/devices/battery.py
index 8ba9aec9..09c69df4 100644
--- a/shell/view/devices/battery.py
+++ b/shell/view/devices/battery.py
@@ -50,7 +50,7 @@ class DeviceView(CanvasIcon):
         # Update palette
         if self._model.props.charging:
             status = _STATUS_CHARGING
-            self.props.badge_name = 'badge-charging'
+            self.props.badge_name = 'emblem-charging'
         elif self._model.props.discharging:
             status = _STATUS_DISCHARGING
             self.props.badge_name = None
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index efc4513d..86daac58 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -71,9 +71,9 @@ class AccessPointView(PulsingIcon):
         # Update badge
         caps = model.props.capabilities
         if model.get_nm_network().is_favorite():
-            self.props.badge_name = "badge-star"
+            self.props.badge_name = "emblem-star"
         elif (caps & NM_802_11_CAP_PROTO_WEP) or (caps & NM_802_11_CAP_PROTO_WPA) or (caps & NM_802_11_CAP_PROTO_WPA2):
-            self.props.badge_name = "badge-locked"
+            self.props.badge_name = "emblem-locked"
 
     def _create_palette(self):
         p = palette.Palette(self._model.props.name, menu_after_content=True)