diff --git a/.gitignore b/.gitignore
index d136475..0c59f63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ config.*
 configure
 install-sh
 missing
-
+.idea/
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index a6d91ac..d55f265 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -3731,6 +3731,25 @@ NautilusWindow GtkPlacesSidebar.sidebar {
     NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon,
     NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon {
       color: inherit; }
+  GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button,
+  NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button {
+    color: #BAC3CF; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover {
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
+      border-color: rgba(26, 28, 34, 0.35);
+      background-color: rgba(119, 127, 151, 0.45); }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active {
+      background-clip: padding-box;
+      color: #ffffff;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: rgba(26, 28, 34, 0.35);
+      background-color: #5294E2; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage {
+      opacity: 0.5; }
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow GtkPlacesSidebar.sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator {
@@ -3740,25 +3759,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar,
 NautilusWindow.maximized GtkPlacesSidebar.sidebar {
   background-color: #353945; }
 
-GtkFileChooserDialog .sidebar-button.button,
-NautilusWindow .sidebar-button.button {
-  color: #BAC3CF; }
-  GtkFileChooserDialog .sidebar-button.button:hover,
-  NautilusWindow .sidebar-button.button:hover {
-    color: #BAC3CF;
-    outline-color: rgba(186, 195, 207, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
-  GtkFileChooserDialog .sidebar-button.button:active,
-  NautilusWindow .sidebar-button.button:active {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
-    background-color: #5294E2; }
-  GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
-  NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
-    opacity: 0.5; }
-
 NemoWindow.csd.background,
 NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight,
 MarlinViewWindow.csd.background,
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index aeba0b1..8092682 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -2870,6 +2870,9 @@ GeditStatusMenuButton.sidebar-button.button:checked {
 GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar {
   border-bottom: 1px solid #dcdfe3; }
 
+.gedit-map-frame {
+  border-color: rgba(0, 0, 0, 0.3); }
+
 .gedit-search-entry-occurrences-tag {
   color: rgba(92, 97, 108, 0.6);
   border: none;
@@ -3724,6 +3727,25 @@ NautilusWindow GtkPlacesSidebar.sidebar {
     NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon,
     NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon {
       color: inherit; }
+  GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button,
+  NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button {
+    color: #BAC3CF; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover {
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
+      border-color: rgba(26, 28, 34, 0.35);
+      background-color: rgba(119, 127, 151, 0.45); }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active {
+      background-clip: padding-box;
+      color: #ffffff;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: rgba(26, 28, 34, 0.35);
+      background-color: #5294E2; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage {
+      opacity: 0.5; }
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow GtkPlacesSidebar.sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator {
@@ -3733,25 +3755,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar,
 NautilusWindow.maximized GtkPlacesSidebar.sidebar {
   background-color: #353945; }
 
-GtkFileChooserDialog .sidebar-button.button,
-NautilusWindow .sidebar-button.button {
-  color: #BAC3CF; }
-  GtkFileChooserDialog .sidebar-button.button:hover,
-  NautilusWindow .sidebar-button.button:hover {
-    color: #BAC3CF;
-    outline-color: rgba(186, 195, 207, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
-  GtkFileChooserDialog .sidebar-button.button:active,
-  NautilusWindow .sidebar-button.button:active {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
-    background-color: #5294E2; }
-  GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
-  NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
-    opacity: 0.5; }
-
 NemoWindow.csd.background,
 NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight,
 MarlinViewWindow.csd.background,
diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css
index b9f9f39..e806814 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -3731,6 +3731,25 @@ NautilusWindow GtkPlacesSidebar.sidebar {
     NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon,
     NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon {
       color: inherit; }
+  GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button,
+  NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button {
+    color: #BAC3CF; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover {
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
+      border-color: rgba(26, 28, 34, 0.4);
+      background-color: rgba(119, 127, 151, 0.5); }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active {
+      background-clip: padding-box;
+      color: #ffffff;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: rgba(26, 28, 34, 0.4);
+      background-color: #5294E2; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage {
+      opacity: 0.5; }
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow GtkPlacesSidebar.sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator {
@@ -3740,25 +3759,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar,
 NautilusWindow.maximized GtkPlacesSidebar.sidebar {
   background-color: #353945; }
 
-GtkFileChooserDialog .sidebar-button.button,
-NautilusWindow .sidebar-button.button {
-  color: #BAC3CF; }
-  GtkFileChooserDialog .sidebar-button.button:hover,
-  NautilusWindow .sidebar-button.button:hover {
-    color: #BAC3CF;
-    outline-color: rgba(186, 195, 207, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
-    background-color: rgba(119, 127, 151, 0.5); }
-  GtkFileChooserDialog .sidebar-button.button:active,
-  NautilusWindow .sidebar-button.button:active {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
-    background-color: #5294E2; }
-  GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
-  NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
-    opacity: 0.5; }
-
 NemoWindow.csd.background,
 NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight,
 MarlinViewWindow.csd.background,
diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css
index 99f247a..33be9af 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -2870,6 +2870,9 @@ GeditStatusMenuButton.sidebar-button.button:checked {
 GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar {
   border-bottom: 1px solid #dcdfe3; }
 
+.gedit-map-frame {
+  border-color: rgba(0, 0, 0, 0.3); }
+
 .gedit-search-entry-occurrences-tag {
   color: rgba(92, 97, 108, 0.6);
   border: none;
@@ -3724,6 +3727,25 @@ NautilusWindow GtkPlacesSidebar.sidebar {
     NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon,
     NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon {
       color: inherit; }
+  GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button,
+  NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button {
+    color: #BAC3CF; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover {
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
+      border-color: rgba(26, 28, 34, 0.4);
+      background-color: rgba(119, 127, 151, 0.5); }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active {
+      background-clip: padding-box;
+      color: #ffffff;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: rgba(26, 28, 34, 0.4);
+      background-color: #5294E2; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage {
+      opacity: 0.5; }
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow GtkPlacesSidebar.sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator {
@@ -3733,25 +3755,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar,
 NautilusWindow.maximized GtkPlacesSidebar.sidebar {
   background-color: #353945; }
 
-GtkFileChooserDialog .sidebar-button.button,
-NautilusWindow .sidebar-button.button {
-  color: #BAC3CF; }
-  GtkFileChooserDialog .sidebar-button.button:hover,
-  NautilusWindow .sidebar-button.button:hover {
-    color: #BAC3CF;
-    outline-color: rgba(186, 195, 207, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
-    background-color: rgba(119, 127, 151, 0.5); }
-  GtkFileChooserDialog .sidebar-button.button:active,
-  NautilusWindow .sidebar-button.button:active {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
-    background-color: #5294E2; }
-  GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
-  NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
-    opacity: 0.5; }
-
 NemoWindow.csd.background,
 NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight,
 MarlinViewWindow.csd.background,
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index 1eacc5f..3a3309e 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -2874,6 +2874,9 @@ GeditStatusMenuButton.sidebar-button.button:checked {
 GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar {
   border-bottom: 1px solid #dcdfe3; }
 
+.gedit-map-frame {
+  border-color: rgba(0, 0, 0, 0.3); }
+
 .gedit-search-entry-occurrences-tag {
   color: rgba(92, 97, 108, 0.6);
   border: none;
@@ -3728,6 +3731,25 @@ NautilusWindow GtkPlacesSidebar.sidebar {
     NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon,
     NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon {
       color: inherit; }
+  GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button,
+  NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button {
+    color: #BAC3CF; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover {
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
+      border-color: rgba(26, 28, 34, 0.4);
+      background-color: rgba(119, 127, 151, 0.5); }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active {
+      background-clip: padding-box;
+      color: #ffffff;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: rgba(26, 28, 34, 0.4);
+      background-color: #5294E2; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage {
+      opacity: 0.5; }
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow GtkPlacesSidebar.sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator {
@@ -3737,25 +3759,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar,
 NautilusWindow.maximized GtkPlacesSidebar.sidebar {
   background-color: #353945; }
 
-GtkFileChooserDialog .sidebar-button.button,
-NautilusWindow .sidebar-button.button {
-  color: #BAC3CF; }
-  GtkFileChooserDialog .sidebar-button.button:hover,
-  NautilusWindow .sidebar-button.button:hover {
-    color: #BAC3CF;
-    outline-color: rgba(186, 195, 207, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
-    background-color: rgba(119, 127, 151, 0.5); }
-  GtkFileChooserDialog .sidebar-button.button:active,
-  NautilusWindow .sidebar-button.button:active {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.4);
-    background-color: #5294E2; }
-  GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
-  NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
-    opacity: 0.5; }
-
 NemoWindow.csd.background,
 NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight,
 MarlinViewWindow.csd.background,
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index 5aff150..3d37467 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -2874,6 +2874,9 @@ GeditStatusMenuButton.sidebar-button.button:checked {
 GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar {
   border-bottom: 1px solid #dcdfe3; }
 
+.gedit-map-frame {
+  border-color: rgba(0, 0, 0, 0.3); }
+
 .gedit-search-entry-occurrences-tag {
   color: rgba(92, 97, 108, 0.6);
   border: none;
@@ -3728,6 +3731,25 @@ NautilusWindow GtkPlacesSidebar.sidebar {
     NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:active:hover .sidebar-icon,
     NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active .sidebar-icon {
       color: inherit; }
+  GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button,
+  NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button {
+    color: #BAC3CF; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:hover,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:hover {
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
+      border-color: rgba(26, 28, 34, 0.35);
+      background-color: rgba(119, 127, 151, 0.45); }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:active,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:active {
+      background-clip: padding-box;
+      color: #ffffff;
+      outline-color: rgba(255, 255, 255, 0.3);
+      border-color: rgba(26, 28, 34, 0.35);
+      background-color: #5294E2; }
+    GtkFileChooserDialog GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage,
+    NautilusWindow GtkPlacesSidebar.sidebar .sidebar-button.button:not(:hover):not(:active) > GtkImage {
+      opacity: 0.5; }
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   NautilusWindow GtkPlacesSidebar.sidebar .separator,
   NautilusWindow GtkPlacesSidebar.sidebar .view.separator {
@@ -3737,25 +3759,6 @@ GtkFileChooserDialog.maximized GtkPlacesSidebar.sidebar,
 NautilusWindow.maximized GtkPlacesSidebar.sidebar {
   background-color: #353945; }
 
-GtkFileChooserDialog .sidebar-button.button,
-NautilusWindow .sidebar-button.button {
-  color: #BAC3CF; }
-  GtkFileChooserDialog .sidebar-button.button:hover,
-  NautilusWindow .sidebar-button.button:hover {
-    color: #BAC3CF;
-    outline-color: rgba(186, 195, 207, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
-  GtkFileChooserDialog .sidebar-button.button:active,
-  NautilusWindow .sidebar-button.button:active {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: rgba(26, 28, 34, 0.35);
-    background-color: #5294E2; }
-  GtkFileChooserDialog .sidebar-button.button:not(:hover):not(:active) > GtkImage,
-  NautilusWindow .sidebar-button.button:not(:hover):not(:active) > GtkImage {
-    opacity: 0.5; }
-
 NemoWindow.csd.background,
 NemoWindow .source-list, NemoWindow .source-list.view, NemoWindow .source-list.view:prelight,
 MarlinViewWindow.csd.background,
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index 2a02203..a499f77 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -282,13 +282,16 @@ GeditStatusMenuButton:checked.button.flat {
   border-radius: 0;
 }
 
-
 GeditViewFrame .gedit-search-slider { @extend %search_slider }
 
 GeditFileBrowserWidget .toolbar {
   border-bottom: 1px solid $borders_color;
 }
 
+.gedit-map-frame {
+  @if $variant=='light' { border-color: transparentize(black, 0.7); }
+}
+
 .gedit-search-entry-occurrences-tag {
   color: transparentize($fg_color, 0.4);
   border: none;
diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
index d3c049c..aeae067 100644
--- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
@@ -47,21 +47,24 @@ NautilusWindow {
       }
     }
 
+    .sidebar-button.button {
+      color: $dark_sidebar_fg;
+
+      &:hover { @include button(osd-hover); }
+      &:active {
+        background-clip: padding-box;
+        @include button(osd-active);
+      }
+
+      &:not(:hover):not(:active) > GtkImage { opacity: 0.5 };
+    }
+
     .separator { color: transparent; }
 
     .scrollbar { @extend %dark_sidebar_scrollbar }
   }
 
   &.maximized GtkPlacesSidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); }
-
-  .sidebar-button.button {
-    color: $dark_sidebar_fg;
-
-    &:hover { @include button(osd-hover); }
-    &:active { @include button(osd-active); }
-
-    &:not(:hover):not(:active) > GtkImage { opacity: 0.5 };
-  }
 }
 
 
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 1f0e767..dc2b21e 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -3290,6 +3290,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin: 2px;
   padding: 2px; }
 
+.gedit-map-frame border {
+  border-width: 0; }
+  .gedit-map-frame border:dir(ltr) {
+    border-left-width: 1px; }
+  .gedit-map-frame border:dir(rtl) {
+    border-right-width: 1px; }
+
 .gb-search-entry-occurrences-tag {
   background: none; }
 
@@ -4114,6 +4121,12 @@ filechooser actionbar {
 .gedit-bottom-panel-paned {
   background-color: #404552; }
 
+.gedit-side-panel-paned > separator {
+  background-image: linear-gradient(to top, rgba(42, 45, 55, 0.95)); }
+
+.gedit-bottom-panel-paned > separator {
+  background-image: linear-gradient(to top, #2b2e39); }
+
 .gedit-document-panel {
   background-color: rgba(53, 57, 69, 0.95); }
   .maximized .gedit-document-panel {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index aeb90a7..d72a420 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -3288,6 +3288,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin: 2px;
   padding: 2px; }
 
+.gedit-map-frame border {
+  border-color: rgba(0, 0, 0, 0.3);
+  border-width: 0; }
+  .gedit-map-frame border:dir(ltr) {
+    border-left-width: 1px; }
+  .gedit-map-frame border:dir(rtl) {
+    border-right-width: 1px; }
+
 .gb-search-entry-occurrences-tag {
   background: none; }
 
@@ -4116,6 +4124,12 @@ filechooser actionbar {
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
+.gedit-side-panel-paned > separator {
+  background-image: linear-gradient(to top, rgba(53, 57, 69, 0.95)); }
+
+.gedit-bottom-panel-paned > separator {
+  background-image: linear-gradient(to top, #dcdfe3); }
+
 .gedit-document-panel {
   background-color: rgba(53, 57, 69, 0.95); }
   .maximized .gedit-document-panel {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index c81bf0a..90bb6a4 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -3290,6 +3290,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin: 2px;
   padding: 2px; }
 
+.gedit-map-frame border {
+  border-width: 0; }
+  .gedit-map-frame border:dir(ltr) {
+    border-left-width: 1px; }
+  .gedit-map-frame border:dir(rtl) {
+    border-right-width: 1px; }
+
 .gb-search-entry-occurrences-tag {
   background: none; }
 
@@ -4114,6 +4121,12 @@ filechooser actionbar {
 .gedit-bottom-panel-paned {
   background-color: #404552; }
 
+.gedit-side-panel-paned > separator {
+  background-image: linear-gradient(to top, #2a2d37); }
+
+.gedit-bottom-panel-paned > separator {
+  background-image: linear-gradient(to top, #2b2e39); }
+
 .gedit-document-panel {
   background-color: #353945; }
   .maximized .gedit-document-panel {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index c935724..5f37d12 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -3288,6 +3288,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin: 2px;
   padding: 2px; }
 
+.gedit-map-frame border {
+  border-color: rgba(0, 0, 0, 0.3);
+  border-width: 0; }
+  .gedit-map-frame border:dir(ltr) {
+    border-left-width: 1px; }
+  .gedit-map-frame border:dir(rtl) {
+    border-right-width: 1px; }
+
 .gb-search-entry-occurrences-tag {
   background: none; }
 
@@ -4116,6 +4124,12 @@ filechooser actionbar {
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
+.gedit-side-panel-paned > separator {
+  background-image: linear-gradient(to top, #353945); }
+
+.gedit-bottom-panel-paned > separator {
+  background-image: linear-gradient(to top, #dcdfe3); }
+
 .gedit-document-panel {
   background-color: #353945; }
   .maximized .gedit-document-panel {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index e82e4bc..9e13c46 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -3292,6 +3292,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin: 2px;
   padding: 2px; }
 
+.gedit-map-frame border {
+  border-color: rgba(0, 0, 0, 0.3);
+  border-width: 0; }
+  .gedit-map-frame border:dir(ltr) {
+    border-left-width: 1px; }
+  .gedit-map-frame border:dir(rtl) {
+    border-right-width: 1px; }
+
 .gb-search-entry-occurrences-tag {
   background: none; }
 
@@ -4120,6 +4128,12 @@ filechooser actionbar {
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
+.gedit-side-panel-paned > separator {
+  background-image: linear-gradient(to top, #353945); }
+
+.gedit-bottom-panel-paned > separator {
+  background-image: linear-gradient(to top, #dcdfe3); }
+
 .gedit-document-panel {
   background-color: #353945; }
   .maximized .gedit-document-panel {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index ef72998..107312a 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -3292,6 +3292,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin: 2px;
   padding: 2px; }
 
+.gedit-map-frame border {
+  border-color: rgba(0, 0, 0, 0.3);
+  border-width: 0; }
+  .gedit-map-frame border:dir(ltr) {
+    border-left-width: 1px; }
+  .gedit-map-frame border:dir(rtl) {
+    border-right-width: 1px; }
+
 .gb-search-entry-occurrences-tag {
   background: none; }
 
@@ -4120,6 +4128,12 @@ filechooser actionbar {
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
 
+.gedit-side-panel-paned > separator {
+  background-image: linear-gradient(to top, rgba(53, 57, 69, 0.95)); }
+
+.gedit-bottom-panel-paned > separator {
+  background-image: linear-gradient(to top, #dcdfe3); }
+
 .gedit-document-panel {
   background-color: rgba(53, 57, 69, 0.95); }
   .maximized .gedit-document-panel {
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index ef65794..b1a81b4 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -239,6 +239,16 @@ $disk_space_free: darken($bg_color, 3%);
   padding: 2px;
 }
 
+.gedit-map-frame {
+  border {
+    @if $variant=='light' { border-color: transparentize(black, 0.7); }
+    border-width: 0;
+
+    &:dir(ltr) { border-left-width: 1px; }
+    &:dir(rtl) { border-right-width: 1px; }
+  }
+}
+
 //
 // Gnome Builder
 //
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index b154491..f6966a5 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -145,6 +145,9 @@ filechooser {
 // Gedit
 .gedit-bottom-panel-paned { background-color: $base_color; }
 
+.gedit-side-panel-paned > separator { background-image: linear-gradient(to top, $dark_sidebar_border); }
+.gedit-bottom-panel-paned > separator { background-image: linear-gradient(to top, $borders_color); }
+
 .gedit-document-panel {
   background-color: $dark_sidebar_bg;