diff --git a/src/sass/libadwaita/_widgets.scss b/src/sass/libadwaita/_widgets.scss
index b1526c51..ebcaea95 100644
--- a/src/sass/libadwaita/_widgets.scss
+++ b/src/sass/libadwaita/_widgets.scss
@@ -30,6 +30,7 @@
 @import 'widgets/scale';
 @import 'widgets/scrolling';
 @import 'widgets/shortcuts-window';
+@import 'widgets/shortcuts-dialog';
 @import 'widgets/sidebars';
 @import 'widgets/spinner';
 @import 'widgets/spin-button';
@@ -41,4 +42,4 @@
 @import 'widgets/tooltip';
 @import 'widgets/views';
 @import 'widgets/view-switcher';
-@import 'widgets/window';
\ No newline at end of file
+@import 'widgets/window';
diff --git a/src/sass/libadwaita/widgets/_labels.scss b/src/sass/libadwaita/widgets/_labels.scss
index 10f3a187..6b74a409 100644
--- a/src/sass/libadwaita/widgets/_labels.scss
+++ b/src/sass/libadwaita/widgets/_labels.scss
@@ -10,6 +10,10 @@ label {
   }
 }
 
+.dimmed {
+  opacity: $dim_label_opacity;
+}
+
 .dim-label {
   opacity: $dim_label_opacity;
 }
@@ -36,42 +40,40 @@ label {
 
 .title-1 {
   font-weight: 800;
-  font-size: 20pt;
+  font-size: 181%;
 }
 
 .title-2 {
   font-weight: 800;
-  font-size: 15pt;
+  font-size: 136%;
 }
 
 .title-3 {
   font-weight: 700;
-  font-size: 15pt;
+  font-size: 136%;
 }
 
 .title-4 {
   font-weight: 700;
-  font-size: 13pt;
+  font-size: 118%;
 }
 
 .heading {
   font-weight: 700;
-  font-size: 11pt;
 }
 
 .body {
   font-weight: 400;
-  font-size: 11pt;
 }
 
 .caption-heading {
   font-weight: 700;
-  font-size: 9pt;
+  font-size: 82%;
 }
 
 .caption {
   font-weight: 400;
-  font-size: 9pt;
+  font-size: 82%;
 }
 
 .monospace {
diff --git a/src/sass/libadwaita/widgets/_lists.scss b/src/sass/libadwaita/widgets/_lists.scss
index 5531c1f3..821b6aa1 100644
--- a/src/sass/libadwaita/widgets/_lists.scss
+++ b/src/sass/libadwaita/widgets/_lists.scss
@@ -207,23 +207,48 @@ row.entry {
       opacity: $disabled_opacity;
     }
 
-    .dim-label, .subtitle {
+    .dimmed, .dim-label, .subtitle {
       opacity: 1;
     }
   }
 
-  .edit-icon, .indicator {
-    min-width: 22px;
-    min-height: 22px;
-    padding: $base_padding;
-  }
+  > box.header {
+    border-spacing: 0;
+    margin-left: $base_padding;
+    margin-right: $base_padding;
 
-  .edit-icon:disabled {
-    opacity: $strong_disabled_opacity;
-  }
+    > .editable-area {
+      padding: 0 $base_padding;
 
-  .indicator {
-    opacity: $dimmer_opacity;
+      > .edit-icon, > .indicator {
+        min-width: 24px;
+        min-height: 24px;
+        padding: $base_padding - 1px;
+      }
+
+      > .edit-icon, > .indicator, > .apply-button {
+        &:dir(ltr) { margin-left: $base_padding; }
+        &:dir(rtl) { margin-right: $base_padding; }
+      }
+
+      > .edit-icon:disabled {
+        opacity: $strong_disabled_opacity;
+      }
+
+      > .indicator {
+        opacity: $dimmer_opacity;
+      }
+    }
+
+    > .prefixes {
+      &:dir(ltr) { margin-left: $base_padding; }
+      &:dir(rtl) { margin-right: $base_padding; }
+    }
+
+    > .suffixes {
+      &:dir(ltr) { margin-right: $base_padding; }
+      &:dir(rtl) { margin-left: $base_padding; }
+    }
   }
 
   &.monospace {
@@ -451,6 +476,10 @@ row.button {
     margin-right: $base_padding * 2;
     border-spacing: $base_padding;
     min-height: $large_size + 2px;
+
+    > .icon:disabled {
+      filter: Opacity($disabled_opacity);
+    }
   }
 
   .title {
diff --git a/src/sass/libadwaita/widgets/_shortcuts-dialog.scss b/src/sass/libadwaita/widgets/_shortcuts-dialog.scss
new file mode 100644
index 00000000..781995a8
--- /dev/null
+++ b/src/sass/libadwaita/widgets/_shortcuts-dialog.scss
@@ -0,0 +1,42 @@
+dialog.shortcuts {
+  preferencespage > scrolledwindow > viewport > clamp > box {
+    border-spacing: 18px;
+
+    preferencesgroup + preferencesgroup box.header {
+      margin-top: 6px;
+    }
+  }
+
+  .shortcut-row {
+    padding: 9px 12px;
+    min-height: 36px;
+
+    .title-box {
+      border-spacing: 3px;
+
+      > .subtitle {
+        @extend .caption;
+        @extend .dimmed;
+      }
+    }
+  }
+}
+
+shortcut-label {
+  &, > box {
+    border-spacing: 6px;
+  }
+
+  .keycap {
+    background: gtkalpha(currentColor, 0.1);
+    box-shadow: inset 0 -2px $border_color;
+
+    border-radius: 6px;
+    padding: 6px;
+    min-width: 20px;
+  }
+
+  > .dimmed {
+    padding: 6px 0;
+  }
+}