diff --git a/release/WhiteSur-Dark-44-0.tar.xz b/release/WhiteSur-Dark-44-0.tar.xz
index 585ed0e..6ad3fbf 100644
Binary files a/release/WhiteSur-Dark-44-0.tar.xz and b/release/WhiteSur-Dark-44-0.tar.xz differ
diff --git a/release/WhiteSur-Dark-solid-44-0.tar.xz b/release/WhiteSur-Dark-solid-44-0.tar.xz
index c16c3b4..a8e7670 100644
Binary files a/release/WhiteSur-Dark-solid-44-0.tar.xz and b/release/WhiteSur-Dark-solid-44-0.tar.xz differ
diff --git a/release/WhiteSur-Light-44-0.tar.xz b/release/WhiteSur-Light-44-0.tar.xz
index bd81501..d704292 100644
Binary files a/release/WhiteSur-Light-44-0.tar.xz and b/release/WhiteSur-Light-44-0.tar.xz differ
diff --git a/release/WhiteSur-Light-solid-44-0.tar.xz b/release/WhiteSur-Light-solid-44-0.tar.xz
index fb9652c..a8e7856 100644
Binary files a/release/WhiteSur-Light-solid-44-0.tar.xz and b/release/WhiteSur-Light-solid-44-0.tar.xz differ
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index e658cc9..f88fb68 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -285,7 +285,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 .events-button {
   @extend %popover_bubble;
   padding: $base_padding * 3 !important;
-  // margin: 3px 4px !important;
+  margin-top: $base_padding !important;
 }
 
 // Events
diff --git a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
index 604a7a8..be6a0bb 100644
--- a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
+++ b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
@@ -23,11 +23,29 @@
 }
 
 .quick-toggle {
-  background-color: $fill_color;
+  background-color: $fill_color !important;
+
+  &:hover {
+    background-color: $divider_color !important;
+  }
+
+  &:active {
+    background-color: $visit_color !important;
+  }
 
   &:checked {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
+    background-color: $primary_color !important;
+    color: $light_fg_color;
+
+    &:hover {
+      background-color: mix($text_color, $primary_color, 6%) !important;
+      color: $light_fg_color;
+    }
+
+    &:active {
+      background-color: mix($text_color, $primary_color, 15%) !important;
+      color: $light_fg_color;
+    }
   }
 
   & > StBoxLayout { spacing: $base_padding * 1.5; }
@@ -64,13 +82,31 @@
   }
 
   & .quick-toggle-arrow {
-    padding: $base_padding $base_padding * 1.75;
+    padding: $base_padding $base_padding * 2;
     border: none;
-    background-color: $divider_color;
+    background-color: $fill_color !important;
 
+    &:hover {
+      background-color: $divider_color !important;
+    }
+  
+    &:active {
+      background-color: $visit_color !important;
+    }
+  
     &:checked {
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      background-color: $primary_color !important;
+      color: $light_fg_color;
+  
+      &:hover {
+        background-color: mix($text_color, $primary_color, 6%) !important;
+        color: $light_fg_color;
+      }
+  
+      &:active {
+        background-color: mix($text_color, $primary_color, 15%) !important;
+        color: $light_fg_color;
+      }
     }
 
     &:ltr {