diff --git a/Userland/Applications/CharacterMap/CharacterMapWindow.gml b/Userland/Applications/CharacterMap/CharacterMapWindow.gml
index b2d0933910..d4e73d1336 100644
--- a/Userland/Applications/CharacterMap/CharacterMapWindow.gml
+++ b/Userland/Applications/CharacterMap/CharacterMapWindow.gml
@@ -40,7 +40,7 @@
             }
 
             @GUI::Widget {
-                shrink_to_fit: true
+                preferred_height: "fit"
                 layout: @GUI::HorizontalBoxLayout {
                     spacing: 4
                     margins: [0, 2, 0, 2]
diff --git a/Userland/Applications/ClockSettings/ClockSettingsWidget.gml b/Userland/Applications/ClockSettings/ClockSettingsWidget.gml
index 0b8ea5a471..e4b2723838 100644
--- a/Userland/Applications/ClockSettings/ClockSettingsWidget.gml
+++ b/Userland/Applications/ClockSettings/ClockSettingsWidget.gml
@@ -19,7 +19,7 @@
         }
 
         @GUI::Widget {
-            shrink_to_fit: true
+            preferred_height: "fit"
             layout: @GUI::VerticalBoxLayout {
                 spacing: 4
             }
@@ -59,15 +59,15 @@
             @GUI::Label {
                 text: "Preview:"
                 text_alignment: "CenterLeft"
+                preferred_width: 120
             }
 
-            @GUI::Frame {
-                layout: @GUI::VerticalBoxLayout {}
-
-                @GUI::Label {
-                    name: "clock_preview"
-                    text: "12:34:56"
-                }
+            @GUI::Label {
+                shape: "Container"
+                thickness: 2
+                shadow: "Sunken"
+                name: "clock_preview"
+                text: "12:34:56"
             }
         }
     }
diff --git a/Userland/Applications/PixelPaint/EditGuideDialog.cpp b/Userland/Applications/PixelPaint/EditGuideDialog.cpp
index aeb8716eaa..a4472e85e8 100644
--- a/Userland/Applications/PixelPaint/EditGuideDialog.cpp
+++ b/Userland/Applications/PixelPaint/EditGuideDialog.cpp
@@ -20,7 +20,7 @@ EditGuideDialog::EditGuideDialog(GUI::Window* parent_window, String const& offse
 {
     set_title("Create new Guide");
     set_icon(parent_window->icon());
-    resize(200, 120);
+    resize(200, 130);
     set_resizable(false);
 
     auto& main_widget = set_main_widget<GUI::Widget>();
diff --git a/Userland/Applications/PixelPaint/EditGuideDialog.gml b/Userland/Applications/PixelPaint/EditGuideDialog.gml
index ea50130045..32b3c08494 100644
--- a/Userland/Applications/PixelPaint/EditGuideDialog.gml
+++ b/Userland/Applications/PixelPaint/EditGuideDialog.gml
@@ -9,7 +9,7 @@
 
         @GUI::GroupBox {
             title: "Orientation"
-            shrink_to_fit: true
+            preferred_height: "fit"
             layout: @GUI::HorizontalBoxLayout {
                 margins: [10, 8, 8]
             }
@@ -30,7 +30,7 @@
         layout: @GUI::HorizontalBoxLayout {
             margins: [4]
         }
-        shrink_to_fit: true
+        preferred_height: "fit"
 
         @GUI::Label {
             text: "Offset"
@@ -48,18 +48,16 @@
             margins: [4]
         }
 
-        @GUI::Widget {}
+        @GUI::Layout::Spacer {}
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "ok_button"
             text: "OK"
-            max_width: 75
         }
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "cancel_button"
             text: "Cancel"
-            max_width: 75
         }
     }
 }
diff --git a/Userland/Applications/PixelPaint/FilterGallery.gml b/Userland/Applications/PixelPaint/FilterGallery.gml
index 470b570617..63bacae90c 100644
--- a/Userland/Applications/PixelPaint/FilterGallery.gml
+++ b/Userland/Applications/PixelPaint/FilterGallery.gml
@@ -45,16 +45,14 @@
 
         @GUI::Widget {}
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "apply_button"
             text: "Apply"
-            max_width: 75
         }
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "cancel_button"
             text: "Cancel"
-            max_width: 75
         }
     }
 }
diff --git a/Userland/Applications/PixelPaint/FilterParams.h b/Userland/Applications/PixelPaint/FilterParams.h
index 4d7a9c63d5..dcbda9220e 100644
--- a/Userland/Applications/PixelPaint/FilterParams.h
+++ b/Userland/Applications/PixelPaint/FilterParams.h
@@ -65,6 +65,7 @@ private:
             for (size_t column = 0; column < columns; ++column) {
                 if (index < columns * rows) {
                     auto& textbox = horizontal_container.template add<GUI::TextBox>();
+                    textbox.set_min_width(22);
                     textbox.on_change = [&, row = row, column = column] {
                         auto& element = m_matrix.elements()[row][column];
                         char* endptr = nullptr;
diff --git a/Userland/Applications/PixelPaint/ResizeImageDialog.gml b/Userland/Applications/PixelPaint/ResizeImageDialog.gml
index f42f488d77..990f6ea634 100644
--- a/Userland/Applications/PixelPaint/ResizeImageDialog.gml
+++ b/Userland/Applications/PixelPaint/ResizeImageDialog.gml
@@ -8,7 +8,7 @@
 
     @GUI::GroupBox {
         title: "Size (px)"
-        shrink_to_fit: true
+        preferred_height: "fit"
         layout: @GUI::VerticalBoxLayout {
             margins: [4]
         }
@@ -69,7 +69,7 @@
 
     @GUI::GroupBox {
         title: "Scaling Mode"
-        shrink_to_fit: true
+        preferred_height: "fit"
         layout: @GUI::VerticalBoxLayout {
             margins: [4]
         }
@@ -97,18 +97,16 @@
     @GUI::Widget {
         layout: @GUI::HorizontalBoxLayout {}
 
-        @GUI::Widget {}
+        @GUI::Layout::Spacer {}
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "ok_button"
             text: "OK"
-            max_width: 75
         }
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "cancel_button"
             text: "Cancel"
-            max_width: 75
         }
     }
 }
diff --git a/Userland/Applications/TerminalSettings/TerminalSettingsView.gml b/Userland/Applications/TerminalSettings/TerminalSettingsView.gml
index 7c4fbf8444..6608bc925c 100644
--- a/Userland/Applications/TerminalSettings/TerminalSettingsView.gml
+++ b/Userland/Applications/TerminalSettings/TerminalSettingsView.gml
@@ -41,15 +41,13 @@
                 spacing: 6
             }
 
-            @GUI::Frame {
-                preferred_height: "fit"
+            @GUI::Label {
                 background_role: "Base"
+                shape: "Container"
+                shadow: "Sunken"
+                thickness: 2
                 fill_with_background_color: true
-                layout: @GUI::VerticalBoxLayout {}
-
-                @GUI::Label {
-                    name: "terminal_font_label"
-                }
+                name: "terminal_font_label"
             }
 
             @GUI::Button {
@@ -62,7 +60,7 @@
 
     @GUI::GroupBox {
         title: "Cursor settings"
-        shrink_to_fit: true
+        preferred_height: "fit"
         layout: @GUI::VerticalBoxLayout {
             margins: [16, 8, 8]
         }
diff --git a/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml b/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml
index d9b33d5b12..754060ae8e 100644
--- a/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml
+++ b/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml
@@ -56,18 +56,16 @@
         max_height: 24
         layout: @GUI::HorizontalBoxLayout {}
 
-        @GUI::Widget {}
+        @GUI::Layout::Spacer {}
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "ok_button"
             text: "OK"
-            max_width: 75
         }
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "cancel_button"
             text: "Cancel"
-            max_width: 75
         }
     }
 }
diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.gml b/Userland/Libraries/LibGUI/PasswordInputDialog.gml
index 931403bd3f..8d91888248 100644
--- a/Userland/Libraries/LibGUI/PasswordInputDialog.gml
+++ b/Userland/Libraries/LibGUI/PasswordInputDialog.gml
@@ -14,6 +14,8 @@
             fixed_height: 32
             fixed_width: 32
         }
+
+        @GUI::Layout::Spacer {}
     }
 
     @GUI::Widget {