diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ActiveWindowSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/ActiveWindowSettings.qml
index 9f5d8a6..eabf587 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/ActiveWindowSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/ActiveWindowSettings.qml
@@ -22,7 +22,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     id: showIcon
     Layout.fillWidth: true
     label: "Show app icon"
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/BatterySettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/BatterySettings.qml
index f907204..54b589a 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/BatterySettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/BatterySettings.qml
@@ -23,7 +23,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Always show percentage"
     checked: root.valueAlwaysShowPercentage
     onToggled: checked => root.valueAlwaysShowPercentage = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/BrightnessSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/BrightnessSettings.qml
index 840c33c..6054e9c 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/BrightnessSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/BrightnessSettings.qml
@@ -23,7 +23,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Always show percentage"
     checked: valueAlwaysShowPercentage
     onToggled: checked => valueAlwaysShowPercentage = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
index e701ed0..cef94a8 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
@@ -28,25 +28,25 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Show date"
     checked: valueShowDate
     onToggled: checked => valueShowDate = checked
   }
 
-  NCheckbox {
+  NToggle {
     label: "Use 12-hour clock"
     checked: valueUse12h
     onToggled: checked => valueUse12h = checked
   }
 
-  NCheckbox {
+  NToggle {
     label: "Show seconds"
     checked: valueShowSeconds
     onToggled: checked => valueShowSeconds = checked
   }
 
-  NCheckbox {
+  NToggle {
     label: "Reverse day and month"
     checked: valueReverseDayMonth
     onToggled: checked => valueReverseDayMonth = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/MediaMiniSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/MediaMiniSettings.qml
index d1af307..fb70f9d 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/MediaMiniSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/MediaMiniSettings.qml
@@ -26,13 +26,13 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Show album art"
     checked: valueShowAlbumArt
     onToggled: checked => valueShowAlbumArt = checked
   }
 
-  NCheckbox {
+  NToggle {
     label: "Show visualizer"
     checked: valueShowVisualizer
     onToggled: checked => valueShowVisualizer = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/MicrophoneSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/MicrophoneSettings.qml
index 840c33c..6054e9c 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/MicrophoneSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/MicrophoneSettings.qml
@@ -23,7 +23,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Always show percentage"
     checked: valueAlwaysShowPercentage
     onToggled: checked => valueAlwaysShowPercentage = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/NotificationHistorySettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/NotificationHistorySettings.qml
index 64b1c56..751a832 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/NotificationHistorySettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/NotificationHistorySettings.qml
@@ -24,13 +24,13 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Show unread badge"
     checked: valueShowUnreadBadge
     onToggled: checked => valueShowUnreadBadge = checked
   }
 
-  NCheckbox {
+  NToggle {
     label: "Hide badge when zero"
     checked: valueHideWhenZero
     onToggled: checked => valueHideWhenZero = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/SidePanelToggleSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/SidePanelToggleSettings.qml
index 7161f3d..abb2b7e 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/SidePanelToggleSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/SidePanelToggleSettings.qml
@@ -22,7 +22,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Use distro logo instead of icon"
     checked: valueUseDistroLogo
     onToggled: checked => valueUseDistroLogo = checked
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/SystemMonitorSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/SystemMonitorSettings.qml
index 3c3bbf9..171e0ce 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/SystemMonitorSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/SystemMonitorSettings.qml
@@ -29,7 +29,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     id: showCpuUsage
     Layout.fillWidth: true
     label: "CPU usage"
@@ -37,7 +37,7 @@ ColumnLayout {
     onToggled: checked => valueShowCpuUsage = checked
   }
 
-  NCheckbox {
+  NToggle {
     id: showCpuTemp
     Layout.fillWidth: true
     label: "CPU temperature"
@@ -45,7 +45,7 @@ ColumnLayout {
     onToggled: checked => valueShowCpuTemp = checked
   }
 
-  NCheckbox {
+  NToggle {
     id: showMemoryUsage
     Layout.fillWidth: true
     label: "Memory usage"
@@ -53,7 +53,7 @@ ColumnLayout {
     onToggled: checked => valueShowMemoryUsage = checked
   }
 
-  NCheckbox {
+  NToggle {
     id: showNetworkStats
     Layout.fillWidth: true
     label: "Network traffic"
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/VolumeSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/VolumeSettings.qml
index 840c33c..6054e9c 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/VolumeSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/VolumeSettings.qml
@@ -23,7 +23,7 @@ ColumnLayout {
     return settings
   }
 
-  NCheckbox {
+  NToggle {
     label: "Always show percentage"
     checked: valueAlwaysShowPercentage
     onToggled: checked => valueAlwaysShowPercentage = checked