diff --git a/config/BarConfig.qml b/config/BarConfig.qml
index 745cda65..34819b17 100644
--- a/config/BarConfig.qml
+++ b/config/BarConfig.qml
@@ -45,10 +45,6 @@ JsonObject {
             id: "statusIcons",
             enabled: true
         },
-        {
-            id: "settings",
-            enabled: true
-        },
         {
             id: "power",
             enabled: true
diff --git a/modules/BatteryMonitor.qml b/modules/BatteryMonitor.qml
index 7a3be125..d24cff27 100644
--- a/modules/BatteryMonitor.qml
+++ b/modules/BatteryMonitor.qml
@@ -15,7 +15,7 @@ Scope {
         function onOnBatteryChanged(): void {
             if (UPower.onBattery) {
                 if (Config.utilities.toasts.chargingChanged)
-                    Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is now on AC"), "power_off");
+                    Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
             } else {
                 if (Config.utilities.toasts.chargingChanged)
                     Toaster.toast(qsTr("Charger plugged in"), qsTr("Battery is charging"), "power");
diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml
index 6dc6b6ba..2de325cc 100644
--- a/modules/background/DesktopClock.qml
+++ b/modules/background/DesktopClock.qml
@@ -12,6 +12,7 @@ Item {
 
         anchors.centerIn: parent
         text: Time.format(Config.services.useTwelveHourClock ? "hh:mm:ss A" : "hh:mm:ss")
+        font.family: Appearance.font.family.clock
         font.pointSize: Appearance.font.size.extraLarge
         font.bold: true
     }
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 32e362b3..1dceea41 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -158,12 +158,6 @@ ColumnLayout {
                     sourceComponent: StatusIcons {}
                 }
             }
-            DelegateChoice {
-                roleValue: "settings"
-                delegate: WrappedLoader {
-                    sourceComponent: SettingsIcon {}
-                }
-            }
             DelegateChoice {
                 roleValue: "power"
                 delegate: WrappedLoader {
diff --git a/modules/controlcenter/WindowFactory.qml b/modules/controlcenter/WindowFactory.qml
index 14d85da9..c5b7535c 100644
--- a/modules/controlcenter/WindowFactory.qml
+++ b/modules/controlcenter/WindowFactory.qml
@@ -38,7 +38,7 @@ Singleton {
             implicitWidth: cc.implicitWidth
             implicitHeight: cc.implicitHeight
 
-            title: qsTr("Settings")
+            title: qsTr("Caelestia Settings - %1").arg(cc.active.slice(0, 1).toUpperCase() + cc.active.slice(1))
 
             ControlCenter {
                 id: cc
diff --git a/modules/controlcenter/WindowTitle.qml b/modules/controlcenter/WindowTitle.qml
index b65746b5..fb716089 100644
--- a/modules/controlcenter/WindowTitle.qml
+++ b/modules/controlcenter/WindowTitle.qml
@@ -19,7 +19,7 @@ StyledRect {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
 
-        text: qsTr("Settings")
+        text: qsTr("Caelestia Settings - %1").arg(root.session.active)
         font.capitalization: Font.Capitalize
         font.pointSize: Appearance.font.size.larger
         font.weight: 500