diff --git a/modules/nexus/PageRegistry.qml b/modules/nexus/PageRegistry.qml
index 11985aa4..ea3ad71e 100644
--- a/modules/nexus/PageRegistry.qml
+++ b/modules/nexus/PageRegistry.qml
@@ -29,10 +29,11 @@ QtObject {
             category: "connectivity"
         },
         {
-            label: qsTr("Bluetooth"),
-            icon: "bluetooth",
-            description: qsTr("Bluetooth pairing"),
-            category: "connectivity"
+            label: qsTr("Connected devices"),
+            icon: "devices_other",
+            description: qsTr("Bluetooth, pairing"),
+            category: "connectivity",
+            noFill: true
         },
         {
             label: qsTr("Audio"),
@@ -70,7 +71,7 @@ QtObject {
         },
         {
             label: qsTr("Language & region"),
-            icon: "build",
+            icon: "globe",
             description: qsTr("UI language, weather location, display units"),
             category: "shell"
         },
diff --git a/modules/nexus/navpane/NavLocations.qml b/modules/nexus/navpane/NavLocations.qml
index 484474e6..d559c443 100644
--- a/modules/nexus/navpane/NavLocations.qml
+++ b/modules/nexus/navpane/NavLocations.qml
@@ -92,8 +92,9 @@ VerticalFadeFlickable {
 
                             text: item.modelData.icon
                             color: item.isCurrentPage ? Colours.palette.m3onPrimary : Colours.palette.m3onSecondaryContainer
-                            fontStyle: Tokens.font.icon.medium
-                            fill: 1
+                            fontStyle: Tokens.font.icon.builders.medium.weight(Font.Medium).build()
+                            grade: 25
+                            fill: item.modelData.noFill ? 0 : 1
                         }
                     }