diff --git a/Services/BatteryService.qml b/Services/BatteryService.qml
index 5b1c478..ce36be2 100644
--- a/Services/BatteryService.qml
+++ b/Services/BatteryService.qml
@@ -10,20 +10,20 @@ Singleton {
   // Choose icon based on charge and charging state
   function getIcon(percent, charging, isReady) {
     if (!isReady) {
-      return Bootstrap.icons["battery_empty"] // FIXME: find battery error ?
+      return Bootstrap.icons["battery"] // FIXME: find battery error ?
     }
 
     if (charging) {
-      return Bootstrap.icons["battery_charging"]
+      return Bootstrap.icons["battery-charging"]
     } else {
       if (percent >= 85)
-        return Bootstrap.icons["battery_full"]
+        return Bootstrap.icons["battery-full"]
       if (percent >= 45)
-        return Bootstrap.icons["battery_half"]
+        return Bootstrap.icons["battery-half"]
       if (percent >= 25)
-        return Bootstrap.icons["battery_low"]
+        return Bootstrap.icons["battery-low"]
       if (percent >= 0)
-        return Bootstrap.icons["battery_empty"]
+        return Bootstrap.icons["battery"]
     }
   }
 }
diff --git a/Services/BluetoothService.qml b/Services/BluetoothService.qml
index bb071a8..9b12ebc 100644
--- a/Services/BluetoothService.qml
+++ b/Services/BluetoothService.qml
@@ -49,39 +49,38 @@ Singleton {
                         })
   }
 
-  // FIXME
   function getDeviceIcon(device) {
     if (!device) {
-      return "bluetooth"
+      return Bootstrap.icons["bluetooth"]
     }
 
     var name = (device.name || device.deviceName || "").toLowerCase()
     var icon = (device.icon || "").toLowerCase()
     if (icon.includes("headset") || icon.includes("audio") || name.includes("headphone") || name.includes("airpod")
         || name.includes("headset") || name.includes("arctis")) {
-      return "headset"
+      return Bootstrap.icons["headset"]
     }
 
     if (icon.includes("mouse") || name.includes("mouse")) {
-      return "mouse"
+      return Bootstrap.icons["mouse-2"]
     }
     if (icon.includes("keyboard") || name.includes("keyboard")) {
-      return "keyboard"
+      return Bootstrap.icons["keyboard"]
     }
     if (icon.includes("phone") || name.includes("phone") || name.includes("iphone") || name.includes("android")
         || name.includes("samsung")) {
-      return "smartphone"
+      return Bootstrap.icons["phone"]
     }
     if (icon.includes("watch") || name.includes("watch")) {
-      return "watch"
+      return Bootstrap.icons["smartwatch"]
     }
     if (icon.includes("speaker") || name.includes("speaker")) {
-      return "speaker"
+      return Bootstrap.icons["speaker"]
     }
     if (icon.includes("display") || name.includes("tv")) {
-      return "tv"
+      return Bootstrap.icons["tv"]
     }
-    return "bluetooth"
+    return Bootstrap.icons["bluetooth"]
   }
 
   function canConnect(device) {