diff --git a/components/ConnectionHeader.qml b/components/ConnectionHeader.qml
index e6646c9f..cb1ce571 100644
--- a/components/ConnectionHeader.qml
+++ b/components/ConnectionHeader.qml
@@ -16,7 +16,7 @@ ColumnLayout {
         Layout.alignment: Qt.AlignHCenter
         animate: true
         text: root.icon
-        font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).weight(Font.Bold).build()
+        fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 3).weight(Font.Bold).build()
     }
 
     StyledText {
diff --git a/components/MaterialIcon.qml b/components/MaterialIcon.qml
index 2909d23d..e8cfe3e3 100644
--- a/components/MaterialIcon.qml
+++ b/components/MaterialIcon.qml
@@ -5,7 +5,7 @@ import qs.services
 StyledText {
     property real fill
     property int grade: Colours.light ? 0 : -25
-    property font fontStyle
+    property font fontStyle: Tokens.font.icon.large
 
     font: Tokens.font.icon.builder.size(fontStyle.pointSize).weight(fontStyle.weight).fill(fill.toFixed(1)).grade(grade).build()
 }
diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml
index d2b4fa77..b8ef092a 100644
--- a/components/controls/CollapsibleSection.qml
+++ b/components/controls/CollapsibleSection.qml
@@ -49,7 +49,7 @@ ColumnLayout {
                 text: "expand_more"
                 rotation: root.expanded ? 180 : 0
                 color: Colours.palette.m3onSurfaceVariant
-                font: Tokens.font.icon.medium
+                fontStyle: Tokens.font.icon.medium
 
                 Behavior on rotation {
                     Anim {
diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml
index 3df3cda9..d67b808b 100644
--- a/components/controls/ToggleButton.qml
+++ b/components/controls/ToggleButton.qml
@@ -61,7 +61,7 @@ StyledRect {
             fill: root.toggled ? 1 : 0
             text: root.icon
             color: root.toggled ? Colours.palette[`m3on${root.accent}`] : Colours.palette[`m3on${root.accent}Container`]
-            font: Tokens.font.icon.builders.large.size(root.iconSize).build()
+            fontStyle: Tokens.font.icon.builder.size(root.iconSize).build()
 
             Behavior on fill {
                 Anim {}
diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml
index e5e2c669..5e43c113 100644
--- a/components/filedialog/FolderContents.qml
+++ b/components/filedialog/FolderContents.qml
@@ -59,7 +59,7 @@ Item {
                 Layout.alignment: Qt.AlignHCenter
                 text: "scan_delete"
                 color: Colours.palette.m3outline
-                font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(500).build()
+                fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(500).build()
             }
 
             StyledText {
diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml
index 3b82972a..b872aeff 100644
--- a/components/filedialog/Sidebar.qml
+++ b/components/filedialog/Sidebar.qml
@@ -90,7 +90,7 @@ StyledRect {
                             return "folder";
                         }
                         color: place.selected ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
-                        font: Tokens.font.icon.large
+                        fontStyle: Tokens.font.icon.large
                         fill: place.selected ? 1 : 0
 
                         Behavior on fill {
diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml
index 78071a25..2d32ed6b 100644
--- a/modules/background/Wallpaper.qml
+++ b/modules/background/Wallpaper.qml
@@ -48,7 +48,7 @@ Item {
                 MaterialIcon {
                     text: "sentiment_stressed"
                     color: Colours.palette.m3onSurfaceVariant
-                    font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 5).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 5).build()
                 }
 
                 Column {
diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml
index 9d1777eb..c6a1e104 100644
--- a/modules/bar/components/Power.qml
+++ b/modules/bar/components/Power.qml
@@ -29,6 +29,6 @@ Item {
 
         text: "power_settings_new"
         color: Colours.palette.m3error
-        font: Tokens.font.icon.builders.medium.weight(Font.Bold).build()
+        fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(Font.Bold).build()
     }
 }
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index 43189444..3cf1dacc 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -100,7 +100,7 @@ StyledRect {
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: Config.bar.tray.background ? Tokens.padding.extraSmall : -Tokens.padding.extraSmall
                 text: "expand_less"
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
                 rotation: root.expanded ? 180 : 0
 
                 Behavior on rotation {
diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml
index c3b332b6..dc2ef8cf 100644
--- a/modules/bar/popouts/ActiveWindow.qml
+++ b/modules/bar/popouts/ActiveWindow.qml
@@ -77,7 +77,7 @@ Item {
 
                     text: "chevron_right"
 
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                 }
             }
         }
diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml
index 29b1ab22..cac78f82 100644
--- a/modules/bar/popouts/Battery.qml
+++ b/modules/bar/popouts/Battery.qml
@@ -213,7 +213,7 @@ Column {
             anchors.centerIn: parent
 
             text: parent.icon
-            font: Tokens.font.icon.large
+            fontStyle: Tokens.font.icon.large
             color: profiles.current === text ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface
             fill: profiles.current === text ? 1 : 0
 
diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml
index 9aa9dd52..1cfaf2cb 100644
--- a/modules/bar/popouts/Network.qml
+++ b/modules/bar/popouts/Network.qml
@@ -97,7 +97,7 @@ ColumnLayout {
             MaterialIcon {
                 visible: networkItem.modelData.isSecure
                 text: "lock"
-                font: Tokens.font.icon.small
+                fontStyle: Tokens.font.icon.small
             }
 
             StyledText {
diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml
index a30414ce..65a54419 100644
--- a/modules/bar/popouts/WirelessPassword.qml
+++ b/modules/bar/popouts/WirelessPassword.qml
@@ -177,7 +177,7 @@ ColumnLayout {
             MaterialIcon {
                 Layout.alignment: Qt.AlignHCenter
                 text: "lock"
-                font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
+                fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
             }
 
             StyledText {
diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml
index cdfa1522..f5c3fd3d 100644
--- a/modules/controlcenter/NavRail.qml
+++ b/modules/controlcenter/NavRail.qml
@@ -79,7 +79,7 @@ Item {
 
                     text: "select_window"
                     color: Colours.palette.m3onPrimaryContainer
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                     fill: 1
                 }
 
@@ -193,7 +193,7 @@ Item {
 
                 text: item.icon
                 color: item.active ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
                 fill: item.active ? 1 : 0
 
                 Behavior on fill {
diff --git a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml
index 09662d38..5841d05c 100644
--- a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml
+++ b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml
@@ -87,7 +87,7 @@ CollapsibleSection {
 
                             visible: false
                             text: "circle"
-                            font: Tokens.font.icon.large
+                            fontStyle: Tokens.font.icon.large
                         }
 
                         Item {
@@ -137,7 +137,7 @@ CollapsibleSection {
                         sourceComponent: MaterialIcon {
                             text: "check"
                             color: Colours.palette.m3onSurfaceVariant
-                            font: Tokens.font.icon.large
+                            fontStyle: Tokens.font.icon.large
                         }
                     }
                 }
diff --git a/modules/controlcenter/appearance/sections/ColorVariantSection.qml b/modules/controlcenter/appearance/sections/ColorVariantSection.qml
index 0d2a893c..7e763d34 100644
--- a/modules/controlcenter/appearance/sections/ColorVariantSection.qml
+++ b/modules/controlcenter/appearance/sections/ColorVariantSection.qml
@@ -68,7 +68,7 @@ CollapsibleSection {
 
                     MaterialIcon {
                         text: modelData.icon
-                        font: Tokens.font.icon.large
+                        fontStyle: Tokens.font.icon.large
                         fill: modelData.variant === Schemes.currentVariant ? 1 : 0
                     }
 
@@ -82,7 +82,7 @@ CollapsibleSection {
                         visible: modelData.variant === Schemes.currentVariant
                         text: "check"
                         color: Colours.palette.m3primary
-                        font: Tokens.font.icon.large
+                        fontStyle: Tokens.font.icon.large
                     }
                 }
             }
diff --git a/modules/controlcenter/appearance/sections/FontsSection.qml b/modules/controlcenter/appearance/sections/FontsSection.qml
index 8c2d89f2..03bec48f 100644
--- a/modules/controlcenter/appearance/sections/FontsSection.qml
+++ b/modules/controlcenter/appearance/sections/FontsSection.qml
@@ -90,7 +90,7 @@ CollapsibleSection {
                             sourceComponent: MaterialIcon {
                                 text: "check"
                                 color: Colours.palette.m3onSurfaceVariant
-                                font: Tokens.font.icon.large
+                                fontStyle: Tokens.font.icon.large
                             }
                         }
                     }
@@ -171,7 +171,7 @@ CollapsibleSection {
                             sourceComponent: MaterialIcon {
                                 text: "check"
                                 color: Colours.palette.m3onSurfaceVariant
-                                font: Tokens.font.icon.large
+                                fontStyle: Tokens.font.icon.large
                             }
                         }
                     }
@@ -254,7 +254,7 @@ CollapsibleSection {
                             sourceComponent: MaterialIcon {
                                 text: "check"
                                 color: Colours.palette.m3onSurfaceVariant
-                                font: Tokens.font.icon.large
+                                fontStyle: Tokens.font.icon.large
                             }
                         }
                     }
diff --git a/modules/controlcenter/audio/AudioPane.qml b/modules/controlcenter/audio/AudioPane.qml
index 6cdee883..a6eacb41 100644
--- a/modules/controlcenter/audio/AudioPane.qml
+++ b/modules/controlcenter/audio/AudioPane.qml
@@ -112,7 +112,7 @@ Item {
 
                                         MaterialIcon {
                                             text: Audio.sink?.id === modelData.id ? "speaker" : "speaker_group"
-                                            font: Tokens.font.icon.large
+                                            fontStyle: Tokens.font.icon.large
                                             fill: Audio.sink?.id === modelData.id ? 1 : 0
                                         }
 
@@ -188,7 +188,7 @@ Item {
 
                                         MaterialIcon {
                                             text: "mic"
-                                            font: Tokens.font.icon.large
+                                            fontStyle: Tokens.font.icon.large
                                             fill: Audio.source?.id === modelData.id ? 1 : 0
                                         }
 
@@ -496,7 +496,7 @@ Item {
 
                                         MaterialIcon {
                                             text: "apps"
-                                            font: Tokens.font.icon.medium
+                                            fontStyle: Tokens.font.icon.medium
                                             fill: 0
                                         }
 
diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml
index 8afdabb8..74b57e52 100644
--- a/modules/controlcenter/bluetooth/Details.qml
+++ b/modules/controlcenter/bluetooth/Details.qml
@@ -597,7 +597,7 @@ StyledFlickable {
                     fabBg.implicitWidth: 48
                     fabBg.implicitHeight: 48
                     fabBg.radius: 48 / 2
-                    fab.font: Tokens.font.icon.large
+                    fab.fontStyle: Tokens.font.icon.large
                 }
             }
 
@@ -635,7 +635,7 @@ StyledFlickable {
                 animate: true
                 text: root.session.bt.fabMenuOpen ? "close" : "settings"
                 color: root.session.bt.fabMenuOpen ? Colours.palette.m3onPrimary : Colours.palette.m3onPrimaryContainer
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
                 fill: 1
             }
         }
diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml
index e391fae5..caadf5d5 100644
--- a/modules/controlcenter/bluetooth/DeviceList.qml
+++ b/modules/controlcenter/bluetooth/DeviceList.qml
@@ -177,7 +177,7 @@ DeviceList {
                         anchors.centerIn: parent
                         text: Icons.getBluetoothIcon(device.modelData ? device.modelData.icon : "")
                         color: device.connected ? Colours.palette.m3onPrimaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
-                        font: Tokens.font.icon.large
+                        fontStyle: Tokens.font.icon.large
                         fill: device.connected ? 1 : 0
 
                         Behavior on fill {
diff --git a/modules/controlcenter/components/ReadonlySlider.qml b/modules/controlcenter/components/ReadonlySlider.qml
index c7fb92b7..a96114d3 100644
--- a/modules/controlcenter/components/ReadonlySlider.qml
+++ b/modules/controlcenter/components/ReadonlySlider.qml
@@ -38,7 +38,7 @@ ColumnLayout {
             visible: root.readonly
             text: "lock"
             color: Colours.palette.m3outline
-            font: Tokens.font.icon.small
+            fontStyle: Tokens.font.icon.small
         }
 
         StyledText {
diff --git a/modules/controlcenter/components/SettingsHeader.qml b/modules/controlcenter/components/SettingsHeader.qml
index 11f5163a..e84d88d5 100644
--- a/modules/controlcenter/components/SettingsHeader.qml
+++ b/modules/controlcenter/components/SettingsHeader.qml
@@ -23,7 +23,7 @@ Item {
         MaterialIcon {
             Layout.alignment: Qt.AlignHCenter
             text: root.icon
-            font: Tokens.font.icon.builders.xl.size(84).weight(Font.Bold).build()
+            fontStyle: Tokens.font.icon.extraLarge.size(84).weight(Font.Bold).build()
         }
 
         StyledText {
diff --git a/modules/controlcenter/components/WallpaperGrid.qml b/modules/controlcenter/components/WallpaperGrid.qml
index ae36c17c..799fbb7e 100644
--- a/modules/controlcenter/components/WallpaperGrid.qml
+++ b/modules/controlcenter/components/WallpaperGrid.qml
@@ -195,7 +195,7 @@ GridView {
                 visible: isCurrent
                 text: "check_circle"
                 color: Colours.palette.m3primary
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
         }
 
diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml
index 84021e86..2b27f1c4 100644
--- a/modules/controlcenter/network/EthernetList.qml
+++ b/modules/controlcenter/network/EthernetList.qml
@@ -100,7 +100,7 @@ DeviceList {
 
                         anchors.centerIn: parent
                         text: "cable"
-                        font: Tokens.font.icon.large
+                        fontStyle: Tokens.font.icon.large
                         fill: modelData.connected ? 1 : 0
                         color: modelData.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
 
diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml
index 582e5c0f..0649f2c4 100644
--- a/modules/controlcenter/network/VpnList.qml
+++ b/modules/controlcenter/network/VpnList.qml
@@ -138,7 +138,7 @@ ColumnLayout {
 
                             anchors.centerIn: parent
                             text: modelData.enabled && VPN.connected ? "vpn_key" : "vpn_key_off"
-                            font: Tokens.font.icon.large
+                            fontStyle: Tokens.font.icon.large
                             fill: modelData.enabled && VPN.connected ? 1 : 0
                             color: modelData.enabled && VPN.connected ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
                         }
diff --git a/modules/controlcenter/network/VpnSettings.qml b/modules/controlcenter/network/VpnSettings.qml
index 20042649..2557a973 100644
--- a/modules/controlcenter/network/VpnSettings.qml
+++ b/modules/controlcenter/network/VpnSettings.qml
@@ -94,7 +94,7 @@ ColumnLayout {
 
                         MaterialIcon {
                             text: modelData.isActive ? "vpn_key" : "vpn_key_off"
-                            font: Tokens.font.icon.large
+                            fontStyle: Tokens.font.icon.large
                             color: modelData.isActive ? Colours.palette.m3primary : Colours.palette.m3outline
                         }
 
diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml
index 4d25fc1b..ebb8778b 100644
--- a/modules/controlcenter/network/WirelessList.qml
+++ b/modules/controlcenter/network/WirelessList.qml
@@ -145,7 +145,7 @@ DeviceList {
 
                         anchors.centerIn: parent
                         text: Icons.getNetworkIcon(modelData.strength, modelData.isSecure)
-                        font: Tokens.font.icon.large
+                        fontStyle: Tokens.font.icon.large
                         fill: modelData.active ? 1 : 0
                         color: modelData.active ? Colours.palette.m3onPrimaryContainer : Colours.palette.m3onSurface
                     }
diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml
index 2ab80d07..608714a8 100644
--- a/modules/controlcenter/network/WirelessPasswordDialog.qml
+++ b/modules/controlcenter/network/WirelessPasswordDialog.qml
@@ -149,7 +149,7 @@ Item {
             MaterialIcon {
                 Layout.alignment: Qt.AlignHCenter
                 text: "lock"
-                font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
+                fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
             }
 
             StyledText {
diff --git a/modules/dashboard/LyricMenu.qml b/modules/dashboard/LyricMenu.qml
index 57de39b6..18e68678 100644
--- a/modules/dashboard/LyricMenu.qml
+++ b/modules/dashboard/LyricMenu.qml
@@ -41,7 +41,7 @@ StyledRect {
                     text: "lyrics"
                     fill: 1
                     color: Colours.palette.m3primary
-                    font: Tokens.font.icon.builders.medium.size(Tokens.spacing.large).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.spacing.large).build()
                 }
 
                 Rectangle {
@@ -339,7 +339,7 @@ StyledRect {
 
                 MaterialIcon {
                     text: "contrast_square"
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                     color: Colours.palette.m3secondary
                 }
 
diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml
index 829e8830..7735bf23 100644
--- a/modules/dashboard/Media.qml
+++ b/modules/dashboard/Media.qml
@@ -173,7 +173,7 @@ Item {
             grade: 200
             text: "art_track"
             color: Colours.palette.m3onSurfaceVariant
-            font: Tokens.font.icon.builders.medium.size((parent.width * 0.4) || 1).build()
+            fontStyle: Tokens.font.icon.builder.size((parent.width * 0.4) || 1).build()
         }
 
         Image {
@@ -267,7 +267,7 @@ Item {
             PlayerControl {
                 type: IconButton.Text
                 icon: Players.active?.shuffle ? "shuffle_on" : "shuffle"
-                font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize)).build()
+                fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize)).build()
                 disabled: !Players.active?.shuffleSupported
                 onClicked: Players.active.shuffle = !Players.active?.shuffle
             }
@@ -275,7 +275,7 @@ Item {
             PlayerControl {
                 type: IconButton.Text
                 icon: "skip_previous"
-                font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize * 1.5)).build()
+                fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize * 1.5)).build()
                 disabled: !Players.active?.canGoPrevious
                 onClicked: Players.active?.previous()
             }
@@ -286,7 +286,7 @@ Item {
                 toggle: true
                 padding: Tokens.padding.extraSmall / 2
                 checked: Players.active?.isPlaying ?? false
-                font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize * 1.5)).build()
+                fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize * 1.5)).build()
                 disabled: !Players.active?.canTogglePlaying
                 onClicked: Players.active?.togglePlaying()
             }
@@ -294,7 +294,7 @@ Item {
             PlayerControl {
                 type: IconButton.Text
                 icon: "skip_next"
-                font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize * 1.5)).build()
+                fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize * 1.5)).build()
                 disabled: !Players.active?.canGoNext
                 onClicked: Players.active?.next()
             }
@@ -302,7 +302,7 @@ Item {
             PlayerControl {
                 type: IconButton.Text
                 icon: "lyrics"
-                font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize)).build()
+                fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize)).build()
                 onClicked: root.lyricMenuOpen = !root.lyricMenuOpen
             }
         }
@@ -444,7 +444,7 @@ Item {
             icon: "move_up"
             inactiveOnColour: Colours.palette.m3secondary
             padding: Tokens.padding.small
-            font: Tokens.font.icon.large
+            fontStyle: Tokens.font.icon.large
             disabled: !Players.active?.canRaise
             onClicked: {
                 Players.active?.raise();
@@ -483,7 +483,7 @@ Item {
             icon: "delete"
             inactiveOnColour: Colours.palette.m3error
             padding: Tokens.padding.small
-            font: Tokens.font.icon.large
+            fontStyle: Tokens.font.icon.large
             disabled: !Players.active?.canQuit
             onClicked: Players.active?.quit()
         }
diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml
index 7a92162a..40a77100 100644
--- a/modules/dashboard/Performance.qml
+++ b/modules/dashboard/Performance.qml
@@ -37,7 +37,7 @@ Item {
             MaterialIcon {
                 Layout.alignment: Qt.AlignHCenter
                 text: "tune"
-                font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
+                fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
                 color: Colours.palette.m3onSurfaceVariant
             }
 
@@ -214,7 +214,7 @@ Item {
 
                         return charging ? `battery_charging_${(level + 3) * 10}` : `battery_${level}_bar`;
                     }
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                     color: batteryTank.accentColor
                 }
 
@@ -287,7 +287,7 @@ Item {
             text: parent.icon
             fill: 1
             color: parent.accentColor
-            font: Tokens.font.icon.builders.medium.size(Tokens.spacing.large).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.spacing.large).build()
         }
 
         StyledText {
@@ -581,7 +581,7 @@ Item {
                 MaterialIcon {
                     text: "unfold_more"
                     color: Colours.palette.m3onSurfaceVariant
-                    font: Tokens.font.icon.medium
+                    fontStyle: Tokens.font.icon.medium
                     visible: storageGaugeCard.diskCount > 1
                     opacity: 0.7
                     ToolTip.visible: hintHover.hovered
@@ -729,7 +729,7 @@ Item {
                 MaterialIcon {
                     text: "download"
                     color: Colours.palette.m3tertiary
-                    font: Tokens.font.icon.medium
+                    fontStyle: Tokens.font.icon.medium
                 }
 
                 StyledText {
@@ -760,7 +760,7 @@ Item {
                 MaterialIcon {
                     text: "upload"
                     color: Colours.palette.m3secondary
-                    font: Tokens.font.icon.medium
+                    fontStyle: Tokens.font.icon.medium
                 }
 
                 StyledText {
@@ -791,7 +791,7 @@ Item {
                 MaterialIcon {
                     text: "history"
                     color: Colours.palette.m3onSurfaceVariant
-                    font: Tokens.font.icon.medium
+                    fontStyle: Tokens.font.icon.medium
                 }
 
                 StyledText {
diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml
index dc1048c4..d497d1e6 100644
--- a/modules/dashboard/Tabs.qml
+++ b/modules/dashboard/Tabs.qml
@@ -221,7 +221,7 @@ Item {
                 text: tab.iconName
                 color: tab.current ? Colours.palette.m3primary : Colours.palette.m3onSurfaceVariant
                 fill: tab.current ? 1 : 0
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
 
                 Behavior on fill {
                     Anim {}
diff --git a/modules/dashboard/WeatherTab.qml b/modules/dashboard/WeatherTab.qml
index b33dfa76..6628d051 100644
--- a/modules/dashboard/WeatherTab.qml
+++ b/modules/dashboard/WeatherTab.qml
@@ -79,7 +79,7 @@ Item {
                 MaterialIcon {
                     Layout.alignment: Qt.AlignVCenter
                     text: Weather.icon
-                    font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
                     color: Colours.palette.m3secondary
                     animate: true
                 }
@@ -183,7 +183,7 @@ Item {
                         MaterialIcon {
                             Layout.alignment: Qt.AlignHCenter
                             text: forecastItem.modelData.icon
-                            font: Tokens.font.icon.extraLarge
+                            fontStyle: Tokens.font.icon.extraLarge
                             color: Colours.palette.m3secondary
                         }
 
@@ -219,7 +219,7 @@ Item {
             MaterialIcon {
                 text: detailRoot.icon
                 color: detailRoot.colour
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
                 anchors.verticalCenter: parent.verticalCenter
             }
 
@@ -254,7 +254,7 @@ Item {
 
         MaterialIcon {
             text: weatherStat.icon
-            font: Tokens.font.icon.extraLarge
+            fontStyle: Tokens.font.icon.extraLarge
             color: weatherStat.colour
         }
 
diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml
index 45f0e352..323b203f 100644
--- a/modules/dashboard/dash/Calendar.qml
+++ b/modules/dashboard/dash/Calendar.qml
@@ -61,7 +61,7 @@ CustomMouseArea {
                     anchors.centerIn: parent
                     text: "chevron_left"
                     color: Colours.palette.m3tertiary
-                    font: Tokens.font.icon.builders.medium.weight(700).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(700).build()
                 }
             }
 
@@ -118,7 +118,7 @@ CustomMouseArea {
                     anchors.centerIn: parent
                     text: "chevron_right"
                     color: Colours.palette.m3tertiary
-                    font: Tokens.font.icon.builders.medium.weight(700).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(700).build()
                 }
             }
         }
diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml
index 54ce22f6..9b056c28 100644
--- a/modules/dashboard/dash/Media.qml
+++ b/modules/dashboard/dash/Media.qml
@@ -98,7 +98,7 @@ Item {
             grade: 200
             text: "art_track"
             color: Colours.palette.m3onSurfaceVariant
-            font: Tokens.font.icon.builders.medium.size((parent.width * 0.4) || 1).build()
+            fontStyle: Tokens.font.icon.builder.size((parent.width * 0.4) || 1).build()
         }
 
         Image {
@@ -236,7 +236,7 @@ Item {
             animate: true
             text: control.icon
             color: control.canUse ? Colours.palette.m3onSurface : Colours.palette.m3outline
-            font: Tokens.font.icon.large
+            fontStyle: Tokens.font.icon.large
         }
     }
 }
diff --git a/modules/dashboard/dash/SmallWeather.qml b/modules/dashboard/dash/SmallWeather.qml
index 4024164e..dbdfcac0 100644
--- a/modules/dashboard/dash/SmallWeather.qml
+++ b/modules/dashboard/dash/SmallWeather.qml
@@ -21,7 +21,7 @@ Item {
         animate: true
         text: Weather.icon
         color: Colours.palette.m3secondary
-        font: Tokens.font.icon.builders.xl.size(Tokens.font.icon.xl.pointSize * 2).build()
+        fontStyle: Tokens.font.icon.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).build()
     }
 
     Column {
diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml
index 5c571bf5..d0552efe 100644
--- a/modules/dashboard/dash/User.qml
+++ b/modules/dashboard/dash/User.qml
@@ -29,7 +29,7 @@ Row {
             text: "person"
             fill: 1
             grade: 200
-            font: Tokens.font.icon.builders.medium.size(Math.floor(info.implicitHeight / 2) || 1).build()
+            fontStyle: Tokens.font.icon.builder.size(Math.floor(info.implicitHeight / 2) || 1).build()
             visible: pfp.status !== Image.Ready
         }
 
@@ -84,7 +84,7 @@ Row {
 
                     text: "frame_person"
                     color: Colours.palette.m3onPrimary
-                    font: Tokens.font.icon.xl
+                    fontStyle: Tokens.font.icon.extraLarge
                 }
 
                 Behavior on scale {
@@ -173,7 +173,7 @@ Row {
             fill: 1
             text: line.icon
             color: line.colour
-            font: Tokens.font.icon.medium
+            fontStyle: Tokens.font.icon.medium
         }
 
         StyledText {
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index 25b9f395..4e5bad8b 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -119,7 +119,7 @@ Item {
         MaterialIcon {
             text: root.state === "wallpapers" ? "wallpaper_slideshow" : "manage_search"
             color: Colours.palette.m3onSurfaceVariant
-            font: Tokens.font.icon.extraLarge
+            fontStyle: Tokens.font.icon.extraLarge
 
             anchors.verticalCenter: parent.verticalCenter
         }
diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml
index bfb1a336..a4370b46 100644
--- a/modules/launcher/items/ActionItem.qml
+++ b/modules/launcher/items/ActionItem.qml
@@ -29,7 +29,7 @@ Item {
             id: icon
 
             text: root.modelData?.icon ?? ""
-            font: Tokens.font.icon.extraLarge
+            fontStyle: Tokens.font.icon.extraLarge
 
             anchors.verticalCenter: parent.verticalCenter
         }
diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml
index 07f2da2c..61df6722 100644
--- a/modules/launcher/items/CalcItem.qml
+++ b/modules/launcher/items/CalcItem.qml
@@ -42,7 +42,7 @@ Item {
 
         MaterialIcon {
             text: "function"
-            font: Tokens.font.icon.extraLarge
+            fontStyle: Tokens.font.icon.extraLarge
             Layout.alignment: Qt.AlignVCenter
         }
 
@@ -112,7 +112,7 @@ Item {
 
                 text: "open_in_new"
                 color: Colours.palette.m3onTertiary
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
 
             Behavior on implicitWidth {
diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml
index f1b95ed9..a2f466cc 100644
--- a/modules/launcher/items/SchemeItem.qml
+++ b/modules/launcher/items/SchemeItem.qml
@@ -95,7 +95,7 @@ Item {
             sourceComponent: MaterialIcon {
                 text: "check"
                 color: Colours.palette.m3onSurfaceVariant
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
         }
     }
diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml
index 75292de6..fa3fb259 100644
--- a/modules/launcher/items/VariantItem.qml
+++ b/modules/launcher/items/VariantItem.qml
@@ -30,7 +30,7 @@ Item {
             id: icon
 
             text: root.modelData?.icon ?? ""
-            font: Tokens.font.icon.extraLarge
+            fontStyle: Tokens.font.icon.extraLarge
 
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -71,7 +71,7 @@ Item {
             sourceComponent: MaterialIcon {
                 text: "check"
                 color: Colours.palette.m3onSurfaceVariant
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
         }
     }
diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml
index 7fcd4c45..9f747a2d 100644
--- a/modules/launcher/items/WallpaperItem.qml
+++ b/modules/launcher/items/WallpaperItem.qml
@@ -58,7 +58,7 @@ Item {
             anchors.centerIn: parent
             text: "image"
             color: Colours.tPalette.m3outline
-            font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(600).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(600).build()
         }
 
         CachingImage {
diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml
index bf2b88f3..b3f62f5f 100644
--- a/modules/lock/Center.qml
+++ b/modules/lock/Center.qml
@@ -87,7 +87,7 @@ ColumnLayout {
 
             text: "person"
             color: Colours.palette.m3onSurfaceVariant
-            font: Tokens.font.icon.builders.large.size(Math.floor(root.centerWidth / 4)).build()
+            fontStyle: Tokens.font.icon.builder.size(Math.floor(root.centerWidth / 4)).build()
             visible: pfp.status !== Image.Ready
         }
 
@@ -194,7 +194,7 @@ ColumnLayout {
                     anchors.centerIn: parent
                     text: "arrow_forward"
                     color: root.lock.pam.buffer ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface
-                    font: Tokens.font.icon.builders.large.weight(500).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.large.pointSize).weight(500).build()
                 }
             }
         }
diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml
index cd088bc3..832ab114 100644
--- a/modules/lock/LockSurface.qml
+++ b/modules/lock/LockSurface.qml
@@ -207,7 +207,7 @@ WlSessionLockSurface {
 
             anchors.centerIn: parent
             text: "lock"
-            font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 4).weight(Font.Bold).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 4).weight(Font.Bold).build()
             rotation: 180
         }
 
diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml
index dd325f9b..422c2ffe 100644
--- a/modules/lock/Media.qml
+++ b/modules/lock/Media.qml
@@ -172,7 +172,7 @@ Item {
 
             anchors.centerIn: parent
             color: control.active ? Colours.palette[`m3on${control.colour}`] : Colours.palette[`m3on${control.colour}Container`]
-            font: Tokens.font.icon.large
+            fontStyle: Tokens.font.icon.large
             fill: control.active ? 1 : 0
 
             Behavior on fill {
diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml
index 14ffde02..43245a71 100644
--- a/modules/lock/NotifGroup.qml
+++ b/modules/lock/NotifGroup.qml
@@ -99,7 +99,7 @@ StyledRect {
                 MaterialIcon {
                     text: Icons.getNotifIcon(root.notifs[0]?.summary, root.urgency)
                     color: root.urgency === "critical" ? Colours.palette.m3onError : root.urgency === "low" ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                 }
             }
 
diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml
index 2d6be753..0b92347a 100644
--- a/modules/lock/Resources.qml
+++ b/modules/lock/Resources.qml
@@ -80,7 +80,7 @@ GridLayout {
             anchors.centerIn: parent
             text: res.icon
             color: res.colour
-            font: Tokens.font.icon.builders.medium.size((circ.arcRadius * 0.7) || 1).weight(600).build()
+            fontStyle: Tokens.font.icon.builder.size((circ.arcRadius * 0.7) || 1).weight(600).build()
         }
 
         Behavior on value {
diff --git a/modules/lock/WeatherInfo.qml b/modules/lock/WeatherInfo.qml
index be244416..c2dcd57c 100644
--- a/modules/lock/WeatherInfo.qml
+++ b/modules/lock/WeatherInfo.qml
@@ -41,7 +41,7 @@ ColumnLayout {
             animate: true
             text: Weather.icon
             color: Colours.palette.m3secondary
-            font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 2.5).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2.5).build()
         }
 
         ColumnLayout {
@@ -150,7 +150,7 @@ ColumnLayout {
                     MaterialIcon {
                         Layout.alignment: Qt.AlignHCenter
                         text: forecastHour.modelData?.icon ?? "cloud_alert"
-                        font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 1.5).weight(500).build()
+                        fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 1.5).weight(500).build()
                     }
 
                     StyledText {
diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml
index a29c613e..8997fabf 100644
--- a/modules/notifications/Notification.qml
+++ b/modules/notifications/Notification.qml
@@ -181,7 +181,7 @@ StyledRect {
                             text: Icons.getNotifIcon(root.modelData.summary, root.modelData.urgency)
 
                             color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.modelData.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer
-                            font: Tokens.font.icon.large
+                            fontStyle: Tokens.font.icon.large
                         }
                     }
                 }
@@ -366,7 +366,7 @@ StyledRect {
 
                     animate: true
                     text: root.expanded ? "expand_less" : "expand_more"
-                    font: Tokens.font.icon.medium
+                    fontStyle: Tokens.font.icon.medium
                 }
             }
 
diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index d01b0eae..fb6be9c2 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -125,7 +125,7 @@ Column {
 
             text: button.icon
             color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
-            font: Tokens.font.icon.builders.extraLarge.weight(500).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize).weight(500).build()
         }
     }
 }
diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml
index 6008953a..e7c812ad 100644
--- a/modules/sidebar/NotifDock.qml
+++ b/modules/sidebar/NotifDock.qml
@@ -183,7 +183,7 @@ Item {
             icon: "clear_all"
             radius: Tokens.rounding.normal
             padding: Tokens.padding.medium
-            font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize * 1.2)).build()
+            fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize * 1.2)).build()
             onClicked: clearTimer.start()
 
             Elevation {
diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml
index a05de6ec..de9a974d 100644
--- a/modules/sidebar/NotifGroup.qml
+++ b/modules/sidebar/NotifGroup.qml
@@ -113,7 +113,7 @@ StyledRect {
                 MaterialIcon {
                     text: Icons.getNotifIcon(root.activeNotifs[0]?.summary, root.urgency)
                     color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                 }
             }
 
diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml
index 8af7801f..6ac04059 100644
--- a/modules/utilities/cards/IdleInhibit.qml
+++ b/modules/utilities/cards/IdleInhibit.qml
@@ -37,7 +37,7 @@ StyledRect {
                 anchors.centerIn: parent
                 text: "coffee"
                 color: IdleInhibitor.enabled ? Colours.palette.m3onSecondary : Colours.palette.m3onSecondaryContainer
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
         }
 
diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml
index 1f562040..9929529e 100644
--- a/modules/utilities/cards/Record.qml
+++ b/modules/utilities/cards/Record.qml
@@ -48,7 +48,7 @@ StyledRect {
                     anchors.verticalCenterOffset: 1.5
                     text: "screen_record"
                     color: Recorder.running ? Colours.palette.m3onSecondary : Colours.palette.m3onSecondaryContainer
-                    font: Tokens.font.icon.large
+                    fontStyle: Tokens.font.icon.large
                 }
             }
 
@@ -259,7 +259,7 @@ StyledRect {
                 toggle: true
                 checked: Recorder.paused
                 type: IconButton.Tonal
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
                 onClicked: {
                     Recorder.togglePause();
                     internalChecked = Recorder.paused;
@@ -270,7 +270,7 @@ StyledRect {
                 icon: "stop"
                 inactiveColour: Colours.palette.m3error
                 inactiveOnColour: Colours.palette.m3onError
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
                 onClicked: Recorder.stop()
             }
         }
diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml
index 646582d4..ea847f8a 100644
--- a/modules/utilities/cards/RecordingList.qml
+++ b/modules/utilities/cards/RecordingList.qml
@@ -32,7 +32,7 @@ ColumnLayout {
             MaterialIcon {
                 Layout.alignment: Qt.AlignVCenter
                 text: "list"
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
 
             StyledText {
@@ -175,7 +175,7 @@ ColumnLayout {
                     Layout.alignment: Qt.AlignHCenter
                     text: "scan_delete"
                     color: Colours.palette.m3outline
-                    font: Tokens.font.icon.extraLarge
+                    fontStyle: Tokens.font.icon.extraLarge
 
                     opacity: root.props.recordingListExpanded ? 1 : 0
                     scale: root.props.recordingListExpanded ? 1 : 0
diff --git a/modules/utilities/toasts/ToastItem.qml b/modules/utilities/toasts/ToastItem.qml
index 1795a72a..29ffdbf7 100644
--- a/modules/utilities/toasts/ToastItem.qml
+++ b/modules/utilities/toasts/ToastItem.qml
@@ -84,7 +84,7 @@ StyledRect {
                         return Colours.palette.m3onError;
                     return Colours.palette.m3onSurfaceVariant;
                 }
-                font: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize * 1.2)).build()
+                fontStyle: Tokens.font.icon.builder.size(Math.round(Tokens.font.icon.large.pointSize * 1.2)).build()
             }
         }
 
diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml
index 1bf0bd38..a349cbb5 100644
--- a/modules/windowinfo/Buttons.qml
+++ b/modules/windowinfo/Buttons.qml
@@ -49,7 +49,7 @@ ColumnLayout {
                 animate: true
                 text: root.moveToWsExpanded ? "expand_more" : "keyboard_arrow_right"
                 color: Colours.palette.m3onPrimary
-                font: Tokens.font.icon.large
+                fontStyle: Tokens.font.icon.large
             }
         }
     }
diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml
index e0ff2537..6ded74cb 100644
--- a/modules/windowinfo/Preview.qml
+++ b/modules/windowinfo/Preview.qml
@@ -44,7 +44,7 @@ Item {
                     Layout.alignment: Qt.AlignHCenter
                     text: "web_asset_off"
                     color: Colours.palette.m3outline
-                    font: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
                 }
 
                 StyledText {