diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss
index 5b78393..2812311 100644
--- a/src/sass/gtk/_applications-3.0.scss
+++ b/src/sass/gtk/_applications-3.0.scss
@@ -376,7 +376,9 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
     .path-bar-box {
       color: transparent;
       background: none;
-      padding: 0 12px;
+      padding: 0 $container_padding * 2;
+      border: none;
+      margin: 0;
 
       .linked.nautilus-path-bar { // for ≥ 3.31.90
         > button:not(:only-child):last-child {
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 111c678..c74782d 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -790,7 +790,7 @@ button {
     }
   }
 
-  &.image-button {
+  &.image-button, &.popup {
     min-height: $menuitem_size - 4px;
     padding-left: $container_padding;
     padding-right: $container_padding;
@@ -1466,7 +1466,8 @@ actionbar {
 
 // Headerbar Entries
 %headerbar_entrys {
-  // min-height: $menuitem_size - 4px;
+  min-height: $menuitem_size - 4px;
+  padding: 2px $container_padding + 2px;
   @include entry(header-normal);
 
   &:backdrop { opacity: 0.65; background-image: none; }
@@ -1598,6 +1599,7 @@ headerbar {
     border-radius: $bt_radius;
     border: none;
     box-shadow: none;
+    margin-top: if($laptop == 'true', 8px, 10px);
 
     &:disabled { background: none; }
   }
@@ -1611,8 +1613,9 @@ headerbar {
   // Reset linking entrys
   .linked:not(.vertical) > entry {
     @include entry(header-normal);
-    margin: 8px ($container_padding/2 + 1px);
-    padding: 0 $container_padding * 2;
+    margin-left: $container_padding / 2;
+    margin-right: $container_padding / 2;
+    margin-top: if($laptop == 'true', 8px, 10px);
     border-radius: $bt_radius;
     border: none;
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 4443bf4..c2c09d2 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2380,15 +2380,31 @@ popover.menu {
     min-width: $large_size * 2;
     padding: $container_padding / 3 $container_padding;
     border-radius: $mn_radius - $container_padding / 2;
+    transition: none;
 
-    &:selected {
+    &:focus {
+      background-color: transparent;
+      color: $fg_color;
+      box-shadow: inset 0 0 0 2px rgba($fg_color, 0.06);
+      transition: none;
+    }
+
+    &:hover {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
+      transition: background-color $shorter_duration $deceleration_curve;
+    }
+
+    &:hover:focus {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+      box-shadow: none;
     }
 
     &:selected:active {
       color: $selected_fg_color;
       background-color: darken($selected_bg_color, 5%); // matching buttons
+      transition: background-color $shorter_duration $deceleration_curve;
     }
   }
 
@@ -4432,8 +4448,8 @@ popover.emoji-picker {
 }
 
 .emoji-toolbar {
-  padding: $container_padding;
-  border-spacing: $container_padding;
+  padding: $container_padding / 3;
+  border-spacing: $container_padding / 3;
   border-top: 1px solid $borders_color;
 }
 
@@ -4464,7 +4480,7 @@ popover.emoji-picker emoji {
 }
 
 emoji-completion-row > box {
-  border-spacing: $container_padding + 4px;
+  border-spacing: $container_padding;
   padding: $container_padding / 2 $container_padding + 4px;
 }