diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index ff4c73d3..9cc0ccd6 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2104,18 +2104,18 @@ headerbar {
   // Reset linking entrys
   .linked:not(.vertical) > entry {
     @include entry(header-normal);
-    margin: 8px ($container_padding / 2 + 1px);
+    // margin: 8px ($container_padding / 2 + 1px);
     padding: 0 $container_padding * 2;
-    border-radius: $bt_radius;
+    // border-radius: $bt_radius;
     border: none;
 
     &:focus {
-      border-radius: $bt_radius;
+      // border-radius: $bt_radius;
       @include entry(header-focus);
     }
 
     &:disabled {
-      border-radius: $bt_radius;
+      // border-radius: $bt_radius;
       @include entry(header-insensitive);
     }
 
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 0f6386e8..bdd1a441 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -26,6 +26,37 @@ $flap_sidebar_size: 240px;
                                                          $header_border 40%);
 }
 
+%nautilus_view {
+  border-radius: $bt_radius;
+  transition: background-color $longer_duration $deceleration_curve;
+
+  &:hover {
+    background-color: $fill_color;
+    transition-duration: $shorter_duration;
+  }
+
+  &:active:not(:selected):not(:hover) {
+    color: $fg_color;
+    background-color: transparent;
+  }
+
+  &:selected:active, &:hover:active {
+    color: $fg_color;
+    background-color: $track_color;
+  }
+
+  &:disabled {
+    color: $disabled_fg_color;
+  }
+
+  &:selected {
+    color: $fg_color;
+    background-color: $visit_color;
+
+    &:hover { background-color: $track_color; }
+  }
+}
+
 .nautilus-window {
   @if $nautilus_style == 'stable' or $nautilus_style == 'glassy' {
     &.background.csd {
@@ -115,34 +146,7 @@ $flap_sidebar_size: 240px;
     background-color: $base_color;
 
     child.activatable {
-      border-radius: $bt_radius;
-      transition: background-color $longer_duration $deceleration_curve;
-
-      &:hover {
-        background-color: $fill_color;
-        transition-duration: $shorter_duration;
-      }
-
-      &:active:not(:selected):not(:hover) {
-        color: $fg_color;
-        background-color: transparent;
-      }
-
-      &:selected:active, &:hover:active {
-        color: $fg_color;
-        background-color: $track_color;
-      }
-
-      &:disabled {
-        color: $disabled_fg_color;
-      }
-
-      &:selected {
-        color: $fg_color;
-        background-color: $visit_color;
-
-        &:hover { background-color: $track_color; }
-      }
+      @extend %nautilus_view;
     }
   }
 
@@ -160,8 +164,19 @@ $flap_sidebar_size: 240px;
       > row.activatable {
         padding: 0;
         margin: 0;
-        border-radius: $bt_radius;
-        @extend %row_activatable;
+        @extend %nautilus_view;
+
+        > cell {
+          padding: 0;
+
+          > widget#NautilusViewCell {
+            padding: $container_padding $container_padding * 1.5;
+          }
+        }
+
+        + row {
+          margin-top: $container_padding / 2;
+        }
       }
     }
   }