diff --git a/src/main/gtk-4.0/make_gresource_xml.sh b/src/main/gtk-4.0/make_gresource_xml.sh
index a8aba34c..4f2600d3 100755
--- a/src/main/gtk-4.0/make_gresource_xml.sh
+++ b/src/main/gtk-4.0/make_gresource_xml.sh
@@ -33,6 +33,7 @@ do
 done
 
 echo "    <file>assets/scalable/checkbox-checked-symbolic.svg</file>" >> gtk.gresource.xml
+echo "    <file>assets/scalable/checkbox-checked-big-symbolic.svg</file>" >> gtk.gresource.xml
 echo "    <file>assets/scalable/checkbox-mixed-symbolic.svg</file>" >> gtk.gresource.xml
 echo "    <file>assets/scalable/radio-checked-symbolic.svg</file>" >> gtk.gresource.xml
 echo "    <file>assets/scalable/combobox-arrow-symbolic.svg</file>" >> gtk.gresource.xml
diff --git a/src/sass/gnome-shell/extensions-46-0/_misc.scss b/src/sass/gnome-shell/extensions-46-0/_misc.scss
index 97a79e26..4fe6bc0d 100644
--- a/src/sass/gnome-shell/extensions-46-0/_misc.scss
+++ b/src/sass/gnome-shell/extensions-46-0/_misc.scss
@@ -168,3 +168,22 @@
     }
   }
 }
+
+//
+// Mediacontrols
+//
+
+.popup-menu-container {
+  padding: $base_padding * 2 !important;
+  min-width: 20em !important;
+}
+
+.popup-menu-control-icon {
+  min-height: 24px !important;
+  min-width: 24px !important;
+  border-radius: $circular_radius !important;
+}
+
+.popup-menu-player-icons-icon {
+  background: $divider_color !important;
+}
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 658ecc51..c7b8f456 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -976,7 +976,7 @@ button {
     padding: $container_padding;
     border-radius: $circular_radius;
 
-    &.text-button {
+    &.text-button, &.image-text-button {
       padding-left: $container_padding * 3;
       padding-right: $container_padding * 3;
     }
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 7a23a874..99dca378 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -1291,6 +1291,16 @@ window.background.csd {
   }
 }
 
+//
+// Ptyxis
+//
+
+.ptyxis-window {
+  vte-terminal {
+    background: none;
+  }
+}
+
 //
 // Misc (other)
 //
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index d7d6b242..b920a3ce 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -850,3 +850,121 @@ dialog-host > dialog.osd:not(progressbar):not(button):not(menubutton):not(splitb
     @extend %osd;
   }
 }
+
+// ThemeSelector
+themeselector, // Gnome text editor
+panelthemeselector { // Gnome builder
+  margin: 9px;
+
+  checkbutton {
+    padding: 0;
+    min-height: 44px;
+    min-width: 44px;
+    padding: 1px;
+    background-clip: content-box;
+    border-radius: $circular_radius;
+    box-shadow: inset 0 0 0 1px $borders_color;
+
+    &.follow:checked,
+    &.light:checked,
+    &.dark:checked {
+      box-shadow: inset 0 0 0 2px $primary_color;
+    }
+
+    &.follow {
+      background-image: linear-gradient(to bottom right, #ffffff 50%, #202020 50%);
+    }
+
+    &.light {
+      background-color: #ffffff;
+    }
+
+    &.dark {
+      background-color: #202020;
+    }
+
+    &.theme-selector radio {
+      -gtk-icon-source: none;
+      border: none;
+      background: none;
+      box-shadow: none;
+      min-width: 12px;
+      min-height: 12px;
+      transform: translate(27px, 14px);
+      padding: 3px;
+
+      &:hover, &:active, &:checked {
+        background-color: transparent;
+      }
+
+      &:checked {
+        -gtk-icon-source: -gtk-icontheme("object-select-symbolic");
+        color: white;
+        background-color: $primary_color;
+
+        &, &:hover, &:active {
+          box-shadow: 0 2px 3px -1px rgba(black, 0.08), 0 1px 2px 0 rgba(black, 0.1);
+        }
+      }
+    }
+  }
+}
+
+themeswitcher { // Gnome console
+  padding: 6px;
+
+  .check {
+    min-height: 20px;
+    min-width: 20px;
+    background: none;
+    padding: 0;
+    margin: 0;
+    border-radius: $circular_radius;
+    color: white;
+    background-color: $primary_color;
+
+    &, &:hover, &:active {
+      box-shadow: 0 2px 3px -1px rgba(black, 0.08), 0 1px 2px 0 rgba(black, 0.1);
+    }
+  }
+
+  checkbutton {
+    padding: 0;
+    min-height: 44px;
+    min-width: 44px;
+    padding: 1px;
+    background-clip: content-box;
+    border-radius: $circular_radius;
+    box-shadow: inset 0 0 0 1px $borders_color;
+
+    &:checked {
+      box-shadow: inset 0 0 0 2px $primary_color;
+    }
+
+    radio {
+      &, &:hover, &:active, &:checked, &:checked:hover, &:checked:active {
+        background-color: transparent;
+        border: none;
+        background: none;
+        box-shadow: none;
+        color: transparent;
+        -gtk-icon-source: none;
+        -gtk-icon-size: 0;
+      }
+    }
+
+    &.system {
+      background: linear-gradient(-45deg, #1e1e1e 50%, white 50%);
+    }
+
+    &.light {
+      color: gtkalpha(black, .8);
+      background-color: white;
+    }
+
+    &.dark {
+      color: white;
+      background-color: #1e1e1e;
+    }
+  }
+}