diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 50dcdf7789..f2047cd70f 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -2112,6 +2112,28 @@ GtkFileChooserDialog {
   }
 }
 
+$_placesidebar_icons_opacity: 0.9;
+GtkSidebarRow {
+  // Needs overriding of the GtkListBoxRow padding
+  @at-root .list-row {
+    padding: 0px;
+  }
+  // Using margins/padding directly in the SidebarRow
+  // will make the animation of the new bookmark row jump
+  .sidebar-revealer {
+    padding: 4px 14px 4px 12px;
+  }
+  .sidebar-icon {
+    opacity: $_placesidebar_icons_opacity; // dim the device icons
+    &:dir(ltr) { padding-right: 8px; }
+    &:dir(rtl) { padding-left: 8px; }
+  }
+  .sidebar-label {
+    &:dir(ltr) { padding-right: 2px; }
+    &:dir(rtl) { padding-left: 2px; }
+  }
+}
+
 // Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color
 GtkPlacesSidebar.sidebar .view {
 
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 534a2186dd..08804457bf 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -2216,162 +2216,160 @@ GtkCalendar {
 .message-dialog .dialog-action-area .button {
   padding: 8px; }
 
-.message-dialog {
-  -GtkDialog-button-spacing: 0; }
-  .message-dialog .titlebar {
-    border-style: none;
-    box-shadow: inset 0 1px #fff; }
-  .message-dialog.csd {
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px; }
-    .message-dialog.csd .dialog-action-area .button {
-      padding: 12px;
-      border-radius: 0;
+.message-dialog .titlebar {
+  border-style: none;
+  box-shadow: inset 0 1px #fff; }
+.message-dialog.csd {
+  border-bottom-left-radius: 9px;
+  border-bottom-right-radius: 9px; }
+  .message-dialog.csd .dialog-action-area .button {
+    padding: 12px;
+    border-radius: 0;
+    border-width: 2px;
+    border-style: solid;
+    color: #000;
+    background-image: none;
+    background-color: #fff;
+    border-color: #7f7f7f; }
+    .message-dialog.csd .dialog-action-area .button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
-      background-image: none;
       background-color: #fff;
+      border-color: #7f7f7f;
+      background-image: none; }
+    .message-dialog.csd .dialog-action-area .button:active {
+      border-width: 2px;
+      border-style: solid;
+      background-image: none;
+      color: white;
+      background-color: black;
       border-color: #7f7f7f; }
-      .message-dialog.csd .dialog-action-area .button:hover {
-        border-width: 2px;
-        border-style: solid;
-        color: #000;
-        background-color: #fff;
-        border-color: #7f7f7f;
-        background-image: none; }
-      .message-dialog.csd .dialog-action-area .button:active {
-        border-width: 2px;
-        border-style: solid;
-        background-image: none;
-        color: white;
-        background-color: black;
-        border-color: #7f7f7f; }
-      .message-dialog.csd .dialog-action-area .button:insensitive {
-        border-width: 2px;
-        border-style: solid;
-        color: #7f7f7f;
-        background-color: white;
-        border-color: #7f7f7f;
-        background-image: none;
-        text-shadow: none;
-        icon-shadow: none; }
-      .message-dialog.csd .dialog-action-area .button:backdrop {
-        border-width: 2px;
-        border-style: solid;
-        color: #000;
-        background-color: #fff;
-        border-color: #8b8b8b;
-        background-image: none;
-        text-shadow: none;
-        icon-shadow: none; }
-      .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
-        border-width: 2px;
-        border-style: solid;
-        color: #7f7f7f;
-        background-color: white;
-        border-color: #8b8b8b;
-        background-image: none; }
-      .message-dialog.csd .dialog-action-area .button.suggested-action {
+    .message-dialog.csd .dialog-action-area .button:insensitive {
+      border-width: 2px;
+      border-style: solid;
+      color: #7f7f7f;
+      background-color: white;
+      border-color: #7f7f7f;
+      background-image: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .message-dialog.csd .dialog-action-area .button:backdrop {
+      border-width: 2px;
+      border-style: solid;
+      color: #000;
+      background-color: #fff;
+      border-color: #8b8b8b;
+      background-image: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
+      border-width: 2px;
+      border-style: solid;
+      color: #7f7f7f;
+      background-color: white;
+      border-color: #8b8b8b;
+      background-image: none; }
+    .message-dialog.csd .dialog-action-area .button.suggested-action {
+      border-width: 2px;
+      border-style: solid;
+      color: white;
+      background-image: none;
+      background-color: #4a90d9;
+      border-color: #1c5187; }
+      .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
         border-width: 2px;
         border-style: solid;
         color: white;
-        background-image: none;
         background-color: #4a90d9;
+        border-color: #1c5187;
+        background-image: none; }
+      .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+        border-width: 2px;
+        border-style: solid;
+        background-image: none;
+        color: black;
+        background-color: #b56f26;
         border-color: #1c5187; }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
-          border-width: 2px;
-          border-style: solid;
-          color: white;
-          background-color: #4a90d9;
-          border-color: #1c5187;
-          background-image: none; }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:active {
-          border-width: 2px;
-          border-style: solid;
-          background-image: none;
-          color: black;
-          background-color: #b56f26;
-          border-color: #1c5187; }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-          border-width: 2px;
-          border-style: solid;
-          color: white;
-          background-color: #4a90d9;
-          border-color: #4a90d9;
-          background-image: none;
-          text-shadow: none;
-          icon-shadow: none; }
-          .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
-            border-width: 2px;
-            border-style: solid;
-            color: #7f7f7f;
-            background-color: white;
-            border-color: #8b8b8b;
-            background-image: none; }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-          border-width: 2px;
-          border-style: solid;
-          color: #7f7f7f;
-          background-color: white;
-          border-color: #7f7f7f;
-          background-image: none;
-          text-shadow: none;
-          icon-shadow: none; }
-      .message-dialog.csd .dialog-action-area .button.destructive-action {
+      .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
         border-width: 2px;
         border-style: solid;
         color: white;
+        background-color: #4a90d9;
+        border-color: #4a90d9;
         background-image: none;
-        background-color: #ef2929;
-        border-color: #8e0b0b; }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
-          border-width: 2px;
-          border-style: solid;
-          color: white;
-          background-color: #ef2929;
-          border-color: #8e0b0b;
-          background-image: none; }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:active {
-          border-width: 2px;
-          border-style: solid;
-          background-image: none;
-          color: black;
-          background-color: #10d6d6;
-          border-color: #8e0b0b; }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-          border-width: 2px;
-          border-style: solid;
-          color: white;
-          background-color: #ef2929;
-          border-color: #ef2929;
-          background-image: none;
-          text-shadow: none;
-          icon-shadow: none; }
-          .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
-            border-width: 2px;
-            border-style: solid;
-            color: #7f7f7f;
-            background-color: white;
-            border-color: #8b8b8b;
-            background-image: none; }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+        text-shadow: none;
+        icon-shadow: none; }
+        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
           border-width: 2px;
           border-style: solid;
           color: #7f7f7f;
           background-color: white;
-          border-color: #7f7f7f;
-          background-image: none;
-          text-shadow: none;
-          icon-shadow: none; }
-    .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      border-right-style: none;
-      border-bottom-style: none; }
-    .message-dialog.csd .dialog-action-area .button:last-child {
-      border-bottom-right-radius: 7px; }
-    .message-dialog.csd .dialog-action-area .button:first-child {
-      border-left-style: none;
-      border-bottom-left-radius: 7px; }
+          border-color: #8b8b8b;
+          background-image: none; }
+      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
+        border-width: 2px;
+        border-style: solid;
+        color: #7f7f7f;
+        background-color: white;
+        border-color: #7f7f7f;
+        background-image: none;
+        text-shadow: none;
+        icon-shadow: none; }
+    .message-dialog.csd .dialog-action-area .button.destructive-action {
+      border-width: 2px;
+      border-style: solid;
+      color: white;
+      background-image: none;
+      background-color: #ef2929;
+      border-color: #8e0b0b; }
+      .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+        border-width: 2px;
+        border-style: solid;
+        color: white;
+        background-color: #ef2929;
+        border-color: #8e0b0b;
+        background-image: none; }
+      .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+        border-width: 2px;
+        border-style: solid;
+        background-image: none;
+        color: black;
+        background-color: #10d6d6;
+        border-color: #8e0b0b; }
+      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
+        border-width: 2px;
+        border-style: solid;
+        color: white;
+        background-color: #ef2929;
+        border-color: #ef2929;
+        background-image: none;
+        text-shadow: none;
+        icon-shadow: none; }
+        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+          border-width: 2px;
+          border-style: solid;
+          color: #7f7f7f;
+          background-color: white;
+          border-color: #8b8b8b;
+          background-image: none; }
+      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+        border-width: 2px;
+        border-style: solid;
+        color: #7f7f7f;
+        background-color: white;
+        border-color: #7f7f7f;
+        background-image: none;
+        text-shadow: none;
+        icon-shadow: none; }
+  .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+    border-right-style: none;
+    border-bottom-style: none; }
+  .message-dialog.csd .dialog-action-area .button:last-child {
+    border-bottom-right-radius: 7px; }
+  .message-dialog.csd .dialog-action-area .button:first-child {
+    border-left-style: none;
+    border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .search-bar {
   background-color: #fff;
@@ -2398,6 +2396,21 @@ GtkFileChooserDialog .dialog-action-box {
       border-right: none;
       border-left: 1px solid #7f7f7f; }
 
+.list-row {
+  padding: 0px; }
+GtkSidebarRow .sidebar-revealer {
+  padding: 4px 14px 4px 12px; }
+GtkSidebarRow .sidebar-icon {
+  opacity: 0.9; }
+  GtkSidebarRow .sidebar-icon:dir(ltr) {
+    padding-right: 8px; }
+  GtkSidebarRow .sidebar-icon:dir(rtl) {
+    padding-left: 8px; }
+GtkSidebarRow .sidebar-label:dir(ltr) {
+  padding-right: 2px; }
+GtkSidebarRow .sidebar-label:dir(rtl) {
+  padding-left: 2px; }
+
 GtkPlacesSidebar.sidebar .view {
   color: #000;
   background-color: transparent; }