diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index 05a717519..25e29ef64 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -6,12 +6,12 @@ $app_icon_size: 96px;
 .icon-grid {
   row-spacing: $base_padding * 2;
   column-spacing: $base_padding * 2;
-  max-row-spacing: $base_padding * 12;
-  max-column-spacing: $base_padding * 12;
+  max-row-spacing: $base_padding * 7;
+  max-column-spacing: $base_padding * 7;
   page-padding-top: $base_padding * 4;
   page-padding-bottom: $base_padding * 4;
-  page-padding-left: $base_padding * 2;
-  page-padding-right: $base_padding * 2;
+  page-padding-left: $base_padding * 3;
+  page-padding-right: $base_padding * 3;
 }
 
 /* App Icons */
@@ -20,9 +20,7 @@ $app_icon_size: 96px;
 .app-well-app {
   @include overview_icon($osd_fg_color);
 
-  .overview-icon {
-    padding: $base_padding*2;
-  }
+  .overview-icon {padding: $base_padding*2;}
   .overview-icon.overview-icon-with-label {
     > StBoxLayout {
       spacing: $base_padding;
diff --git a/data/theme/gnome-shell-sass/widgets/_dash.scss b/data/theme/gnome-shell-sass/widgets/_dash.scss
index 462e66327..25755e73d 100644
--- a/data/theme/gnome-shell-sass/widgets/_dash.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dash.scss
@@ -8,7 +8,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
 // container for the dash
 #dash {
   @extend %caption;
-  margin: 2em;
+  margin: $base_margin * 3;
 
   .placeholder {
     // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
@@ -38,9 +38,12 @@ $dash_border_radius: $modal_radius + $dash_padding;
 
 // items on the dash
 .dash-item-container {
+  > * {margin: 0 2px;}
+  &:ltr:first-child {margin-left: 0;}
+  &:rtl:first-child {margin-right: 0;}
+
   // each app item on the dash
   .app-well-app .overview-icon {
-    margin: 0 4px;
     padding: $base_padding;
   }
 
@@ -51,6 +54,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
 // separator between favourites and running apps
 .dash-separator {
   width: 1px;
+  margin: 0 $base_margin;
   background-color: $borders_color;
 }
 
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index ac2e8efe2..83268cbb3 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -3,7 +3,7 @@
 
 // main list
 .message-list {
-  width: 32em;
+  width: 29em;
   border: solid $borders_color;
 
   // padding and margins to account for scrollbar
diff --git a/data/theme/gnome-shell-sass/widgets/_search-results.scss b/data/theme/gnome-shell-sass/widgets/_search-results.scss
index 4ad3f0821..644c53db5 100644
--- a/data/theme/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-results.scss
@@ -1,15 +1,18 @@
 /* Search */
 
 // search overview container
+#searchResults {
+  margin: 0 $base_margin;
+}
+
 #searchResultsContent {
-  max-width: 1024px;
-  spacing: $base_margin * 2;
+  max-width: 1072px;
 }
 
 // search results sections "the boxes"
 .search-section {
   // This should be equal to #searchResultsContent spacing
-  spacing: $base_margin * 2;
+  spacing: $base_padding*3;
 
   // separator (unstyled)
   .search-section-separator { 
@@ -23,27 +26,24 @@
   background-color: lighten($system_bg_color, 5%);
   border-radius: $modal_radius*1.5;
   border: 1px solid $osd_outer_borders_color;
-  box-shadow: none;
-  text-shadow: none;
   color: $osd_fg_color;
   padding: $base_padding*2;
-  margin: $base_margin;
-  // This is the space between the provider icon and the results container
+  margin:0 $base_margin*3;
 }
 
 %search_section_content_item {
   @include tile_button($osd_fg_color);
-  margin: $base_margin;
-  border-radius: $base_border_radius !important;
+  border-radius: $base_border_radius+3px;
 }
 
 // "no results" text
 .search-statustext {
-  @extend %large_title;
+  @extend %title_1;
 }
 
 .grid-search-results {
-  spacing: $base_padding * 6;
+  spacing: $base_padding*5;
+  margin:0 $base_margin*3;
 }
 
 // Search results with icons
@@ -54,6 +54,8 @@
 // search result provider
 .search-provider-icon {
   @extend %search_section_content_item;
+  &:ltr {margin-right: $base_margin;}
+  &:rtl {margin-left: $base_margin;}
 
   // content
   .list-search-provider-content {