diff --git a/Modules/Bar/Widgets/Bluetooth.qml b/Modules/Bar/Widgets/Bluetooth.qml
index 760745c..a993aec 100644
--- a/Modules/Bar/Widgets/Bluetooth.qml
+++ b/Modules/Bar/Widgets/Bluetooth.qml
@@ -20,7 +20,7 @@ NIconButton {
   colorBorder: Color.transparent
   colorBorderHover: Color.transparent
 
-  icon: "bluetooth"
+  icon: FontService.icons["bluetooth"]
   tooltipText: "Bluetooth"
   onClicked: PanelService.getPanel("bluetoothPanel")?.toggle(screen, this)
 }
diff --git a/Modules/BluetoothPanel/BluetoothPanel.qml b/Modules/BluetoothPanel/BluetoothPanel.qml
index 312ddc3..91377df 100644
--- a/Modules/BluetoothPanel/BluetoothPanel.qml
+++ b/Modules/BluetoothPanel/BluetoothPanel.qml
@@ -28,7 +28,7 @@ NPanel {
         spacing: Style.marginM * scaling
 
         NIcon {
-          text: "bluetooth"
+          text: FontService.icons["bluetooth"]
           font.pointSize: Style.fontSizeXXL * scaling
           color: Color.mPrimary
         }
@@ -42,7 +42,7 @@ NPanel {
         }
 
         NIconButton {
-          icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop_circle" : "refresh"
+          icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? FontService.icons["stop"] : FontService.icons["refresh"]
           tooltipText: "Refresh Devices"
           sizeRatio: 0.8
           onClicked: {
diff --git a/Services/BluetoothService.qml b/Services/BluetoothService.qml
index d5e2d51..bb071a8 100644
--- a/Services/BluetoothService.qml
+++ b/Services/BluetoothService.qml
@@ -49,6 +49,7 @@ Singleton {
                         })
   }
 
+  // FIXME
   function getDeviceIcon(device) {
     if (!device) {
       return "bluetooth"
diff --git a/Services/FontService.qml b/Services/FontService.qml
index f407732..67a38b4 100644
--- a/Services/FontService.qml
+++ b/Services/FontService.qml
@@ -40,7 +40,7 @@ Singleton {
     "gear": "\uF3E5",
     "close": "\uF659",
     "check": "\uF272",
-    "panel": "\uF2CD",
+    "panel": "\uF290",
     "memory": "\uF2D6",
     "trash": "\uF78B",
     "video_camera": "\uF21F",
@@ -62,7 +62,7 @@ Singleton {
     "stop": "\uF590",
     "prev": "\uF561",
     "next": "\uF55B",
-    "arrow_drop_down": "\uF282",
+    "arrow_drop_down": "\uF22C",
     "warning": "\uF334",
     "info": "\uF26A",
     "upload": "\uF296",