diff --git a/install.sh b/install.sh
index 8adbfe53..b4f3b754 100755
--- a/install.sh
+++ b/install.sh
@@ -14,11 +14,11 @@ DEST_DIR=
 scheme=
 window=
 
-if [ "$UID" -eq "$ROOT_UID" ]; then
+if [[ "$UID" -eq "$ROOT_UID" ]]; then
   DEST_DIR="/usr/share/themes"
-elif [ -n "$XDG_DATA_HOME" ]; then
+elif [[ -n "$XDG_DATA_HOME" ]]; then
   DEST_DIR="$XDG_DATA_HOME/themes"
-elif [ -d "$HOME/.local/share/themes" ]; then
+elif [[ -d "$HOME/.local/share/themes" ]]; then
   DEST_DIR="$HOME/.local/share/themes"
 else
   DEST_DIR="$HOME/.themes"
@@ -687,7 +687,7 @@ uninstall() {
 
   if [[ -d "${THEME_DIR}" ]]; then
     echo -e "Uninstall ${THEME_DIR}... "
-    rm -rf "${THEME_DIR}"
+    rm -rf "${THEME_DIR}"{'','-hdpi','-xhdpi'}
   fi
 }
 
diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index 8c9dfac8..9c899f87 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -20,10 +20,10 @@ $root-font-size: if($compact == 'false', 14px, 13px);
 // Radiuses
 //
 
-$window-radius: 12px;
 $modal-radius: 6px;
 $corner-radius: 6px;
 $menu-radius: $corner-radius + $space-size;
+$window-radius: $corner-radius + $space-size;
 $circular-radius: 9999px;
 
 //
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 5b0969e5..a22cc488 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1055,7 +1055,7 @@ searchbar > revealer > box,
 
 searchbar > revealer > box {
   // workaround: undo the GtkContainer:border-width and use CSS padding instead
-  margin: -$space-size;
+  margin: -6px;
 }
 
 
@@ -1366,7 +1366,7 @@ headerbar {
 
   > box.left,
   > box.right { // Titlebutton space
-    padding: 0 if($window_button == 'mac', $space-size, $space-size - 2px);
+    padding: 0 if($window_button == 'mac', 6px, 4px);
   }
 
   button:not(.suggested-action):not(.destructive-action) {
@@ -1689,7 +1689,7 @@ menu {
     transition: background-color $duration $ease-out;
     min-height: 20px;
     min-width: 40px;
-    padding: 4px 8px;
+    padding: ($menuitem-size - 20px) / 2 ($large-size - 40px) / 2;
     color: $text;
     font: initial;
     text-shadow: none;
@@ -3814,7 +3814,7 @@ decoration {
   min-height: 16px;
   min-width: 16px;
   padding: 0;
-  margin: 0 $space-size - 2px;
+  margin: 0 $space-size / 2 + 1px;
 
   &.minimize, &.maximize, &.close {
     color: transparent;
@@ -3870,7 +3870,7 @@ decoration {
   min-height: 22px;
   min-width: 22px;
   padding: 0;
-  margin: 0 $space-size - 2px;
+  margin: 0 $space-size / 2 + 1px;
 
   &.minimize, &.maximize, &.close {
     color: $titlebar-text-secondary;
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 4565bdae..ae0b0fa8 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -5099,8 +5099,8 @@ window {
   min-height: 16px;
   min-width: 16px;
   padding: ($medium-size - 16px) / 2 0;
-  margin-left: $space-size - 2px;
-  margin-right: $space-size - 2px;
+  margin-left: $space-size / 2 + 1px;
+  margin-right: $space-size / 2 + 1px;
 
   &.minimize, &.maximize, &.close {
     color: transparent;
diff --git a/src/sass/libadwaita/widgets/_header-bar.scss b/src/sass/libadwaita/widgets/_header-bar.scss
index d6c9e9af..c4c2c983 100644
--- a/src/sass/libadwaita/widgets/_header-bar.scss
+++ b/src/sass/libadwaita/widgets/_header-bar.scss
@@ -231,8 +231,8 @@ $titlebutton_close: $button-close;
   min-height: 16px;
   min-width: 16px;
   padding: ($medium_size - 16px) / 2 0;
-  margin-left: $base_padding - 2px;
-  margin-right: $base_padding - 2px;
+  margin-left: $base_padding / 2 + 1px;
+  margin-right: $base_padding / 2 + 1px;
   box-shadow: none;
 
   &.minimize, &.maximize, &.close {
@@ -289,8 +289,8 @@ $titlebutton_close: $button-close;
   min-height: 22px;
   min-width: 22px;
   padding: ($medium-size - 22px) / 2 0;
-  margin-left: $base_padding - 2px;
-  margin-right: $base_padding - 2px;
+  margin-left: $base_padding / 2 + 1px;
+  margin-right: $base_padding / 2 + 1px;
 
   &.minimize, &.maximize, &.close {
     color: gtkalpha($headerbar_fg_color, 0.75);
@@ -321,19 +321,19 @@ $titlebutton_close: $button-close;
 }
 
 windowcontrols {
-  border-spacing: $base_padding;
+  border-spacing: 6px;
 
   &:not(.empty) {
     &.start:dir(ltr),
     &.end:dir(rtl) {
-      margin-right: $base_padding;
-      margin-left: $base_padding;
+      margin-right: 6px;
+      margin-left: 6px;
     }
 
     &.start:dir(rtl),
     &.end:dir(ltr) {
-      margin-left: $base_padding;
-      margin-right: $base_padding;
+      margin-left: 6px;
+      margin-right: 6px;
     }
   }
 
diff --git a/src/sass/libadwaita/widgets/_menus.scss b/src/sass/libadwaita/widgets/_menus.scss
index 5158fb3f..8abcbb77 100644
--- a/src/sass/libadwaita/widgets/_menus.scss
+++ b/src/sass/libadwaita/widgets/_menus.scss
@@ -12,9 +12,9 @@ popover.menu {
 
     button.image-button.model {
       @extend %button_basic_flat;
-      min-height: 32px;
-      min-width: 32px;
-      padding: 0;
+      min-height: $menuitem_size;
+      min-width: $menuitem_size;
+      padding: 2px;
       border: none;
       outline: none;
       transition: none;
@@ -35,7 +35,7 @@ popover.menu {
     button.circular.image-button.model {
       @extend %button_basic_flat;
       outline: none;
-      padding: 11px;
+      padding: $base_padding * 2;
       box-shadow: inset 0 0 0 1px $border_color;
 
       &:selected {
@@ -124,9 +124,9 @@ popover.menu {
   }
 
   modelbutton {
-    min-height: 32px;
+    min-height: $menuitem_size;
     min-width: 40px;
-    padding: 0 $menu_padding;
+    padding: 2px $menu_padding;
     border-radius: $menuitem_radius;
     @include button(flat-normal);
 
@@ -213,7 +213,7 @@ popover.menu {
     > row {
       margin: 0 $menu_margin;
 
-      padding: $menu_padding;
+      padding: $base_padding $menu_padding;
       min-height: 0;
     }
   }
@@ -225,7 +225,7 @@ menubar {
 
   > item {
     min-height: 16px;
-    padding: 4px 8px;
+    padding: $base_padding - 2px $base_padding + 2px;
     border-radius: $button_radius;
 
     &:selected { //Seems like it :hover even with keyboard focus