diff --git a/README.md b/README.md
index 4f1d0b1..bb719c9 100644
--- a/README.md
+++ b/README.md
@@ -6,15 +6,15 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell.
 
 #####Arc
 
-![alt tag](http://i.imgur.com/fDa94sy.png)
+![alt tag](http://i.imgur.com/aRTIvO9.png)
 
 #####Arc-Darker
 
-![alt tag](http://i.imgur.com/crDBZzD.png)
+![alt tag](http://i.imgur.com/6s8L7fm.png)
 
 #####Arc-Dark
 
-![alt tag](http://i.imgur.com/RkIVgJ2.png)
+![alt tag](http://i.imgur.com/ZpI1AAf.png)
 
 
 ### Requirements
@@ -141,4 +141,4 @@ If you get artifacts like black or invisible backgrounds under Unity, disable ov
 If you find a bug, please report it at https://github.com/horst3180/arc-theme/issues
 
 ### Full Preview
-![alt tag](http://i.imgur.com/6SDjAc4.jpg)
+![alt tag](http://i.imgur.com/wzneKCh.png)
diff --git a/common/Makefile.am b/common/Makefile.am
index 19b2c8a..6e40e8f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -248,20 +248,24 @@ endif # ENABLE_XFWM
 uninstall-local:
 	rm -rf $(ithemedir)
 
-	-rmdir -p $(DESTDIR)$(datadir)/themes 2>/dev/null
+if ENABLE_DARKER
+	rm -rf $(ithemedarkerdir)
+endif # ENABLE_DARKER
+
+if ENABLE_DARK
+	rm -rf $(ithemedarkdir)
+endif # ENABLE_DARK
 
 
-dist-hook:
-	cp -r \
-		cinnamon \
-		gnome-shell \
-		gtk-2.0 \
-		gtk-3.0 \
-		metacity-1 \
-		unity \
-		xfwm4 \
-		xfwm4-dark \
-		index.theme \
-		index.theme-darker \
-		index.theme-dark \
-		$(distdir)
+EXTRA_DIST = $(srcdir)/cinnamon \
+	     $(srcdir)/gnome-shell \
+	     $(srcdir)/gtk-2.0 \
+	     $(srcdir)/gtk-3.0 \
+	     $(srcdir)/metacity-1 \
+	     $(srcdir)/unity \
+	     $(srcdir)/xfce-notify-4.0 \
+	     $(srcdir)/xfwm4 \
+	     $(srcdir)/xfwm4-dark \
+	     $(srcdir)/index.theme \
+	     $(srcdir)/index.theme-darker \
+	     $(srcdir)/index.theme-dark
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css
index 3e3b65b..74bda1e 100644
--- a/common/cinnamon/cinnamon.css
+++ b/common/cinnamon/cinnamon.css
@@ -85,7 +85,7 @@ stage {
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
   box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
@@ -112,7 +112,7 @@ stage {
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
   box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #BAC3CF;
   background-color: rgba(0, 0, 0, 0.2);
@@ -229,7 +229,7 @@ StScrollBar {
     color: #5294e2; }
 
 #Tooltip {
-  border-radius: l3px;
+  border-radius: 3px;
   padding: 5px 12px;
   background-color: rgba(42, 44, 51, 0.95);
   color: #BAC3CF;
@@ -740,7 +740,7 @@ StScrollBar {
   .run-dialog-entry {
     width: 21em;
     padding: 7px;
-    border-radius: 20px;
+    border-radius: 3px;
     caret-color: #BAC3CF;
     selected-color: #ffffff;
     selection-background-color: #5294E2;
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index 6f3d5ad..2f0bbe4 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -67,7 +67,7 @@ stage {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
 
   @include entry(normal);
 
@@ -88,7 +88,7 @@ stage {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
 
   @include entry(osd);
 
@@ -234,7 +234,7 @@ StScrollBar {
 // Tooltip
 //
 #Tooltip {
-  border-radius: l3px;
+  border-radius: 3px;
   padding: 5px 12px;
   background-color: $osd_bg_color;
   color: $osd_fg_color;
@@ -899,7 +899,7 @@ StScrollBar {
   &-entry {
     width: 21em;
     padding: 7px;
-    border-radius: 20px;
+    border-radius: 3px;
     caret-color: $osd_fg_color;
     selected-color: $selected_fg_color;
     selection-background-color: $selected_bg_color;
diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css
index 9d3df68..fd409c3 100644
--- a/common/gnome-shell/3.14/gnome-shell.css
+++ b/common/gnome-shell/3.14/gnome-shell.css
@@ -39,37 +39,37 @@ stage {
   border-radius: 2px;
   background-gradient-direction: none !important;
   text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  box-shadow: inset 0 0 black;
   color: #5c616c;
   background-color: #fbfbfc;
   border: 1px solid #cfd6e6; }
   .popup-menu .modal-dialog-button:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
   .popup-menu .modal-dialog-button:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
   .popup-menu .modal-dialog-button:hover:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5294E2;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
   .popup-menu .modal-dialog-button:active, .popup-menu .modal-dialog-button:active:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     background-color: #5294E2;
     border: 1px solid #5294E2; }
   .popup-menu .modal-dialog-button:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: rgba(92, 97, 108, 0.55);
     border: 1px solid rgba(207, 214, 230, 0.55);
     background-color: rgba(251, 251, 252, 0.55); }
@@ -90,7 +90,7 @@ stage {
   transition-duration: 0;
   border-radius: 2px;
   text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  box-shadow: inset 0 0 black;
   color: #BAC3CF;
   border: 1px solid rgba(0, 0, 0, 0.45);
   background-color: rgba(0, 0, 0, 0.3); }
@@ -99,7 +99,7 @@ stage {
   .hotplug-resident-eject-button:hover,
   .modal-dialog-button:hover, .modal-dialog-button-box .button:hover, .notification-button:hover, .notification-icon-button:hover, .hotplug-resident-mount:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #BAC3CF;
     border: 1px solid #5294E2;
     background-color: rgba(0, 0, 0, 0.3); }
@@ -113,7 +113,7 @@ stage {
   .hotplug-resident-eject-button:active,
   .modal-dialog-button:active, .modal-dialog-button-box .button:active, .notification-button:active, .notification-icon-button:active, .hotplug-resident-mount:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     border: 1px solid #5294E2;
     background-color: #5294E2; }
@@ -122,7 +122,7 @@ stage {
   .hotplug-resident-eject-button:insensitive,
   .modal-dialog-button:insensitive, .modal-dialog-button-box .button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .hotplug-resident-mount:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #555a62;
     border: 1px solid rgba(0, 0, 0, 0.45);
     background-color: rgba(0, 0, 0, 0.15); }
@@ -134,22 +134,22 @@ StEntry {
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
   background-gradient-direction: none !important;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #ffffff;
-  border: 1px solid #cfd6e6; }
+  border: 1px solid #cfd6e6;
+  box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); }
   StEntry:focus, StEntry:hover {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #ffffff;
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294E2;
+    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); }
   StEntry:insensitive {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: rgba(92, 97, 108, 0.55);
     background-color: #fbfbfb;
-    border-color: 1px solid #e0e4ee; }
+    border-color: 1px solid #e0e4ee;
+    box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); }
   StEntry StIcon.capslock-warning {
     icon-size: 16px;
     warning-color: #F27835;
@@ -626,6 +626,8 @@ StScrollBar {
   height: 2.1em;
   min-height: 27px;
   border-image: url("common-assets/panel/panel.svg") 1 1 1 1; }
+  #panel .dynamic-top-bar-white-btn {
+    border-image: none; }
   #panel.unlock-screen,
   #panel.login-screen,
   #panel.lock-screen {
@@ -1280,7 +1282,7 @@ StScrollBar {
     border-color: #5294E2; }
   .app-view-control:checked {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     border: 1px solid #5294E2;
     background-color: #5294E2; }
@@ -1490,20 +1492,20 @@ StScrollBar {
       padding-left: 6px; }
     .summary-source-button .summary-source {
       text-shadow: 0 1px rgba(255, 255, 255, 0);
-      box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+      box-shadow: inset 0 0 black;
       color: #BAC3CF;
       border: 1px solid rgba(0, 0, 0, 0.45);
       background-color: rgba(0, 0, 0, 0.3); }
     .summary-source-button:hover .summary-source {
       text-shadow: 0 1px rgba(255, 255, 255, 0);
-      box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+      box-shadow: inset 0 0 black;
       color: #BAC3CF;
       border: 1px solid #5294E2;
       background-color: rgba(0, 0, 0, 0.3); }
     .summary-source-button:focus .summary-source,
     .summary-source-button:selected .summary-source {
       text-shadow: 0 1px rgba(255, 255, 255, 0);
-      box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+      box-shadow: inset 0 0 black;
       color: #ffffff;
       border: 1px solid #5294E2;
       background-color: #5294E2; }
@@ -1559,15 +1561,15 @@ StScrollBar {
   .notification StEntry {
     padding: 7px;
     caret-color: #BAC3CF;
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #BAC3CF;
     background-color: rgba(0, 0, 0, 0.2);
-    border: 1px solid rgba(0, 0, 0, 0.4); }
+    border: 1px solid rgba(0, 0, 0, 0.4);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
     .notification StEntry:focus {
-      box-shadow: inset 0 0 rgba(255, 255, 255, 0);
       color: #BAC3CF;
       background-color: rgba(0, 0, 0, 0.2);
-      border: 1px solid #5294E2; }
+      border: 1px solid #5294E2;
+      box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
 
 .secondary-icon {
   icon-size: 1.09em; }
@@ -1592,15 +1594,15 @@ StScrollBar {
 
 StEntry.chat-response {
   padding: 7px;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #BAC3CF;
   background-color: rgba(0, 0, 0, 0.2);
-  border: 1px solid rgba(0, 0, 0, 0.4); }
+  border: 1px solid rgba(0, 0, 0, 0.4);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   StEntry.chat-response:focus {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #BAC3CF;
     background-color: rgba(0, 0, 0, 0.2);
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294E2;
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
 
 .chat-sent {
   padding-left: 18pt;
@@ -1686,25 +1688,25 @@ StEntry.chat-response {
   box-shadow: none;
   background-gradient-direction: none;
   text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  box-shadow: inset 0 0 black;
   color: #BAC3CF;
   border: 1px solid rgba(0, 0, 0, 0.45);
   background-color: rgba(0, 0, 0, 0.3); }
   .keyboard-key:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #BAC3CF;
     border: 1px solid #5294E2;
     background-color: rgba(0, 0, 0, 0.3); }
   .keyboard-key:active, .keyboard-key:checked {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     border: 1px solid #5294E2;
     background-color: #5294E2; }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #555a62;
     border: 1px solid rgba(0, 0, 0, 0.45);
     background-color: rgba(0, 0, 0, 0.15); }
@@ -1780,25 +1782,25 @@ StEntry.chat-response {
     padding: 3px 18px; }
     .login-dialog .modal-dialog-button:default {
       text-shadow: 0 1px rgba(255, 255, 255, 0);
-      box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+      box-shadow: inset 0 0 black;
       color: #5c616c;
       background-color: #fbfbfc;
       border: 1px solid #cfd6e6; }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
-        box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+        box-shadow: inset 0 0 black;
         color: #5c616c;
         background-color: #fbfbfc;
         border: 1px solid #5294E2; }
       .login-dialog .modal-dialog-button:default:active {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
-        box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+        box-shadow: inset 0 0 black;
         color: #ffffff;
         background-color: #5294E2;
         border: 1px solid #5294E2; }
       .login-dialog .modal-dialog-button:default:insensitive {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
-        box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+        box-shadow: inset 0 0 black;
         color: rgba(92, 97, 108, 0.55);
         border: 1px solid rgba(207, 214, 230, 0.55);
         background-color: rgba(251, 251, 252, 0.55); }
@@ -2005,15 +2007,15 @@ StEntry.chat-response {
 .lg-dialog StEntry {
   selection-background-color: #5294E2;
   selected-color: #ffffff;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #BAC3CF;
   background-color: rgba(0, 0, 0, 0.2);
-  border: 1px solid rgba(0, 0, 0, 0.4); }
+  border: 1px solid rgba(0, 0, 0, 0.4);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .lg-dialog StEntry:focus {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #BAC3CF;
     background-color: rgba(0, 0, 0, 0.2);
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294E2;
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
 
 .lg-dialog .shell-link {
   color: #2679db; }
diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss
index 9697050..9aee0a1 100644
--- a/common/gnome-shell/3.14/sass/_common.scss
+++ b/common/gnome-shell/3.14/sass/_common.scss
@@ -110,7 +110,7 @@ StEntry {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
   background-gradient-direction: none !important;
 
   @include entry(normal);
@@ -801,6 +801,9 @@ StScrollBar {
   min-height: 27px;
   border-image: url('common-assets/panel/panel.svg') 1 1 1 1;
 
+  // Fix dynamic top bar extension
+  .dynamic-top-bar-white-btn { border-image: none; }
+
   &.unlock-screen,
   &.login-screen,
   &.lock-screen {
diff --git a/common/gnome-shell/3.14/sass/_drawing.scss b/common/gnome-shell/3.14/sass/_drawing.scss
index 03b9f15..5ab1463 100644
--- a/common/gnome-shell/3.14/sass/_drawing.scss
+++ b/common/gnome-shell/3.14/sass/_drawing.scss
@@ -15,42 +15,47 @@
 // Entries drawing function
 //
   //@extend %reset_style;
-    box-shadow: inset 0 0 transparentize($base_color, 1);
 
   @if $t==normal {
     color: $text_color;
     background-color: $entry_bg;
     border: 1px solid $entry_border;
+    box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9);
   }
 
   @if $t==focus {
     color: $fg_color;
     background-color: $entry_bg;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9);
   }
 
   @if $t==insensitive {
     color: $insensitive_fg_color;
     background-color: mix($entry_bg, $bg_color, 55%);
     border-color: 1px solid mix($entry_border, $bg_color, 55%);
+    box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9);
   }
 
   @if $t==osd {
     color: $osd_fg_color;
     background-color: transparentize(black, 0.8);
     border: 1px solid transparentize(black, 0.6);
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-focus {
     color: $osd_fg_color;
     background-color: transparentize(black, 0.8);
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-insensitive {
     color: $osd_insensitive_fg_color;
     background-color: transparentize(black, 0.9);
     border-color: 1px solid transparentize(black, 0.6);
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 }
 
@@ -63,7 +68,7 @@
   //@extend %reset_style;
 
   text-shadow: 0 1px transparentize($base_color, 1);
-  box-shadow: inset 0 0 transparentize($base_color, 1);
+  box-shadow: inset 0 0 black;
 
   @if $t==normal {
   //
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index e2282fe..eecc3a4 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -25,72 +25,76 @@ stage {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
-  border-radius: 2px;
+  border-radius: 2px; }
+
+.button, .notification-banner .notification-button,
+.notification-banner:hover .notification-button,
+.notification-banner:focus .notification-button, .hotplug-notification-item {
   text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  box-shadow: inset 0 0 black;
   color: #5c616c;
   background-color: #fbfbfc;
   border: 1px solid #cfd6e6; }
-  .button:focus {
+  .button:focus, .notification-banner .notification-button:focus,
+  .hotplug-notification-item:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
-  .button:hover {
+  .button:hover, .notification-banner .notification-button:hover,
+  .hotplug-notification-item:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
-  .button:hover:focus {
+  .button:hover:focus, .notification-banner .notification-button:hover:focus,
+  .hotplug-notification-item:hover:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5294E2;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
-  .button:active, .button:active:focus {
+  .button:active, .notification-banner .notification-button:active,
+  .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus,
+  .hotplug-notification-item:active:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     background-color: #5294E2;
     border: 1px solid #5294E2; }
-  .button:insensitive {
+  .button:insensitive, .notification-banner .notification-button:insensitive,
+  .hotplug-notification-item:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: rgba(92, 97, 108, 0.55);
     border: 1px solid rgba(207, 214, 230, 0.55);
     background-color: rgba(251, 251, 252, 0.55); }
 
-.modal-dialog-button-box .button, .notification-banner .notification-button,
-.notification-banner:hover .notification-button,
-.notification-banner:focus .notification-button, .hotplug-notification-item {
+.modal-dialog-button-box .button {
   text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  box-shadow: inset 0 0 black;
   color: #BAC3CF;
   border: 1px solid rgba(0, 0, 0, 0.45);
   background-color: rgba(0, 0, 0, 0.3); }
-  .modal-dialog-button-box .button:hover, .notification-banner .notification-button:hover,
-  .hotplug-notification-item:hover {
+  .modal-dialog-button-box .button:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #BAC3CF;
     border: 1px solid #5294E2;
     background-color: rgba(0, 0, 0, 0.3); }
-  .modal-dialog-button-box .button:focus, .notification-banner .notification-button:focus,
-  .hotplug-notification-item:focus {
+  .modal-dialog-button-box .button:focus {
     color: #5294E2; }
-  .modal-dialog-button-box .button:active, .notification-banner .notification-button:active,
-  .hotplug-notification-item:active {
+  .modal-dialog-button-box .button:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     border: 1px solid #5294E2;
     background-color: #5294E2; }
-  .modal-dialog-button-box .button:insensitive, .notification-banner .notification-button:insensitive,
-  .hotplug-notification-item:insensitive {
+  .modal-dialog-button-box .button:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #555a62;
     border: 1px solid rgba(0, 0, 0, 0.45);
     background-color: rgba(0, 0, 0, 0.15); }
@@ -101,21 +105,21 @@ StEntry {
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   transition-duration: 300ms;
-  border-radius: 20px;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  border-radius: 3px;
   color: #5c616c;
   background-color: #ffffff;
-  border: 1px solid #cfd6e6; }
+  border: 1px solid #cfd6e6;
+  box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); }
   StEntry:focus, StEntry:hover {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #ffffff;
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294E2;
+    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); }
   StEntry:insensitive {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: rgba(92, 97, 108, 0.55);
     background-color: #fbfbfb;
-    border-color: 1px solid #e0e4ee; }
+    border-color: 1px solid #e0e4ee;
+    box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); }
   StEntry StIcon.capslock-warning {
     icon-size: 16px;
     warning-color: #F27835;
@@ -591,6 +595,8 @@ StScrollBar {
   height: 2.1em;
   min-height: 27px;
   border-image: url("common-assets/panel/panel.svg") 1 1 1 1; }
+  #panel.dynamic-top-bar-white-btn {
+    border-image: none; }
   #panel.unlock-screen,
   #panel.login-screen,
   #panel.lock-screen {
@@ -762,7 +768,7 @@ StScrollBar {
   .world-clocks-button:focus,
   .message-list-section-title:hover, .message-list-section-title:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2; }
@@ -770,7 +776,7 @@ StScrollBar {
   .world-clocks-button:active,
   .message-list-section-title:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     background-color: #5294E2;
     border: 1px solid #5294E2; }
@@ -1239,7 +1245,7 @@ StScrollBar {
     border-color: #5294E2; }
   .app-view-control:checked {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     border: 1px solid #5294E2;
     background-color: #5294E2; }
@@ -1388,10 +1394,10 @@ StScrollBar {
   width: 34em;
   margin: 5px;
   padding: 10px;
-  color: #BAC3CF;
+  color: #5c616c;
   background-color: transparent;
   border: 1px solid transparent;
-  border-image: url("common-assets/misc/bg.svg") 9 9 9 9; }
+  border-image: url("light-assets/menu/menu.svg") 9 9 9 9; }
   .notification-banner .notification-icon,
   .notification-banner:hover .notification-icon,
   .notification-banner:focus .notification-icon {
@@ -1432,7 +1438,7 @@ StScrollBar {
   margin: 5px; }
 
 .chat-log-message {
-  color: #BAC3CF; }
+  color: #5c616c; }
 
 .chat-new-group {
   padding-top: 1em; }
@@ -1443,17 +1449,6 @@ StScrollBar {
     padding-left: 0px;
     padding-right: 4px; }
 
-StEntry.chat-response {
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
-  color: #BAC3CF;
-  background-color: rgba(0, 0, 0, 0.2);
-  border: 1px solid rgba(0, 0, 0, 0.4); }
-  StEntry.chat-response:focus {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
-    color: #BAC3CF;
-    background-color: rgba(0, 0, 0, 0.2);
-    border: 1px solid #5294E2; }
-
 .chat-sent {
   padding-left: 18pt;
   color: #5294E2; }
@@ -1465,7 +1460,7 @@ StEntry.chat-response {
   padding-left: 4px;
   font-size: 9pt;
   font-weight: bold;
-  color: rgba(186, 195, 207, 0.6); }
+  color: rgba(92, 97, 108, 0.6); }
   .chat-meta-message:rtl {
     padding-left: 0;
     padding-right: 4px; }
@@ -1567,25 +1562,25 @@ StEntry.chat-response {
   border-radius: 3px;
   box-shadow: none;
   text-shadow: 0 1px rgba(255, 255, 255, 0);
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+  box-shadow: inset 0 0 black;
   color: #BAC3CF;
   border: 1px solid rgba(0, 0, 0, 0.45);
   background-color: rgba(0, 0, 0, 0.3); }
   .keyboard-key:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #BAC3CF;
     border: 1px solid #5294E2;
     background-color: rgba(0, 0, 0, 0.3); }
   .keyboard-key:active, .keyboard-key:checked {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #ffffff;
     border: 1px solid #5294E2;
     background-color: #5294E2; }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+    box-shadow: inset 0 0 black;
     color: #555a62;
     border: 1px solid rgba(0, 0, 0, 0.45);
     background-color: rgba(0, 0, 0, 0.15); }
@@ -1661,25 +1656,25 @@ StEntry.chat-response {
     padding: 3px 18px; }
     .login-dialog .modal-dialog-button:default {
       text-shadow: 0 1px rgba(255, 255, 255, 0);
-      box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+      box-shadow: inset 0 0 black;
       color: #5c616c;
       background-color: #fbfbfc;
       border: 1px solid #cfd6e6; }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
-        box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+        box-shadow: inset 0 0 black;
         color: #5c616c;
         background-color: #fbfbfc;
         border: 1px solid #5294E2; }
       .login-dialog .modal-dialog-button:default:active {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
-        box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+        box-shadow: inset 0 0 black;
         color: #ffffff;
         background-color: #5294E2;
         border: 1px solid #5294E2; }
       .login-dialog .modal-dialog-button:default:insensitive {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
-        box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+        box-shadow: inset 0 0 black;
         color: rgba(92, 97, 108, 0.55);
         border: 1px solid rgba(207, 214, 230, 0.55);
         background-color: rgba(251, 251, 252, 0.55); }
@@ -1886,15 +1881,15 @@ StEntry.chat-response {
 .lg-dialog StEntry {
   selection-background-color: #5294E2;
   selected-color: #ffffff;
-  box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #BAC3CF;
   background-color: rgba(0, 0, 0, 0.2);
-  border: 1px solid rgba(0, 0, 0, 0.4); }
+  border: 1px solid rgba(0, 0, 0, 0.4);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .lg-dialog StEntry:focus {
-    box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #BAC3CF;
     background-color: rgba(0, 0, 0, 0.2);
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294E2;
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
 
 .lg-dialog .shell-link {
   color: #2679db; }
diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss
index cb4815b..2578ae7 100644
--- a/common/gnome-shell/3.16/sass/_common.scss
+++ b/common/gnome-shell/3.16/sass/_common.scss
@@ -53,6 +53,10 @@ stage {
   transition-duration: 0;
   border-radius: 2px;
 
+  @extend %button;
+}
+
+%button {
   @include button(normal);
 
   &:focus { @include button(focus); }
@@ -80,7 +84,7 @@ StEntry {
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
-  border-radius: 20px;
+  border-radius: 3px;
 
   @include entry(normal);
 
@@ -769,6 +773,9 @@ StScrollBar {
   min-height: 27px;
   border-image: url('common-assets/panel/panel.svg') 1 1 1 1;
 
+  // Fix dynamic top bar extension
+  &.dynamic-top-bar-white-btn { border-image: none; }
+
   &.unlock-screen,
   &.login-screen,
   &.lock-screen {
@@ -1733,10 +1740,10 @@ StScrollBar {
   width: 34em;
   margin: 5px;
   padding: 10px;
-  color: $osd_fg_color;
+  color: $fg_color;
   background-color: transparent;
   border: 1px solid transparent;
-  border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
+  border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9;
 
   .notification-icon { padding: 5px; }
 
@@ -1751,7 +1758,7 @@ StScrollBar {
   }
   .notification-button {
     padding: 4px 4px 5px;
-    @extend %osd_button;
+    @extend %button;
 
     &:first-child, &:last-child { border-radius: 2px; }
   }
@@ -1762,7 +1769,7 @@ StScrollBar {
 // Chat Bubbles
 .chat-body { spacing: 5px; }
 .chat-response { margin: 5px; }
-.chat-log-message { color: $osd_fg_color; }
+.chat-log-message { color: $fg_color; }
 .chat-new-group { padding-top: 1em; }
 .chat-received {
   padding-left: 4px;
@@ -1770,12 +1777,6 @@ StScrollBar {
   &:rtl { padding-left: 0px; padding-right: 4px; }
 }
 
-StEntry.chat-response {
-  @include entry(osd);
-
-  &:focus { @include entry(osd-focus); }
-}
-
 .chat-sent {
   padding-left: 18pt;
   color: $selected_bg_color;
@@ -1787,7 +1788,7 @@ StEntry.chat-response {
   padding-left: 4px;
   font-size: 9pt;
   font-weight: bold;
-  color: transparentize($osd_fg_color, 0.4);
+  color: transparentize($fg_color, 0.4);
 
   &:rtl { padding-left: 0; padding-right: 4px; }
 }
@@ -1802,7 +1803,7 @@ StEntry.chat-response {
 
 .hotplug-notification-item {
   padding: 2px 10px;
-  @extend %osd_button;
+  @extend %button;
 
   &:focus { padding: 2px 10px; }
 }
diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss
index 03b9f15..5ab1463 100644
--- a/common/gnome-shell/3.16/sass/_drawing.scss
+++ b/common/gnome-shell/3.16/sass/_drawing.scss
@@ -15,42 +15,47 @@
 // Entries drawing function
 //
   //@extend %reset_style;
-    box-shadow: inset 0 0 transparentize($base_color, 1);
 
   @if $t==normal {
     color: $text_color;
     background-color: $entry_bg;
     border: 1px solid $entry_border;
+    box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9);
   }
 
   @if $t==focus {
     color: $fg_color;
     background-color: $entry_bg;
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9);
   }
 
   @if $t==insensitive {
     color: $insensitive_fg_color;
     background-color: mix($entry_bg, $bg_color, 55%);
     border-color: 1px solid mix($entry_border, $bg_color, 55%);
+    box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9);
   }
 
   @if $t==osd {
     color: $osd_fg_color;
     background-color: transparentize(black, 0.8);
     border: 1px solid transparentize(black, 0.6);
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-focus {
     color: $osd_fg_color;
     background-color: transparentize(black, 0.8);
     border: 1px solid $selected_bg_color;
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-insensitive {
     color: $osd_insensitive_fg_color;
     background-color: transparentize(black, 0.9);
     border-color: 1px solid transparentize(black, 0.6);
+    box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 }
 
@@ -63,7 +68,7 @@
   //@extend %reset_style;
 
   text-shadow: 0 1px transparentize($base_color, 1);
-  box-shadow: inset 0 0 transparentize($base_color, 1);
+  box-shadow: inset 0 0 black;
 
   @if $t==normal {
   //
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg
index 2e97930..c383e92 100644
--- a/common/gtk-2.0/assets-dark.svg
+++ b/common/gtk-2.0/assets-dark.svg
@@ -565,11 +565,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="405.59481"
-     inkscape:cy="392.29239"
+     inkscape:zoom="4"
+     inkscape:cx="0.57764109"
+     inkscape:cy="348.64275"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer3"
      showgrid="false"
      showborder="false"
      inkscape:window-width="1366"
@@ -581,7 +581,7 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-paths="true"
      inkscape:snap-global="true"
-     showguides="false"
+     showguides="true"
      inkscape:guide-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:object-nodes="true"
@@ -626,8 +626,7 @@
      id="layer3"
      inkscape:label="superbackdrop"
      style="display:inline"
-     transform="translate(7,283.63782)"
-     sodipodi:insensitive="true">
+     transform="translate(7,283.63782)">
     <rect
        ry="0"
        rx="0"
@@ -1751,25 +1750,25 @@
          id="rect9321-3"
          style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         rx="11"
+         rx="2.5"
          y="-278.63782"
-         x="-1"
+         x="-2"
          height="21.999998"
-         width="22"
+         width="24"
          id="rect7903-93"
          style="opacity:1;fill:#383c45;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
-         ry="10.999999" />
+         ry="2.5" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639158"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-31"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -1784,23 +1783,23 @@
          id="rect9321-0-2"
          style="display:inline;opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         ry="10.999999"
-         rx="11"
+         ry="2.5"
+         rx="2.5"
          y="-278.63782"
-         x="33"
+         x="32"
          height="21.999998"
-         width="22"
+         width="24"
          id="rect7903-2-7"
          style="opacity:1;fill:#383c45;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639174"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24.999998"
          id="rect7903-7-3-7"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -1821,23 +1820,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-8"
-           width="22"
+           width="24"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="11"
-           ry="10.999999" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#373a42;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-7"
-           width="23"
+           width="25"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-5.0639158"
            inkscape:transform-center-y="0.42353254"
-           rx="11.5"
-           ry="11.5" />
+           rx="3.0000002"
+           ry="3" />
       </g>
     </g>
     <g
@@ -1847,20 +1846,20 @@
        inkscape:label="#g9335">
       <path
          style="opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 16 99 C 22.094 99 27 103.906 27 110 C 27 116.094 22.094 121 16 121 C 9.906 121 5 116.094 5 110 C 5 103.906 9.906 99 16 99 z "
+         d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 6.5 99 L 7.5 99 L 24.5 99 L 25.5 99 C 26.885 99 28 100.115 28 101.5 L 28 118.5 C 28 119.885 26.885 121 25.5 121 L 24.5 121 L 7.5 121 L 6.5 121 C 5.115 121 4 119.885 4 118.5 L 4 101.5 C 4 100.115 5.115 99 6.5 99 z "
          transform="translate(-6,-377.63782)"
          id="rect9321-6" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639158"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        transform="translate(-1,93.999999)"
@@ -1869,18 +1868,18 @@
        inkscape:label="#g9350">
       <path
          style="display:inline;opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 50 99 C 56.094 99 61 103.906 61 110 C 61 116.094 56.094 121 50 121 C 43.906 121 39 116.094 39 110 C 39 103.906 43.906 99 50 99 z "
+         d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 40.5 99 L 41.5 99 L 58.5 99 L 59.5 99 C 60.885 99 62 100.115 62 101.5 L 62 118.5 C 62 119.885 60.885 121 59.5 121 L 58.5 121 L 41.5 121 L 40.5 121 C 39.115 121 38 119.885 38 118.5 L 38 101.5 C 38 100.115 39.115 99 40.5 99 z "
          transform="translate(-6,-377.63782)"
          id="rect9321-0-0" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639177"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-3-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -1901,23 +1900,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5"
-           width="22"
+           width="24"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="11"
-           ry="10.999999" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-3"
-           width="23"
+           width="25"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-5.0639158"
            inkscape:transform-center-y="0.42353254"
-           rx="11.5"
-           ry="11.5" />
+           rx="3.0000002"
+           ry="3" />
       </g>
     </g>
     <rect
@@ -1936,20 +1935,20 @@
        clip-path="url(#clipPath4466)">
       <path
          style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 26 174 C 26.554 174 27 174.446 27 175 L 27 195 C 27 195.554 26.554 196 26 196 L 6 196 C 5.446 196 5 195.554 5 195 L 5 175 C 5 174.446 5.446 174 6 174 z "
+         d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 6.5 174 L 25.5 174 L 26 174 C 26.296418 174 26.553519 174.1343 26.736328 174.33789 C 27.488884 174.76781 28 175.56782 28 176.5 L 28 193.5 C 28 194.43218 27.488884 195.23219 26.736328 195.66211 C 26.553519 195.8657 26.296418 196 26 196 L 25.5 196 L 6.5 196 L 6 196 C 5.7035817 196 5.4464809 195.8657 5.2636719 195.66211 C 4.5111162 195.23219 4 194.43218 4 193.5 L 4 176.5 C 4 175.56782 4.5111162 174.76781 5.2636719 174.33789 C 5.4464809 174.1343 5.7035817 174 6 174 z "
          transform="translate(-6,-452.63782)"
          id="rect9321-4" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613592"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -1959,18 +1958,18 @@
        clip-path="url(#clipPath4470)">
       <path
          style="display:inline;opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 51 174 C 51.554 174 52 174.446 52 175 L 52 195 C 52 195.554 51.554 196 51 196 L 31 196 C 30.446 196 30 195.554 30 195 L 30 175 C 30 174.446 30.446 174 31 174 z "
+         d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 31.5 174 L 50.5 174 L 51 174 C 51.296418 174 51.553519 174.1343 51.736328 174.33789 C 52.488884 174.76781 53 175.56782 53 176.5 L 53 193.5 C 53 194.43218 52.488884 195.23219 51.736328 195.66211 C 51.553519 195.8657 51.296418 196 51 196 L 50.5 196 L 31.5 196 L 31 196 C 30.703582 196 30.446481 195.8657 30.263672 195.66211 C 29.511116 195.23219 29 194.43218 29 193.5 L 29 176.5 C 29 175.56782 29.511116 174.76781 30.263672 174.33789 C 30.446481 174.1343 30.703582 174 31 174 z "
          transform="translate(3,-452.63782)"
          id="rect9321-0-5" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613611"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -1992,23 +1991,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="1"
-           ry="1" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#373a42;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613592"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -2019,20 +2018,20 @@
        transform="translate(-1,199)">
       <path
          style="opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 26 204 C 26.554 204 27 204.446 27 205 L 27 225 C 27 225.554 26.554 226 26 226 L 6 226 C 5.446 226 5 225.554 5 225 L 5 205 C 5 204.446 5.446 204 6 204 z "
+         d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 6.5 204 L 25.5 204 L 26 204 C 26.296418 204 26.553519 204.1343 26.736328 204.33789 C 27.488884 204.76781 28 205.56782 28 206.5 L 28 223.5 C 28 224.43218 27.488884 225.23219 26.736328 225.66211 C 26.553519 225.8657 26.296418 226 26 226 L 25.5 226 L 6.5 226 L 6 226 C 5.7035817 226 5.4464809 225.8657 5.2636719 225.66211 C 4.5111162 225.23219 4 224.43218 4 223.5 L 4 206.5 C 4 205.56782 4.5111162 204.76781 5.2636719 204.33789 C 5.4464809 204.1343 5.7035817 204 6 204 z "
          transform="translate(-6,-482.63782)"
          id="rect9321-4-9" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613592"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -2042,18 +2041,18 @@
        transform="translate(-10,199)">
       <path
          style="display:inline;opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 51 204 C 51.554 204 52 204.446 52 205 L 52 225 C 52 225.554 51.554 226 51 226 L 31 226 C 30.446 226 30 225.554 30 225 L 30 205 C 30 204.446 30.446 204 31 204 z "
+         d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 31.5 204 L 50.5 204 L 51 204 C 51.296418 204 51.553519 204.1343 51.736328 204.33789 C 52.488884 204.76781 53 205.56782 53 206.5 L 53 223.5 C 53 224.43218 52.488884 225.23219 51.736328 225.66211 C 51.553519 225.8657 51.296418 226 51 226 L 50.5 226 L 31.5 226 L 31 226 C 30.703582 226 30.446481 225.8657 30.263672 225.66211 C 29.511116 225.23219 29 224.43218 29 223.5 L 29 206.5 C 29 205.56782 29.511116 204.76781 30.263672 204.33789 C 30.446481 204.1343 30.703582 204 31 204 z "
          transform="translate(3,-482.63782)"
          id="rect9321-0-5-3" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613611"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1-0"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -2075,23 +2074,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="1"
-           ry="1" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0-8"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613592"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -2244,20 +2243,20 @@
        transform="matrix(-1,0,0,1,146,169)">
       <path
          style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 153 174 C 153.554 174 154 174.446 154 175 L 154 195 C 154 195.554 153.554 196 153 196 L 133 196 C 132.446 196 132 195.554 132 195 L 132 175 C 132 174.446 132.446 174 133 174 z "
+         d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 133.5 174 L 152.5 174 L 153 174 C 153.29642 174 153.55352 174.1343 153.73633 174.33789 C 154.48888 174.76781 155 175.56782 155 176.5 L 155 193.5 C 155 194.43218 154.48888 195.23219 153.73633 195.66211 C 153.55352 195.8657 153.29642 196 153 196 L 152.5 196 L 133.5 196 L 133 196 C 132.70358 196 132.44648 195.8657 132.26367 195.66211 C 131.51112 195.23219 131 194.43218 131 193.5 L 131 176.5 C 131 175.56782 131.51112 174.76781 132.26367 174.33789 C 132.44648 174.1343 132.70358 174 133 174 z "
          transform="matrix(-1,0,0,1,153,-452.63782)"
          id="rect9321-4-5" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613591"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-76"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -2267,18 +2266,18 @@
        clip-path="url(#clipPath4470-6)">
       <path
          style="display:inline;opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 128 174 C 128.554 174 129 174.446 129 175 L 129 195 C 129 195.554 128.554 196 128 196 L 108 196 C 107.446 196 107 195.554 107 195 L 107 175 C 107 174.446 107.446 174 108 174 z "
+         d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 108.5 174 L 127.5 174 L 128 174 C 128.29642 174 128.55352 174.1343 128.73633 174.33789 C 129.48888 174.76781 130 175.56782 130 176.5 L 130 193.5 C 130 194.43218 129.48888 195.23219 128.73633 195.66211 C 128.55352 195.8657 128.29642 196 128 196 L 127.5 196 L 108.5 196 L 108 196 C 107.70358 196 107.44648 195.8657 107.26367 195.66211 C 106.51112 195.23219 106 194.43218 106 193.5 L 106 176.5 C 106 175.56782 106.51112 174.76781 107.26367 174.33789 C 107.44648 174.1343 107.70358 174 108 174 z "
          transform="matrix(-1,0,0,1,162,-452.63782)"
          id="rect9321-0-5-4" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613572"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1-2"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -2300,23 +2299,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-5"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="1"
-           ry="1" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#373a42;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0-5"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613591"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -2327,20 +2326,20 @@
        transform="matrix(-1,0,0,1,146,199)">
       <path
          style="opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 153 204 C 153.554 204 154 204.446 154 205 L 154 225 C 154 225.554 153.554 226 153 226 L 133 226 C 132.446 226 132 225.554 132 225 L 132 205 C 132 204.446 132.446 204 133 204 z "
+         d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 133.5 204 L 152.5 204 L 153 204 C 153.29642 204 153.55352 204.1343 153.73633 204.33789 C 154.48888 204.76781 155 205.56782 155 206.5 L 155 223.5 C 155 224.43218 154.48888 225.23219 153.73633 225.66211 C 153.55352 225.8657 153.29642 226 153 226 L 152.5 226 L 133.5 226 L 133 226 C 132.70358 226 132.44648 225.8657 132.26367 225.66211 C 131.51112 225.23219 131 224.43218 131 223.5 L 131 206.5 C 131 205.56782 131.51112 204.76781 132.26367 204.33789 C 132.44648 204.1343 132.70358 204 133 204 z "
          transform="matrix(-1,0,0,1,153,-482.63782)"
          id="rect9321-4-9-9" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613591"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-9-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -2350,18 +2349,18 @@
        transform="matrix(-1,0,0,1,155,199)">
       <path
          style="display:inline;opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 128 204 C 128.554 204 129 204.446 129 205 L 129 225 C 129 225.554 128.554 226 128 226 L 108 226 C 107.446 226 107 225.554 107 225 L 107 205 C 107 204.446 107.446 204 108 204 z "
+         d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 108.5 204 L 127.5 204 L 128 204 C 128.29642 204 128.55352 204.1343 128.73633 204.33789 C 129.48888 204.76781 130 205.56782 130 206.5 L 130 223.5 C 130 224.43218 129.48888 225.23219 128.73633 225.66211 C 128.55352 225.8657 128.29642 226 128 226 L 127.5 226 L 108.5 226 L 108 226 C 107.70358 226 107.44648 225.8657 107.26367 225.66211 C 106.51112 225.23219 106 224.43218 106 223.5 L 106 206.5 C 106 205.56782 106.51112 204.76781 107.26367 204.33789 C 107.44648 204.1343 107.70358 204 108 204 z "
          transform="matrix(-1,0,0,1,162,-482.63782)"
          id="rect9321-0-5-3-7" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613572"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1-0-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -2383,23 +2382,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4-7"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="1"
-           ry="1" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0-8-2"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613591"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -4950,20 +4949,20 @@
        inkscape:label="#g9335">
       <path
          style="opacity:1;fill:#2f343b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 16 131 C 22.094 131 27 135.906 27 142 C 27 148.094 22.094 153 16 153 C 9.906 153 5 148.094 5 142 C 5 135.906 9.906 131 16 131 z "
+         d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 6.5 131 L 7.5 131 L 24.5 131 L 25.5 131 C 26.885 131 28 132.115 28 133.5 L 28 150.5 C 28 151.885 26.885 153 25.5 153 L 24.5 153 L 7.5 153 L 6.5 153 C 5.115 153 4 151.885 4 150.5 L 4 133.5 C 4 132.115 5.115 131 6.5 131 z "
          transform="translate(-6,-409.63782)"
          id="rect9321-6-7" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639157"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-1-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#181b20;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        transform="translate(-1,126)"
@@ -4972,18 +4971,18 @@
        inkscape:label="#g9350">
       <path
          style="display:inline;opacity:1;fill:#2f343b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 50 131 C 56.094 131 61 135.906 61 142 C 61 148.094 56.094 153 50 153 C 43.906 153 39 148.094 39 142 C 39 135.906 43.906 131 50 131 z "
+         d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 40.5 131 L 41.5 131 L 58.5 131 L 59.5 131 C 60.885 131 62 132.115 62 133.5 L 62 150.5 C 62 151.885 60.885 153 59.5 153 L 58.5 153 L 41.5 153 L 40.5 153 C 39.115 153 38 151.885 38 150.5 L 38 133.5 C 38 132.115 39.115 131 40.5 131 z "
          transform="translate(-6,-409.63782)"
          id="rect9321-0-0-1" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639174"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24.999998"
          id="rect7903-7-3-4-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -5004,23 +5003,23 @@
         <rect
            style="opacity:1;fill:#3a3e48;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5-6"
-           width="22"
+           width="24"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="11"
-           ry="10.999999" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#181b20;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-3-4"
-           width="23"
+           width="25"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-5.0639158"
            inkscape:transform-center-y="0.42353254"
-           rx="11.5"
-           ry="11.5" />
+           rx="3.0000002"
+           ry="3" />
       </g>
     </g>
     <g
@@ -5030,20 +5029,20 @@
        transform="translate(106,61.999997)">
       <path
          style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 123 67 C 129.094 67 134 71.906001 134 78 C 134 84.093999 129.094 89 123 89 C 116.906 89 112 84.093999 112 78 C 112 71.906001 116.906 67 123 67 z "
-         id="rect9321-3-7"
-         transform="translate(-113,-345.63782)" />
+         d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 113.5 67 L 114.5 67 L 131.5 67 L 132.5 67 C 133.885 67 135 68.115 135 69.5 L 135 86.5 C 135 87.885 133.885 89 132.5 89 L 131.5 89 L 114.5 89 L 113.5 89 C 112.115 89 111 87.885 111 86.5 L 111 69.5 C 111 68.115 112.115 67 113.5 67 z "
+         transform="translate(-113,-345.63782)"
+         id="rect9321-3-7" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639158"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-31-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -5052,18 +5051,18 @@
        transform="translate(106,61.999997)">
       <path
          style="display:inline;opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 157 67 C 163.094 67 168 71.906001 168 78 C 168 84.093999 163.094 89 157 89 C 150.906 89 146 84.093999 146 78 C 146 71.906001 150.906 67 157 67 z "
-         id="rect9321-0-2-2"
-         transform="translate(-113,-345.63782)" />
+         d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 147.5 67 L 148.5 67 L 165.5 67 L 166.5 67 C 167.885 67 169 68.115 169 69.5 L 169 86.5 C 169 87.885 167.885 89 166.5 89 L 165.5 89 L 148.5 89 L 147.5 89 C 146.115 89 145 87.885 145 86.5 L 145 69.5 C 145 68.115 146.115 67 147.5 67 z "
+         transform="translate(-113,-345.63782)"
+         id="rect9321-0-2-2" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639177"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-3-7-7"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -5074,22 +5073,21 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath5131)">
       <path
-         inkscape:connector-curvature="0"
          style="opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 3,130 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z"
-         transform="translate(-6,-409.63782)"
+         d="M 115 130 L 115 154 L 141 154 L 141 130 L 115 130 z M 118.5 131 L 119.5 131 L 136.5 131 L 137.5 131 C 138.885 131 140 132.115 140 133.5 L 140 150.5 C 140 151.885 138.885 153 137.5 153 L 136.5 153 L 119.5 153 L 118.5 153 C 117.115 153 116 151.885 116 150.5 L 116 133.5 C 116 132.115 117.115 131 118.5 131 z "
+         transform="matrix(-1,0,0,1,138,-409.63782)"
          id="rect9321-6-7-4" />
       <rect
-         rx="11.5"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613593"
          y="-279.13782"
-         x="-1.5"
+         x="-1.5000001"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-1-6-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        transform="translate(103,126)"
@@ -5098,20 +5096,19 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath5158)">
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;opacity:1;fill:#444852;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 37,130 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z"
-         transform="translate(-6,-409.63782)"
+         d="M 141 130 L 141 154 L 167 154 L 167 130 L 141 130 z M 144.5 131 L 145.5 131 L 162.5 131 L 163.5 131 C 164.885 131 166 132.115 166 133.5 L 166 150.5 C 166 151.885 164.885 153 163.5 153 L 162.5 153 L 145.5 153 L 144.5 153 C 143.115 153 142 151.885 142 150.5 L 142 133.5 C 142 132.115 143.115 131 144.5 131 z "
+         transform="translate(-110,-409.63782)"
          id="rect9321-0-0-1-3" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613611"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-4-9-5"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png
index 9f7659c..aafb94a 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png
index 6a35867..2bdbd03 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png
index b59479a..867bd35 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus.png b/common/gtk-2.0/assets-dark/combo-entry-focus.png
index 344254c..20eb8c4 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus.png and b/common/gtk-2.0/assets-dark/combo-entry-focus.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png
index 6b1caa3..cee0032 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png
index 8f0a28d..8fe24dc 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png
index 0320a05..0ac56e4 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive.png
index bfdced0..9d8be35 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png
index 0715513..939e10b 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-notebook.png
index c424720..1dfbe4a 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-notebook.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-rtl.png
index dd89a2c..e48c045 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-rtl.png differ
diff --git a/common/gtk-2.0/assets-dark/combo-entry.png b/common/gtk-2.0/assets-dark/combo-entry.png
index 0c9ec42..88ecac3 100644
Binary files a/common/gtk-2.0/assets-dark/combo-entry.png and b/common/gtk-2.0/assets-dark/combo-entry.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png b/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png
index b63fd56..ebe2f9f 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png and b/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg.png b/common/gtk-2.0/assets-dark/entry-border-active-bg.png
index eba6d64..d3a0184 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png b/common/gtk-2.0/assets-dark/entry-border-bg-solid.png
index d666f84..356a144 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png and b/common/gtk-2.0/assets-dark/entry-border-bg-solid.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-bg.png b/common/gtk-2.0/assets-dark/entry-border-bg.png
index 6a32cae..b4c169e 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-bg.png and b/common/gtk-2.0/assets-dark/entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png
index e9af0cf..a6b717c 100644
Binary files a/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png and b/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png
index 4d4188e..820e9ed 100644
Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png
index 61b07b4..c31d380 100644
Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png and b/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png
index 4d32e93..e0ea69e 100644
Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png and b/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png
index f8ce4d8..f5d30f3 100644
Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png
index 3849377..716060a 100644
Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png and b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png
index 227548c..707df1c 100644
Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png and b/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png differ
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg
index 0ea70ce..30a93ac 100644
--- a/common/gtk-2.0/assets.svg
+++ b/common/gtk-2.0/assets.svg
@@ -565,11 +565,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="449.14178"
-     inkscape:cy="382.90905"
+     inkscape:zoom="1"
+     inkscape:cx="83.616238"
+     inkscape:cy="357.69052"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer3"
      showgrid="false"
      showborder="false"
      inkscape:window-width="1366"
@@ -1746,25 +1746,25 @@
          id="rect9321-3"
          style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         rx="11"
+         rx="2.5"
          y="-278.63782"
-         x="-1"
-         height="21.999998"
-         width="22"
+         x="-2"
+         height="22"
+         width="24"
          id="rect7903-93"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
-         ry="10.999999" />
+         ry="2.5" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639158"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-31"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -1779,23 +1779,23 @@
          id="rect9321-0-2"
          style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         ry="10.999999"
-         rx="11"
+         ry="2.5"
+         rx="2.5"
          y="-278.63782"
-         x="33"
+         x="32"
          height="21.999998"
-         width="22"
+         width="24"
          id="rect7903-2-7"
          style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639174"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24.999998"
          id="rect7903-7-3-7"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -1816,23 +1816,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-8"
-           width="22"
+           width="24"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="11"
-           ry="10.999999" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#e2e7ef;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-7"
-           width="23"
+           width="25"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
-           inkscape:transform-center-y="0.42353254"
-           rx="11.5"
-           ry="11.5" />
+           inkscape:transform-center-x="-5.0639158"
+           inkscape:transform-center-y="0.42353316"
+           rx="3.0000002"
+           ry="3" />
       </g>
     </g>
     <g
@@ -1842,20 +1842,20 @@
        inkscape:label="#g9335">
       <path
          style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 16 99 C 22.094 99 27 103.906 27 110 C 27 116.094 22.094 121 16 121 C 9.906 121 5 116.094 5 110 C 5 103.906 9.906 99 16 99 z "
+         d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 6.5 99 L 7.5 99 L 24.5 99 L 25.5 99 C 26.885 99 28 100.115 28 101.5 L 28 118.5 C 28 119.885 26.885 121 25.5 121 L 24.5 121 L 7.5 121 L 6.5 121 C 5.115 121 4 119.885 4 118.5 L 4 101.5 C 4 100.115 5.115 99 6.5 99 z "
          transform="translate(-6,-377.63782)"
          id="rect9321-6" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639158"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        transform="translate(-1,93.999999)"
@@ -1864,18 +1864,18 @@
        inkscape:label="#g9350">
       <path
          style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 50 99 C 56.094 99 61 103.906 61 110 C 61 116.094 56.094 121 50 121 C 43.906 121 39 116.094 39 110 C 39 103.906 43.906 99 50 99 z "
+         d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 40.5 99 L 41.5 99 L 58.5 99 L 59.5 99 C 60.885 99 62 100.115 62 101.5 L 62 118.5 C 62 119.885 60.885 121 59.5 121 L 58.5 121 L 41.5 121 L 40.5 121 C 39.115 121 38 119.885 38 118.5 L 38 101.5 C 38 100.115 39.115 99 40.5 99 z "
          transform="translate(-6,-377.63782)"
          id="rect9321-0-0" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639174"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24.999998"
          id="rect7903-7-3-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -1896,23 +1896,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5"
-           width="22"
+           width="24"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="11"
-           ry="10.999999" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-3"
-           width="23"
+           width="25"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-5.0639158"
            inkscape:transform-center-y="0.42353254"
-           rx="11.5"
-           ry="11.5" />
+           rx="3.0000002"
+           ry="3" />
       </g>
     </g>
     <rect
@@ -1931,20 +1931,20 @@
        clip-path="url(#clipPath4466)">
       <path
          style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 26 174 C 26.554 174 27 174.446 27 175 L 27 195 C 27 195.554 26.554 196 26 196 L 6 196 C 5.446 196 5 195.554 5 195 L 5 175 C 5 174.446 5.446 174 6 174 z "
+         d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 6.5 174 L 25.5 174 L 26 174 C 26.296418 174 26.553519 174.1343 26.736328 174.33789 C 27.488884 174.76781 28 175.56782 28 176.5 L 28 193.5 C 28 194.43218 27.488884 195.23219 26.736328 195.66211 C 26.553519 195.8657 26.296418 196 26 196 L 25.5 196 L 6.5 196 L 6 196 C 5.7035817 196 5.4464809 195.8657 5.2636719 195.66211 C 4.5111162 195.23219 4 194.43218 4 193.5 L 4 176.5 C 4 175.56782 4.5111162 174.76781 5.2636719 174.33789 C 5.4464809 174.1343 5.7035817 174 6 174 z "
          transform="translate(-6,-452.63782)"
          id="rect9321-4" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613592"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -1954,18 +1954,18 @@
        clip-path="url(#clipPath4470)">
       <path
          style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 51 174 C 51.554 174 52 174.446 52 175 L 52 195 C 52 195.554 51.554 196 51 196 L 31 196 C 30.446 196 30 195.554 30 195 L 30 175 C 30 174.446 30.446 174 31 174 z "
+         d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 31.5 174 L 50.5 174 L 51 174 C 51.296418 174 51.553519 174.1343 51.736328 174.33789 C 52.488884 174.76781 53 175.56782 53 176.5 L 53 193.5 C 53 194.43218 52.488884 195.23219 51.736328 195.66211 C 51.553519 195.8657 51.296418 196 51 196 L 50.5 196 L 31.5 196 L 31 196 C 30.703582 196 30.446481 195.8657 30.263672 195.66211 C 29.511116 195.23219 29 194.43218 29 193.5 L 29 176.5 C 29 175.56782 29.511116 174.76781 30.263672 174.33789 C 30.446481 174.1343 30.703582 174 31 174 z "
          transform="translate(3,-452.63782)"
          id="rect9321-0-5" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613611"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -1987,23 +1987,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
            rx="1"
            ry="1" />
         <rect
            style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#e2e7ef;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613592"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -2014,20 +2014,20 @@
        transform="translate(-1,199)">
       <path
          style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 26 204 C 26.554 204 27 204.446 27 205 L 27 225 C 27 225.554 26.554 226 26 226 L 6 226 C 5.446 226 5 225.554 5 225 L 5 205 C 5 204.446 5.446 204 6 204 z "
+         d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 6.5 204 L 25.5 204 L 26 204 C 26.296418 204 26.553519 204.1343 26.736328 204.33789 C 27.488884 204.76781 28 205.56782 28 206.5 L 28 223.5 C 28 224.43218 27.488884 225.23219 26.736328 225.66211 C 26.553519 225.8657 26.296418 226 26 226 L 25.5 226 L 6.5 226 L 6 226 C 5.7035817 226 5.4464809 225.8657 5.2636719 225.66211 C 4.5111162 225.23219 4 224.43218 4 223.5 L 4 206.5 C 4 205.56782 4.5111162 204.76781 5.2636719 204.33789 C 5.4464809 204.1343 5.7035817 204 6 204 z "
          transform="translate(-6,-482.63782)"
          id="rect9321-4-9" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613592"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -2037,18 +2037,18 @@
        transform="translate(-10,199)">
       <path
          style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 51 204 C 51.554 204 52 204.446 52 205 L 52 225 C 52 225.554 51.554 226 51 226 L 31 226 C 30.446 226 30 225.554 30 225 L 30 205 C 30 204.446 30.446 204 31 204 z "
+         d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 31.5 204 L 50.5 204 L 51 204 C 51.296418 204 51.553519 204.1343 51.736328 204.33789 C 52.488884 204.76781 53 205.56782 53 206.5 L 53 223.5 C 53 224.43218 52.488884 225.23219 51.736328 225.66211 C 51.553519 225.8657 51.296418 226 51 226 L 50.5 226 L 31.5 226 L 31 226 C 30.703582 226 30.446481 225.8657 30.263672 225.66211 C 29.511116 225.23219 29 224.43218 29 223.5 L 29 206.5 C 29 205.56782 29.511116 204.76781 30.263672 204.33789 C 30.446481 204.1343 30.703582 204 31 204 z "
          transform="translate(3,-482.63782)"
          id="rect9321-0-5-3" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613611"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1-0"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -2070,23 +2070,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
            rx="1"
            ry="1" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0-8"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613592"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -2239,20 +2239,20 @@
        transform="matrix(-1,0,0,1,146,169)">
       <path
          style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 153 174 C 153.554 174 154 174.446 154 175 L 154 195 C 154 195.554 153.554 196 153 196 L 133 196 C 132.446 196 132 195.554 132 195 L 132 175 C 132 174.446 132.446 174 133 174 z "
+         d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 133.5 174 L 152.5 174 L 153 174 C 153.29642 174 153.55352 174.1343 153.73633 174.33789 C 154.48888 174.76781 155 175.56782 155 176.5 L 155 193.5 C 155 194.43218 154.48888 195.23219 153.73633 195.66211 C 153.55352 195.8657 153.29642 196 153 196 L 152.5 196 L 133.5 196 L 133 196 C 132.70358 196 132.44648 195.8657 132.26367 195.66211 C 131.51112 195.23219 131 194.43218 131 193.5 L 131 176.5 C 131 175.56782 131.51112 174.76781 132.26367 174.33789 C 132.44648 174.1343 132.70358 174 133 174 z "
          transform="matrix(-1,0,0,1,153,-452.63782)"
          id="rect9321-4-5" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613591"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-76"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -2262,18 +2262,18 @@
        clip-path="url(#clipPath4470-6)">
       <path
          style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 128 174 C 128.554 174 129 174.446 129 175 L 129 195 C 129 195.554 128.554 196 128 196 L 108 196 C 107.446 196 107 195.554 107 195 L 107 175 C 107 174.446 107.446 174 108 174 z "
+         d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 108.5 174 L 127.5 174 L 128 174 C 128.29642 174 128.55352 174.1343 128.73633 174.33789 C 129.48888 174.76781 130 175.56782 130 176.5 L 130 193.5 C 130 194.43218 129.48888 195.23219 128.73633 195.66211 C 128.55352 195.8657 128.29642 196 128 196 L 127.5 196 L 108.5 196 L 108 196 C 107.70358 196 107.44648 195.8657 107.26367 195.66211 C 106.51112 195.23219 106 194.43218 106 193.5 L 106 176.5 C 106 175.56782 106.51112 174.76781 107.26367 174.33789 C 107.44648 174.1343 107.70358 174 108 174 z "
          transform="matrix(-1,0,0,1,162,-452.63782)"
          id="rect9321-0-5-4" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613572"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1-2"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -2295,23 +2295,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-5"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
            rx="1"
            ry="1" />
         <rect
            style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#e2e7ef;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0-5"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613591"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -2322,20 +2322,20 @@
        transform="matrix(-1,0,0,1,146,199)">
       <path
          style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 153 204 C 153.554 204 154 204.446 154 205 L 154 225 C 154 225.554 153.554 226 153 226 L 133 226 C 132.446 226 132 225.554 132 225 L 132 205 C 132 204.446 132.446 204 133 204 z "
+         d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 133.5 204 L 152.5 204 L 153 204 C 153.29642 204 153.55352 204.1343 153.73633 204.33789 C 154.48888 204.76781 155 205.56782 155 206.5 L 155 223.5 C 155 224.43218 154.48888 225.23219 153.73633 225.66211 C 153.55352 225.8657 153.29642 226 153 226 L 152.5 226 L 133.5 226 L 133 226 C 132.70358 226 132.44648 225.8657 132.26367 225.66211 C 131.51112 225.23219 131 224.43218 131 223.5 L 131 206.5 C 131 205.56782 131.51112 204.76781 132.26367 204.33789 C 132.44648 204.1343 132.70358 204 133 204 z "
          transform="matrix(-1,0,0,1,153,-482.63782)"
          id="rect9321-4-9-9" />
       <rect
-         rx="2"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613591"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-8-9-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="2" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -2345,18 +2345,18 @@
        transform="matrix(-1,0,0,1,155,199)">
       <path
          style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 128 204 C 128.554 204 129 204.446 129 205 L 129 225 C 129 225.554 128.554 226 128 226 L 108 226 C 107.446 226 107 225.554 107 225 L 107 205 C 107 204.446 107.446 204 108 204 z "
+         d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 108.5 204 L 127.5 204 L 128 204 C 128.29642 204 128.55352 204.1343 128.73633 204.33789 C 129.48888 204.76781 130 205.56782 130 206.5 L 130 223.5 C 130 224.43218 129.48888 225.23219 128.73633 225.66211 C 128.55352 225.8657 128.29642 226 128 226 L 127.5 226 L 108.5 226 L 108 226 C 107.70358 226 107.44648 225.8657 107.26367 225.66211 C 106.51112 225.23219 106 224.43218 106 223.5 L 106 206.5 C 106 205.56782 106.51112 204.76781 107.26367 204.33789 C 107.44648 204.1343 107.70358 204 108 204 z "
          transform="matrix(-1,0,0,1,162,-482.63782)"
          id="rect9321-0-5-3-7" />
       <rect
-         ry="2"
-         rx="2"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613572"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-1-0-4"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -2378,23 +2378,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-7-4-7"
-           width="22"
+           width="23"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
            rx="1"
            ry="1" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-0-8-2"
-           width="23"
+           width="24"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-4.8613591"
            inkscape:transform-center-y="0.42353254"
-           rx="2"
-           ry="2" />
+           rx="3"
+           ry="3" />
       </g>
     </g>
     <g
@@ -4995,20 +4995,20 @@
        inkscape:label="#g9335">
       <path
          style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 16 131 C 22.094 131 27 135.906 27 142 C 27 148.094 22.094 153 16 153 C 9.906 153 5 148.094 5 142 C 5 135.906 9.906 131 16 131 z "
+         d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 6.5 131 L 7.5 131 L 24.5 131 L 25.5 131 C 26.885 131 28 132.115 28 133.5 L 28 150.5 C 28 151.885 26.885 153 25.5 153 L 24.5 153 L 7.5 153 L 6.5 153 C 5.115 153 4 151.885 4 150.5 L 4 133.5 C 4 132.115 5.115 131 6.5 131 z "
          transform="translate(-6,-409.63782)"
          id="rect9321-6-7" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639157"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-1-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        transform="translate(-1,126)"
@@ -5017,18 +5017,18 @@
        inkscape:label="#g9350">
       <path
          style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 50 131 C 56.094 131 61 135.906 61 142 C 61 148.094 56.094 153 50 153 C 43.906 153 39 148.094 39 142 C 39 135.906 43.906 131 50 131 z "
+         d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 40.5 131 L 41.5 131 L 58.5 131 L 59.5 131 C 60.885 131 62 132.115 62 133.5 L 62 150.5 C 62 151.885 60.885 153 59.5 153 L 58.5 153 L 41.5 153 L 40.5 153 C 39.115 153 38 151.885 38 150.5 L 38 133.5 C 38 132.115 39.115 131 40.5 131 z "
          transform="translate(-6,-409.63782)"
          id="rect9321-0-0-1" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639177"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-3-4-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -5049,23 +5049,23 @@
         <rect
            style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
            id="rect7903-6-5-6"
-           width="22"
+           width="24"
            height="21.999998"
-           x="67"
+           x="66"
            y="-278.63782"
-           rx="11"
-           ry="10.999999" />
+           rx="2.5"
+           ry="2.5" />
         <rect
            style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect7903-7-2-3-4"
-           width="23"
+           width="25"
            height="23"
-           x="66.5"
+           x="65.5"
            y="-279.13782"
-           inkscape:transform-center-x="-4.6588025"
+           inkscape:transform-center-x="-5.0639158"
            inkscape:transform-center-y="0.42353254"
-           rx="11.5"
-           ry="11.5" />
+           rx="3.0000002"
+           ry="3" />
       </g>
     </g>
     <g
@@ -5075,20 +5075,20 @@
        transform="translate(106,61.999997)">
       <path
          style="opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 123 67 C 129.094 67 134 71.906001 134 78 C 134 84.093999 129.094 89 123 89 C 116.906 89 112 84.093999 112 78 C 112 71.906001 116.906 67 123 67 z "
-         id="rect9321-3-7"
-         transform="translate(-113,-345.63782)" />
+         d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 113.5 67 L 114.5 67 L 131.5 67 L 132.5 67 C 133.885 67 135 68.115 135 69.5 L 135 86.5 C 135 87.885 133.885 89 132.5 89 L 131.5 89 L 114.5 89 L 113.5 89 C 112.115 89 111 87.885 111 86.5 L 111 69.5 C 111 68.115 112.115 67 113.5 67 z "
+         transform="translate(-113,-345.63782)"
+         id="rect9321-3-7" />
       <rect
-         rx="11.5"
+         rx="3.0000002"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639158"
          y="-279.13782"
-         x="-1.5"
+         x="-2.5"
          height="23"
-         width="23"
+         width="25"
          id="rect7903-7-31-1"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        style="display:inline"
@@ -5097,18 +5097,18 @@
        transform="translate(106,61.999997)">
       <path
          style="display:inline;opacity:1;fill:#f5f6f7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 157 67 C 163.094 67 168 71.906001 168 78 C 168 84.093999 163.094 89 157 89 C 150.906 89 146 84.093999 146 78 C 146 71.906001 150.906 67 157 67 z "
-         id="rect9321-0-2-2"
-         transform="translate(-113,-345.63782)" />
+         d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 147.5 67 L 148.5 67 L 165.5 67 L 166.5 67 C 167.885 67 169 68.115 169 69.5 L 169 86.5 C 169 87.885 167.885 89 166.5 89 L 165.5 89 L 148.5 89 L 147.5 89 C 146.115 89 145 87.885 145 86.5 L 145 69.5 C 145 68.115 146.115 67 147.5 67 z "
+         transform="translate(-113,-345.63782)"
+         id="rect9321-0-2-2" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-5.0639174"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24.999998"
          id="rect7903-7-3-7-7"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
@@ -5119,22 +5119,21 @@
        inkscape:label="#g9335"
        clip-path="url(#clipPath5131)">
       <path
-         inkscape:connector-curvature="0"
          style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 3,130 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z"
-         transform="translate(-6,-409.63782)"
+         d="M 115 130 L 115 154 L 141 154 L 141 130 L 115 130 z M 118.5 131 L 119.5 131 L 136.5 131 L 137.5 131 C 138.885 131 140 132.115 140 133.5 L 140 150.5 C 140 151.885 138.885 153 137.5 153 L 136.5 153 L 119.5 153 L 118.5 153 C 117.115 153 116 151.885 116 150.5 L 116 133.5 C 116 132.115 117.115 131 118.5 131 z "
+         transform="matrix(-1,0,0,1,138,-409.63782)"
          id="rect9321-6-7-4" />
       <rect
-         rx="11.5"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613593"
          y="-279.13782"
-         x="-1.5"
+         x="-1.5000001"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-1-6-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         ry="11.5" />
+         ry="3" />
     </g>
     <g
        transform="translate(103,126)"
@@ -5143,20 +5142,19 @@
        inkscape:label="#g9350"
        clip-path="url(#clipPath5158)">
       <path
-         inkscape:connector-curvature="0"
          style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 37,130 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z"
-         transform="translate(-6,-409.63782)"
+         d="M 141 130 L 141 154 L 167 154 L 167 130 L 141 130 z M 144.5 131 L 145.5 131 L 162.5 131 L 163.5 131 C 164.885 131 166 132.115 166 133.5 L 166 150.5 C 166 151.885 164.885 153 163.5 153 L 162.5 153 L 145.5 153 L 144.5 153 C 143.115 153 142 151.885 142 150.5 L 142 133.5 C 142 132.115 143.115 131 144.5 131 z "
+         transform="translate(-110,-409.63782)"
          id="rect9321-0-0-1-3" />
       <rect
-         ry="11.5"
-         rx="11.5"
+         ry="3"
+         rx="3"
          inkscape:transform-center-y="0.42353254"
-         inkscape:transform-center-x="-4.6588025"
+         inkscape:transform-center-x="-4.8613611"
          y="-279.13782"
-         x="32.5"
+         x="31.500002"
          height="23"
-         width="23"
+         width="24"
          id="rect7903-7-3-4-9-5"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png
index 6f9f3b0..f538ef1 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook.png b/common/gtk-2.0/assets/combo-entry-focus-notebook.png
index ecaa70d..02ef5b5 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus-notebook.png and b/common/gtk-2.0/assets/combo-entry-focus-notebook.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-focus-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-rtl.png
index 19ec0e4..f59520a 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus-rtl.png and b/common/gtk-2.0/assets/combo-entry-focus-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-focus.png b/common/gtk-2.0/assets/combo-entry-focus.png
index d207b00..4755502 100644
Binary files a/common/gtk-2.0/assets/combo-entry-focus.png and b/common/gtk-2.0/assets/combo-entry-focus.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png
index b491831..7f6fb70 100644
Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png
index 6da5a1c..3313b01 100644
Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png and b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png b/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png
index 82ff427..a9d83a0 100644
Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png and b/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-insensitive.png b/common/gtk-2.0/assets/combo-entry-insensitive.png
index cee3ce2..4aa5a61 100644
Binary files a/common/gtk-2.0/assets/combo-entry-insensitive.png and b/common/gtk-2.0/assets/combo-entry-insensitive.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png
index 23c8eaa..10757a6 100644
Binary files a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-notebook.png b/common/gtk-2.0/assets/combo-entry-notebook.png
index 1042b0d..c6cfc73 100644
Binary files a/common/gtk-2.0/assets/combo-entry-notebook.png and b/common/gtk-2.0/assets/combo-entry-notebook.png differ
diff --git a/common/gtk-2.0/assets/combo-entry-rtl.png b/common/gtk-2.0/assets/combo-entry-rtl.png
index 70ce5dd..74c9b99 100644
Binary files a/common/gtk-2.0/assets/combo-entry-rtl.png and b/common/gtk-2.0/assets/combo-entry-rtl.png differ
diff --git a/common/gtk-2.0/assets/combo-entry.png b/common/gtk-2.0/assets/combo-entry.png
index c2e0f74..d7c033e 100644
Binary files a/common/gtk-2.0/assets/combo-entry.png and b/common/gtk-2.0/assets/combo-entry.png differ
diff --git a/common/gtk-2.0/assets/entry-border-active-bg-solid.png b/common/gtk-2.0/assets/entry-border-active-bg-solid.png
index d6127a1..8e53276 100644
Binary files a/common/gtk-2.0/assets/entry-border-active-bg-solid.png and b/common/gtk-2.0/assets/entry-border-active-bg-solid.png differ
diff --git a/common/gtk-2.0/assets/entry-border-active-bg.png b/common/gtk-2.0/assets/entry-border-active-bg.png
index 1828058..ec36c2d 100644
Binary files a/common/gtk-2.0/assets/entry-border-active-bg.png and b/common/gtk-2.0/assets/entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets/entry-border-bg-solid.png b/common/gtk-2.0/assets/entry-border-bg-solid.png
index 6b49cce..49d349a 100644
Binary files a/common/gtk-2.0/assets/entry-border-bg-solid.png and b/common/gtk-2.0/assets/entry-border-bg-solid.png differ
diff --git a/common/gtk-2.0/assets/entry-border-bg.png b/common/gtk-2.0/assets/entry-border-bg.png
index 3d9a897..8c48843 100644
Binary files a/common/gtk-2.0/assets/entry-border-bg.png and b/common/gtk-2.0/assets/entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets/entry-border-disabled-bg.png b/common/gtk-2.0/assets/entry-border-disabled-bg.png
index 42c1552..354eaad 100644
Binary files a/common/gtk-2.0/assets/entry-border-disabled-bg.png and b/common/gtk-2.0/assets/entry-border-disabled-bg.png differ
diff --git a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png
index d390ded..567833f 100644
Binary files a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png and b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets/notebook-entry-border-bg.png b/common/gtk-2.0/assets/notebook-entry-border-bg.png
index 8767bc6..e8fbaff 100644
Binary files a/common/gtk-2.0/assets/notebook-entry-border-bg.png and b/common/gtk-2.0/assets/notebook-entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png
index 5733e91..b86093d 100644
Binary files a/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png and b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png differ
diff --git a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png
index c978290..427548a 100644
Binary files a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png and b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/assets/toolbar-entry-border-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-bg.png
index 1bef4f5..320deb9 100644
Binary files a/common/gtk-2.0/assets/toolbar-entry-border-bg.png and b/common/gtk-2.0/assets/toolbar-entry-border-bg.png differ
diff --git a/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png
index d5dea4a..512d5bd 100644
Binary files a/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png and b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
index f8ce4d8..f5d30f3 100644
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png
index c978290..427548a 100644
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png
index 3849377..716060a 100644
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
index 1bef4f5..320deb9 100644
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
index 227548c..707df1c 100644
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png differ
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png
index d5dea4a..512d5bd 100644
Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png differ
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index eb0bf39..33af2ea 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #D3DAE3;
   border-color: #2d3036;
   background-color: #383c45;
   background-image: linear-gradient(to bottom, #383c45); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2813,15 +2816,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3033,7 +3036,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 6527a56..907ac95 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2814,15 +2817,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3034,7 +3037,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 178b3af..17ad721 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #D3DAE3;
   border-color: #2d3036;
   background-color: #383c45;
   background-image: linear-gradient(to bottom, #383c45); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2813,15 +2816,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3033,7 +3036,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: #181b1f;
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9));
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index 5ce2657..e257d0d 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2814,15 +2817,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3034,7 +3037,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: #181b1f;
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9));
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index a804228..544f5b7 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2813,15 +2816,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3033,7 +3036,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 89e41ca..44ad237 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -141,14 +141,14 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkFlowBox .grid-child {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkFlowBox .grid-child {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkFlowBox .grid-child {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2813,15 +2816,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3033,7 +3036,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss
index 4889325..cbf5da2 100644
--- a/common/gtk-3.0/3.14/sass/_applications.scss
+++ b/common/gtk-3.0/3.14/sass/_applications.scss
@@ -243,15 +243,15 @@ GbSearchBox.linked {
   > GtkMenuButton.button:last-child:dir(ltr) {
 
     border-left-style: none;
-    border-radius: 0 14.5px 14.5px 0;
-    outline-radius: 0 12.5px 12.5px 0;
+    border-radius: 0 3px 3px 0;
+    outline-radius: 0 1px 1px 0;
 
     &:hover { box-shadow: -1px 0 $selected_bg_color; }
   }
   > GtkMenuButton.button:first-child:dir(rtl) {
     border-right-style: none;
-    border-radius: 14.5px 0 0 14.5px;
-    outline-radius: 12.5px 0 0 12.5px;
+    border-radius: 3px 0 0 3px;
+    outline-radius: 1px 0 0 1px;
 
     &:hover { box-shadow: 1px 0 $selected_bg_color; }
   }
@@ -537,7 +537,7 @@ MarlinViewWindow *:selected:focus {
 }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   @include entry(header-normal);
 
   &:focus { @include entry(header-focus) }
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index d9e56c9..d7ca6fe 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -213,11 +213,11 @@ GtkFlowBox .grid-child {
   border: 1px solid;
   padding: 5px 8px 6px;
 
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms $ease-out-quad;
   @include entry(normal);
 
-  .header-bar & { padding: 6px 11px; }
+  .header-bar & { padding: 6px; }
 
   //&.image { // icons inside the entry
   //  &.left { padding-left: 0; }
@@ -357,6 +357,8 @@ GtkFlowBox .grid-child {
   }
 }
 
+GtkSearchEntry.entry { border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss
index c073126..2cb08e1 100644
--- a/common/gtk-3.0/3.14/sass/_drawing.scss
+++ b/common/gtk-3.0/3.14/sass/_drawing.scss
@@ -168,9 +168,9 @@
   //
   // insensitive pushed button
   //
-    color: transparentize($selected_fg_color, 0.45);
-    border-color: transparentize($selected_bg_color, 0.45);
-    background-color: transparentize($selected_bg_color, 0.45);
+    color: transparentize($selected_fg_color, 0.2);
+    border-color: transparentize($selected_bg_color, 0.25);
+    background-color: transparentize($selected_bg_color, 0.25);
 
     opacity: 0.6;
 
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 4819a39..5198944 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -141,14 +141,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #D3DAE3;
   border-color: #2d3036;
   background-color: #383c45;
   background-image: linear-gradient(to bottom, #383c45); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 84a241a..bf9231f 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -141,14 +141,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2780,15 +2783,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3000,7 +3003,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 7a4ae0c..8a16555 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -141,14 +141,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #D3DAE3;
   border-color: #2d3036;
   background-color: #383c45;
   background-image: linear-gradient(to bottom, #383c45); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: #181b1f;
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9));
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index f0578bb..9691287 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -141,14 +141,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2780,15 +2783,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -3000,7 +3003,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: #181b1f;
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9));
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 75064e1..3ec8a8c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -141,14 +141,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 4cea811..d960ac8 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -141,14 +141,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -257,6 +257,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -316,9 +319,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -544,9 +547,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
 
 GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
   border-left-style: none;
-  border-radius: 0 14.5px 14.5px 0;
-  outline-radius: 0 12.5px 12.5px 0; }
+  border-radius: 0 3px 3px 0;
+  outline-radius: 0 1px 1px 0; }
   GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
     box-shadow: -1px 0 #5294E2; }
 
 GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
   border-right-style: none;
-  border-radius: 14.5px 0 0 14.5px;
-  outline-radius: 12.5px 0 0 12.5px; }
+  border-radius: 3px 0 0 3px;
+  outline-radius: 1px 0 0 1px; }
   GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
     box-shadow: 1px 0 #5294E2; }
 
@@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss
index 6e1301c..63eda9c 100644
--- a/common/gtk-3.0/3.16/sass/_applications.scss
+++ b/common/gtk-3.0/3.16/sass/_applications.scss
@@ -291,15 +291,15 @@ GbSearchBox.linked {
   > GtkMenuButton.button:last-child:dir(ltr) {
 
     border-left-style: none;
-    border-radius: 0 14.5px 14.5px 0;
-    outline-radius: 0 12.5px 12.5px 0;
+    border-radius: 0 3px 3px 0;
+    outline-radius: 0 1px 1px 0;
 
     &:hover { box-shadow: -1px 0 $selected_bg_color; }
   }
   > GtkMenuButton.button:first-child:dir(rtl) {
     border-right-style: none;
-    border-radius: 14.5px 0 0 14.5px;
-    outline-radius: 12.5px 0 0 12.5px;
+    border-radius: 3px 0 0 3px;
+    outline-radius: 1px 0 0 1px;
 
     &:hover { box-shadow: 1px 0 $selected_bg_color; }
   }
@@ -585,7 +585,7 @@ MarlinViewWindow *:selected:focus {
 }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   @include entry(header-normal);
 
   &:focus { @include entry(header-focus) }
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index 68d56d8..7049206 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -213,11 +213,11 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   border: 1px solid;
   padding: 5px 8px 6px;
 
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms $ease-out-quad;
   @include entry(normal);
 
-  .header-bar & { padding: 6px 11px; }
+  .header-bar & { padding: 6px; }
 
   //&.image { // icons inside the entry
   //  &.left { padding-left: 0; }
@@ -357,6 +357,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   }
 }
 
+GtkSearchEntry.entry { border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss
index c073126..2cb08e1 100644
--- a/common/gtk-3.0/3.16/sass/_drawing.scss
+++ b/common/gtk-3.0/3.16/sass/_drawing.scss
@@ -168,9 +168,9 @@
   //
   // insensitive pushed button
   //
-    color: transparentize($selected_fg_color, 0.45);
-    border-color: transparentize($selected_bg_color, 0.45);
-    background-color: transparentize($selected_bg_color, 0.45);
+    color: transparentize($selected_fg_color, 0.2);
+    border-color: transparentize($selected_bg_color, 0.25);
+    background-color: transparentize($selected_bg_color, 0.25);
 
     opacity: 0.6;
 
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index 25a7051..808a3f4 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -148,14 +148,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #D3DAE3;
   border-color: #2d3036;
   background-color: #383c45;
   background-image: linear-gradient(to bottom, #383c45); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -264,6 +264,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -323,9 +326,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -551,9 +554,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -3610,7 +3613,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 0c37ccb..d78b205 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -148,14 +148,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -264,6 +264,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -323,9 +326,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -551,9 +554,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -3611,7 +3614,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(24, 27, 31, 0.97);
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87));
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index a3a4791..c54fa10 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -148,14 +148,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #D3DAE3;
   border-color: #2d3036;
   background-color: #383c45;
   background-image: linear-gradient(to bottom, #383c45); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -264,6 +264,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -323,9 +326,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -551,9 +554,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -3610,7 +3613,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: #181b1f;
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9));
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 43e7b64..a4bf7f7 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -148,14 +148,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -264,6 +264,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -323,9 +326,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -551,9 +554,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -3611,7 +3614,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(207, 218, 231, 0.8);
   border-color: #181b1f;
   background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9));
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 3f2f5ed..b22780a 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -148,14 +148,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -264,6 +264,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -323,9 +326,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -551,9 +554,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -3610,7 +3613,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 74926c1..b48451a 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -148,14 +148,14 @@ GtkTextView {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   border-color: #cfd6e6;
   background-color: #ffffff;
   background-image: linear-gradient(to bottom, #ffffff); }
   .header-bar .entry {
-    padding: 6px 11px; }
+    padding: 6px; }
   .entry.image {
     padding-left: 3px;
     padding-right: 3px; }
@@ -264,6 +264,9 @@ GtkTextView {
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
+GtkSearchEntry.entry {
+  border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
@@ -323,9 +326,9 @@ GtkTextView {
     .button:insensitive > GtkLabel {
       color: inherit; }
     .button:insensitive:active, .button:insensitive:checked {
-      color: rgba(255, 255, 255, 0.55);
-      border-color: rgba(82, 148, 226, 0.55);
-      background-color: rgba(82, 148, 226, 0.55);
+      color: rgba(255, 255, 255, 0.8);
+      border-color: rgba(82, 148, 226, 0.75);
+      background-color: rgba(82, 148, 226, 0.75);
       opacity: 0.6; }
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
@@ -551,9 +554,9 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:insensitive:active,
   .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: rgba(255, 255, 255, 0.55);
-    border-color: rgba(82, 148, 226, 0.55);
-    background-color: rgba(82, 148, 226, 0.55);
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(82, 148, 226, 0.75);
+    background-color: rgba(82, 148, 226, 0.75);
     opacity: 0.6; }
     .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel,
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
@@ -3610,7 +3613,7 @@ MarlinViewWindow *:selected:focus {
   outline-color: transparent; }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index b1ef201..cd3d82c 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -614,7 +614,7 @@ MarlinViewWindow *:selected:focus {
 }
 
 .marlin-pathbar.pathbar {
-  border-radius: 14.5px;
+  border-radius: 3px;
   @include entry(header-normal);
 
   &:focus { @include entry(header-focus) }
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 4b1c0c7..eae5de1 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -213,11 +213,11 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   border: 1px solid;
   padding: 5px 8px 6px;
 
-  border-radius: 15px;
+  border-radius: 3px;
   transition: all 200ms $ease-out-quad;
   @include entry(normal);
 
-  .header-bar & { padding: 6px 11px; }
+  .header-bar & { padding: 6px; }
 
   //&.image { // icons inside the entry
   //  &.left { padding-left: 0; }
@@ -357,6 +357,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   }
 }
 
+GtkSearchEntry.entry { border-radius: 20px; }
+
 /***********
  * Buttons *
  ***********/
diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss
index c073126..2cb08e1 100644
--- a/common/gtk-3.0/3.18/sass/_drawing.scss
+++ b/common/gtk-3.0/3.18/sass/_drawing.scss
@@ -168,9 +168,9 @@
   //
   // insensitive pushed button
   //
-    color: transparentize($selected_fg_color, 0.45);
-    border-color: transparentize($selected_bg_color, 0.45);
-    background-color: transparentize($selected_bg_color, 0.45);
+    color: transparentize($selected_fg_color, 0.2);
+    border-color: transparentize($selected_bg_color, 0.25);
+    background-color: transparentize($selected_bg_color, 0.25);
 
     opacity: 0.6;
 
diff --git a/common/xfce-notify-4.0/gtkrc b/common/xfce-notify-4.0/gtkrc
index 05ed853..2ef8877 100644
--- a/common/xfce-notify-4.0/gtkrc
+++ b/common/xfce-notify-4.0/gtkrc
@@ -12,11 +12,11 @@ style "notify-window" {
 style "notify-button" {
   bg[NORMAL] = "#434652"
   bg[PRELIGHT] = "#5C6070"
-  bg[ACTIVE] = @selected_bg_color
+  bg[ACTIVE] = "#5294E2"
 
   fg[NORMAL] = "#BAC3CF"
   fg[PRELIGHT] = "#BAC3CF"
-  fg[ACTIVE] = @selected_fg_color
+  fg[ACTIVE] = "#ffffff"
 
   engine "murrine" {
     gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
@@ -27,7 +27,7 @@ style "notify-button" {
 }
 
 style "notify-text" {
-  GtkWidget::link-color = @link_color
+  GtkWidget::link-color = "#5294E2"
 
   fg[NORMAL] = "#BAC3CF"
   fg[PRELIGHT] = "#BAC3CF"
@@ -49,9 +49,9 @@ style "notify-progressbar" {
   ythickness   = 0
 
   fg[PRELIGHT] = "#000000"
-  bg[NORMAL]   = @selected_bg_color
+  bg[NORMAL]   = "#5294E2"
   bg[ACTIVE] = "#131417"
-  bg[SELECTED] = @selected_bg_color
+  bg[SELECTED] = "#5294E2"
 
   engine "murrine" {
     gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
diff --git a/configure.ac b/configure.ac
index 55abb32..5bfec79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(
     [arc-theme],
-    [20150817],
+    [20150826],
     [https://github.com/horst3180/Arc-theme/issues],
     [arc-theme],
     [https://github.com/horst3180/Arc-theme],
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 706c601..a21d248 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -1,5 +1,2 @@
-dist-hook:
-	cp -r \
-		Chrome \
-		Arc-Plank \
-		$(distdir)
+EXTRA_DIST = $(srcdir)/Chrome \
+	     $(srcdir)/Arc-Plank