diff --git a/config/assets/icons/applets/caffeine-off.svg b/config/assets/icons/applets/caffeine-off.svg
index 2432b4a..b59dfe0 100644
--- a/config/assets/icons/applets/caffeine-off.svg
+++ b/config/assets/icons/applets/caffeine-off.svg
@@ -11,7 +11,7 @@
    class="css-i6dzq1"
    version="1.1"
    id="svg1"
-   sodipodi:docname="caffeine-off.svg"
+   sodipodi:docname="caffeine-on.svg"
    inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -66,7 +66,8 @@
      stroke="#2369ff"
      stroke-width="1.5"
      fill="#2369ff"
-     id="circle1" />
+     id="circle1"
+     style="fill:#b3b3b3;stroke:#b6b4b4;stroke-opacity:1" />
   <polyline
      points="6.5 6.5 17.5 17.5 12 23 12 1 17.5 6.5 6.5 17.5"
      id="polyline1"
diff --git a/config/assets/icons/applets/caffeine-on.svg b/config/assets/icons/applets/caffeine-on.svg
index b59dfe0..2432b4a 100644
--- a/config/assets/icons/applets/caffeine-on.svg
+++ b/config/assets/icons/applets/caffeine-on.svg
@@ -11,7 +11,7 @@
    class="css-i6dzq1"
    version="1.1"
    id="svg1"
-   sodipodi:docname="caffeine-on.svg"
+   sodipodi:docname="caffeine-off.svg"
    inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -66,8 +66,7 @@
      stroke="#2369ff"
      stroke-width="1.5"
      fill="#2369ff"
-     id="circle1"
-     style="fill:#b3b3b3;stroke:#b6b4b4;stroke-opacity:1" />
+     id="circle1" />
   <polyline
      points="6.5 6.5 17.5 17.5 12 23 12 1 17.5 6.5 6.5 17.5"
      id="polyline1"
diff --git a/modules/controlcenter/main.py b/modules/controlcenter/main.py
index 250b5c9..3a1643e 100644
--- a/modules/controlcenter/main.py
+++ b/modules/controlcenter/main.py
@@ -20,6 +20,9 @@ from modules.controlcenter.wifi import WifiConnections
 from services.brightness import Brightness
 from services.mpris import MprisPlayerManager
 from services.network import NetworkClient
+from utils.animator import Animator
+from utils.animator import Animator
+from utils.animator import Animator
 from utils.roam import audio_service, modus_service
 from widgets.wayland import WaylandWindow as Window
 
@@ -178,7 +181,7 @@ class ModusControlCenter(Window):
                 if wlan != "No Connection"
                 else "../../config/assets/icons/applets/wifi-off.svg"
             ),
-            size=46,
+            size=42,
         )
 
         self.bluetooth_widget = Box(
@@ -246,13 +249,13 @@ class ModusControlCenter(Window):
                 if self.focus_mode
                 else "../../config/assets/icons/applets/dnd-off.svg"
             ),
-            size=46,
+            size=42,
         )
 
         self.focus_status_label = Label(
             label="On" if self.focus_mode else "Off",
             style_classes="status-label",
-            h_align="center",
+            h_align="start",
         )
 
         self.focus_widget = Button(
@@ -262,7 +265,21 @@ class ModusControlCenter(Window):
                 orientation="h",
                 children=[
                     self.focus_icon,
-                    Label(label="Focus", style_classes="title-widget", h_align="start"),
+                    Box(
+                        v_expand=True,
+                        h_expand=True,
+                        v_align="center",
+                        orientation="v",
+                        h_align="start",
+                        children=[
+                            Label(
+                                label="Focus",
+                                style_classes="title-widget",
+                                h_align="start",
+                            ),
+                            self.focus_status_label,
+                        ],
+                    ),
                 ],
             ),
             on_clicked=self.set_dont_disturb,
@@ -275,7 +292,7 @@ class ModusControlCenter(Window):
                 if self.flight_mode
                 else "../../config/assets/icons/applets/flight-off.svg"
             ),
-            size=46,
+            size=42,
         )
 
         self.flight_widget = Button(
@@ -305,13 +322,13 @@ class ModusControlCenter(Window):
                 if self.caffeine_mode
                 else "../../config/assets/icons/applets/caffeine-off.svg"
             ),
-            size=46,
+            size=42,
         )
 
         self.caffeine_status_label = Label(
             label="On" if self.caffeine_mode else "Off",
             style_classes="status-label",
-            h_align="center",
+            h_align="start",
         )
 
         self.caffeine_widget = Button(
@@ -323,10 +340,20 @@ class ModusControlCenter(Window):
                 v_align="center",
                 children=[
                     self.caffeine_icon,
-                    Label(
-                        label="Caffeine",
-                        style_classes="title-widget",
-                        h_align="center",
+                    Box(
+                        orientation="vertical",
+                        v_expand=True,
+                        v_align="center",
+                        h_align="start",
+                        h_expand=True,
+                        children=[
+                            Label(
+                                label="Caffeine",
+                                style_classes="title-widget",
+                                h_align="start",
+                            ),
+                            self.caffeine_status_label,
+                        ],
                     ),
                 ],
             ),
@@ -369,7 +396,6 @@ class ModusControlCenter(Window):
                                     style_classes="menu",
                                     children=[
                                         self.focus_widget,
-                                        self.focus_status_label,
                                     ],
                                 ),
                                 # Flight Mode and Caffeine row
@@ -393,7 +419,6 @@ class ModusControlCenter(Window):
                                             style_classes="menu",
                                             children=[
                                                 self.caffeine_widget,
-                                                self.caffeine_status_label,
                                             ],
                                         ),
                                     ],
diff --git a/modules/controlcenter/per_app_volume.py b/modules/controlcenter/per_app_volume.py
index 7e5dfd5..08ba18a 100644
--- a/modules/controlcenter/per_app_volume.py
+++ b/modules/controlcenter/per_app_volume.py
@@ -266,8 +266,17 @@ class PerAppVolumeControl(Box):
             h_expand=True,
             style_classes="compact-app-volume-item",
             children=[
-                app_icon,
-                name_label,
+                Box(
+                    orientation="h",
+                    spacing=3,
+                    v_expand=True,
+                    v_align="center",
+                    name="app-control-box",
+                    children=[
+                        app_icon,
+                        name_label,
+                    ],
+                ),
                 volume_scale,
             ],
         )
diff --git a/styles/controlcenter.css b/styles/controlcenter.css
index 7fa6965..95bf359 100644
--- a/styles/controlcenter.css
+++ b/styles/controlcenter.css
@@ -33,7 +33,7 @@
   font-weight: bold;
 }
 #control-center-widgets {
-  background-color: alpha(#fff, 0.01);
+  background-color: alpha(#010101, 0.01);
   box-shadow: inset 0 0 0 1px alpha(#aaa, 0.4);
   /* border: 1px solid alpha(#111, 0.4); */
   border-radius: 12px;
@@ -958,7 +958,7 @@
 }
 
 .title-widget {
-  margin-top: -14px;
+  /* margin-top: -14px; */
   /* margin-left: 5px; */
   font-size: 13px;
   font-family: "SF Pro Rounded";
@@ -968,9 +968,13 @@
   font-size: 11px;
   font-weight: 500;
   color: #aaa;
-  margin-top: -28px;
-  margin-left: 5px;
+  /* margin-top: -28px; */
+  /* margin-left: 5px; */
   font-family: "SF Pro Rounded";
   /* font-weight: bold; */
   /* margin-bottom: 2px; */
 }
+
+#app-control-box {
+  min-width: 100px;
+}