diff --git a/Changelog.txt b/Changelog.txt
index 7b91caf..07116b9 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -105,3 +105,5 @@ v0.9 (all themes; not Legacy) : New scrollbars, fixes to text color to the dark
 v0.9.1 (all themes; not Legacy) : Entry borders and active buttons get thicker for toolbars, color corrections, 528 new icons to the icon pack, corrections to the metacity themes.
 
 v0.9.2 (all themes; not Legacy) : Return to slimmer entry borders, new assets and switches for better look, remastered cinnamon themes, FULL compatibility with GNOME 3.18.
+
+v0.9.3 (all themes; Legacy support terminated) : Fixes to the gnome-shell theme as well as to the dark variant for better visibility of pressed buttons on the toolbar.
diff --git a/Windows 10 Dark/extra-icons/Cortana.png b/Windows 10 Dark/extra-icons/Cortana.png
index ae9170d..7a9d6c4 100644
Binary files a/Windows 10 Dark/extra-icons/Cortana.png and b/Windows 10 Dark/extra-icons/Cortana.png differ
diff --git a/Windows 10 Dark/gnome-shell/gnome-shell.css b/Windows 10 Dark/gnome-shell/gnome-shell.css
index f6c3a1c..6ddaa72 100644
--- a/Windows 10 Dark/gnome-shell/gnome-shell.css	
+++ b/Windows 10 Dark/gnome-shell/gnome-shell.css	
@@ -76,10 +76,10 @@ StEntry {
 	background-gradient-direction: none;
 	border-color: rgba(0,0,0,0);
 	box-shadow: none;
-	selection-background-color:#3c90b5;
+	selection-background-color:#026ec4;
 	selected-color: white; }
 	StEntry:focus {
-		background-color: #3c90b5;
+		background-color: #026ec4;
 		color: white;
 		box-shadow: none;
 		border-color: rgba(0,0,0,0); }
@@ -419,12 +419,12 @@ StScrollBar {
 			background-color: rgba(0,0,0,1);
 			color: white }
 		.popup-menu .popup-menu-item:active {
-			background-color: #3c90b5;
+			background-color: #026ec4;
 			color: white; }
 		.popup-menu .popup-menu-item:insensitive {
 			color: rgba(255,255,255,0.2); }
 	.popup-menu .active {
-		background-color:#3c90b5; }
+		background-color:#026ec4; }
 	.popup-menu .popup-inactive-menu-item {
 		color: white; }
 		.popup-menu .popup-inactive-menu-item:insensitive {
@@ -487,7 +487,7 @@ StScrollBar {
 		background-color: rgba(0, 0, 0, 1);
 		color: white; }
 
-/* App Switcher */
+/* App Switcher (alt-tab) */
 .switcher-popup {
 	padding: 8px;
 	spacing: 16px; }
@@ -504,7 +504,7 @@ StScrollBar {
 	border: 0 solid rgba(0,0,0,0.7); }
 
 .switcher-list .item-box:selected {
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	color: white; }
 
 .switcher-list .thumbnail-box {
@@ -544,7 +544,7 @@ StScrollBar {
 
 .ws-switcher-active-up, .ws-switcher-active-down {
 	height: 50px;
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	color: white;
 	background-size: 32px;
 	border-radius: 0px; }
@@ -555,21 +555,22 @@ StScrollBar {
 	background-color: rgba(0, 0, 0, 0.85);
 	border-radius: 0px; }
 
+/* Alt-tab shadow color*/
 .osd-window,
 .resize-popup,
 .switcher-list, .workspace-switcher-container {
 	color: white;
-	background-color: black;
+	background-color: rgba(0,0,0,0.8);
 	border: none;
 	border-radius: 0px;
 	padding: 12px;
-	box-shadow: 0 5px 10px 0 white;
+	box-shadow: 0 5px 10px 0 transparent;
 	border: none; }
 
 /* Tiled window previews */
 .tile-preview {
 	background-color: rgba(40, 40, 40, 0.5);
-	border: 1px solid #3c90b5; }
+	border: 1px solid #026ec4; }
 
 .tile-preview-left.on-primary {
 	border-radius: 0 0 0 0; }
@@ -599,7 +600,7 @@ StScrollBar {
 		-panel-corner-border-width: 2px;
 		-panel-corner-border-color: transparent; }
 		#panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
-			-panel-corner-border-color:#3c90b5; }
+			-panel-corner-border-color:#026ec4; }
 		#panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
 			-panel-corner-radius: 0;
 			-panel-corner-background-color: transparent;
@@ -705,7 +706,7 @@ StScrollBar {
 	box-shadow: none;
 	border: none;
 	color: white;
-	background-color:#3c90b5; }
+	background-color:#026ec4; }
 
 .datemenu-today-button .date-label {
 	font-size: 1.5em; }
@@ -757,7 +758,7 @@ StScrollBar {
 		background-color: rgba(0,0,0,0.85); }
 	.calendar-day-base:active {
 		color: white;
-		background-color:#3c90b5;
+		background-color:#026ec4;
 		border-color: transparent; }
 	.calendar-day-base.calendar-day-heading {
 		color: rgba(255,255,255,0.8);
@@ -892,7 +893,7 @@ StScrollBar {
 }
 .system-menu-action:hover, .system-menu-action:focus {
 	color: white;
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	border: none;
 	padding: 14px;
 }
@@ -977,7 +978,7 @@ StScrollBar {
 	spacing: 20px; }
 
 .nm-dialog-item:selected {
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	color: white; }
 
 .nm-dialog-icons {
@@ -1021,7 +1022,7 @@ StScrollBar {
 	padding: 4px 12px;
 	-shell-caption-spacing: 12px; }
 .window-caption:hover {
-	background-color: #3c90b5;
+	background-color: #026ec4;
 	color: white;
 	box-shadow: 0 2px 5px 0 rgba(0,0,0,0.5);
 }
@@ -1144,7 +1145,7 @@ StScrollBar {
 	border-radius: 0;
 	padding: 4px 12px;
 	color: white;
-	background-color: rgba(39, 47, 50, 0.7);
+	background-color: rgba(0,0,0,0.9);
 	text-align: center;
 	-x-offset: 8px;
 }
@@ -1201,12 +1202,12 @@ StScrollBar {
 .search-provider-icon:active, .search-provider-icon:checked,
 .list-search-result:active,
 .list-search-result:checked {
-	background-color: rgba(255, 255, 255, 0.9); }
+	background-color: rgba(2,110,196,0.95); }
 .search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover,
 .list-search-result:focus,
 .list-search-result:selected,
 .list-search-result:hover {
-	background-color: rgba(255, 255, 255, 0.75);
+	background-color: rgba(2,110,196,0.95);
 	background-gradient-direction: none;
 	transition-duration: 200ms;
 }
@@ -1220,7 +1221,8 @@ StScrollBar {
 .show-apps:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-	background: white;
+/* activities bottom-button selected-bg-color*/
+	background: rgba(2,110,196,0.9);
 	border: 0;
 	box-shadow: inset 0 -2px 0 black;
 	border-radius: 0;
@@ -1247,17 +1249,17 @@ StScrollBar {
 /* Running App */
 .app-well-app.running > .overview-icon {
 	border-radius: 0;
-	color:white;
+	color:black;
 	box-shadow: inset 0 -2px 0 0#3c93b8;
 	background-image: none;
 	background-gradient-direction: none;
 }
-
+/* Active App underline */
 .app-well-app-running-dot {
-	width: 15px;
+	width: 40px;
 	height: 3px;
-	background-color: white;
-	margin-bottom: 4px;
+	background-color: rgba(53,156,196,0.95);
+	margin-bottom: 2px;
 }
 
 .search-provider-icon,
@@ -1266,7 +1268,7 @@ StScrollBar {
 .show-apps .overview-icon,
 .grid-search-result .overview-icon {
 	color: white;
-	border-radius: 4px;
+	border-radius: 0;
 	padding: 6px;
 	border: 1px solid transparent;
 	transition-duration: 100ms;
@@ -1964,7 +1966,7 @@ StScrollBar {
 			text-shadow: none; }
 		#LookingGlassDialog .notebook-tab:selected {
 			border-bottom-width: 2px;
-			border-color:#3c90b5;
+			border-color:#026ec4;
 			color: white;
 			text-shadow: none; }
 	#LookingGlassDialog StBoxLayout#EvalBox {
@@ -1974,7 +1976,7 @@ StScrollBar {
 		spacing: 4px; }
 
 .lg-dialog StEntry {
-	selection-background-color: #3c90b5;
+	selection-background-color: #026ec4;
 	selected-color: white; }
 .lg-dialog .shell-link {
 	color: #2d73b5; }
@@ -2070,10 +2072,10 @@ StScrollBar {
 
 /* Menus */
 .popup-submenu-menu-item:open {
-	background-color: #3c90b5;}
+	background-color: #026ec4;}
 
 .popup-menu-item:active {
-	background-color: #3c90b5;}
+	background-color: #026ec4;}
 
 .popup-menu-item:insensitive {
 	color: #4c4c4c;}
diff --git a/Windows 10 Dark/gtk-3.0/gtk-widgets.css b/Windows 10 Dark/gtk-3.0/gtk-widgets.css
index cc21032..be25dd9 100644
--- a/Windows 10 Dark/gtk-3.0/gtk-widgets.css	
+++ b/Windows 10 Dark/gtk-3.0/gtk-widgets.css	
@@ -2294,7 +2294,7 @@ GtkColorButton.button {
 .primary-toolbar.toolbar {
     -GtkWidget-window-dragging: true;
 
-    padding: 4px;
+    padding: 14px;
     border-width: 0;
     border-style: solid;
     border-color: shade(@toolbar_bg_color, 0.8);
@@ -2334,7 +2334,7 @@ GtkColorButton.button {
 .primary-toolbar .button:active,
 .toolbar .button:active {
     border-color: transparent;
-    background-color: shade(@toolbar_bg_color, 0.95);
+    background-color: shade(@toolbar_bg_color, 1.6);
     background-image: none;
 }
 
diff --git a/Windows 10 Light/gnome-shell/gnome-shell.css b/Windows 10 Light/gnome-shell/gnome-shell.css
index f6c3a1c..6ddaa72 100644
--- a/Windows 10 Light/gnome-shell/gnome-shell.css	
+++ b/Windows 10 Light/gnome-shell/gnome-shell.css	
@@ -76,10 +76,10 @@ StEntry {
 	background-gradient-direction: none;
 	border-color: rgba(0,0,0,0);
 	box-shadow: none;
-	selection-background-color:#3c90b5;
+	selection-background-color:#026ec4;
 	selected-color: white; }
 	StEntry:focus {
-		background-color: #3c90b5;
+		background-color: #026ec4;
 		color: white;
 		box-shadow: none;
 		border-color: rgba(0,0,0,0); }
@@ -419,12 +419,12 @@ StScrollBar {
 			background-color: rgba(0,0,0,1);
 			color: white }
 		.popup-menu .popup-menu-item:active {
-			background-color: #3c90b5;
+			background-color: #026ec4;
 			color: white; }
 		.popup-menu .popup-menu-item:insensitive {
 			color: rgba(255,255,255,0.2); }
 	.popup-menu .active {
-		background-color:#3c90b5; }
+		background-color:#026ec4; }
 	.popup-menu .popup-inactive-menu-item {
 		color: white; }
 		.popup-menu .popup-inactive-menu-item:insensitive {
@@ -487,7 +487,7 @@ StScrollBar {
 		background-color: rgba(0, 0, 0, 1);
 		color: white; }
 
-/* App Switcher */
+/* App Switcher (alt-tab) */
 .switcher-popup {
 	padding: 8px;
 	spacing: 16px; }
@@ -504,7 +504,7 @@ StScrollBar {
 	border: 0 solid rgba(0,0,0,0.7); }
 
 .switcher-list .item-box:selected {
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	color: white; }
 
 .switcher-list .thumbnail-box {
@@ -544,7 +544,7 @@ StScrollBar {
 
 .ws-switcher-active-up, .ws-switcher-active-down {
 	height: 50px;
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	color: white;
 	background-size: 32px;
 	border-radius: 0px; }
@@ -555,21 +555,22 @@ StScrollBar {
 	background-color: rgba(0, 0, 0, 0.85);
 	border-radius: 0px; }
 
+/* Alt-tab shadow color*/
 .osd-window,
 .resize-popup,
 .switcher-list, .workspace-switcher-container {
 	color: white;
-	background-color: black;
+	background-color: rgba(0,0,0,0.8);
 	border: none;
 	border-radius: 0px;
 	padding: 12px;
-	box-shadow: 0 5px 10px 0 white;
+	box-shadow: 0 5px 10px 0 transparent;
 	border: none; }
 
 /* Tiled window previews */
 .tile-preview {
 	background-color: rgba(40, 40, 40, 0.5);
-	border: 1px solid #3c90b5; }
+	border: 1px solid #026ec4; }
 
 .tile-preview-left.on-primary {
 	border-radius: 0 0 0 0; }
@@ -599,7 +600,7 @@ StScrollBar {
 		-panel-corner-border-width: 2px;
 		-panel-corner-border-color: transparent; }
 		#panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
-			-panel-corner-border-color:#3c90b5; }
+			-panel-corner-border-color:#026ec4; }
 		#panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
 			-panel-corner-radius: 0;
 			-panel-corner-background-color: transparent;
@@ -705,7 +706,7 @@ StScrollBar {
 	box-shadow: none;
 	border: none;
 	color: white;
-	background-color:#3c90b5; }
+	background-color:#026ec4; }
 
 .datemenu-today-button .date-label {
 	font-size: 1.5em; }
@@ -757,7 +758,7 @@ StScrollBar {
 		background-color: rgba(0,0,0,0.85); }
 	.calendar-day-base:active {
 		color: white;
-		background-color:#3c90b5;
+		background-color:#026ec4;
 		border-color: transparent; }
 	.calendar-day-base.calendar-day-heading {
 		color: rgba(255,255,255,0.8);
@@ -892,7 +893,7 @@ StScrollBar {
 }
 .system-menu-action:hover, .system-menu-action:focus {
 	color: white;
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	border: none;
 	padding: 14px;
 }
@@ -977,7 +978,7 @@ StScrollBar {
 	spacing: 20px; }
 
 .nm-dialog-item:selected {
-	background-color:#3c90b5;
+	background-color:#026ec4;
 	color: white; }
 
 .nm-dialog-icons {
@@ -1021,7 +1022,7 @@ StScrollBar {
 	padding: 4px 12px;
 	-shell-caption-spacing: 12px; }
 .window-caption:hover {
-	background-color: #3c90b5;
+	background-color: #026ec4;
 	color: white;
 	box-shadow: 0 2px 5px 0 rgba(0,0,0,0.5);
 }
@@ -1144,7 +1145,7 @@ StScrollBar {
 	border-radius: 0;
 	padding: 4px 12px;
 	color: white;
-	background-color: rgba(39, 47, 50, 0.7);
+	background-color: rgba(0,0,0,0.9);
 	text-align: center;
 	-x-offset: 8px;
 }
@@ -1201,12 +1202,12 @@ StScrollBar {
 .search-provider-icon:active, .search-provider-icon:checked,
 .list-search-result:active,
 .list-search-result:checked {
-	background-color: rgba(255, 255, 255, 0.9); }
+	background-color: rgba(2,110,196,0.95); }
 .search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover,
 .list-search-result:focus,
 .list-search-result:selected,
 .list-search-result:hover {
-	background-color: rgba(255, 255, 255, 0.75);
+	background-color: rgba(2,110,196,0.95);
 	background-gradient-direction: none;
 	transition-duration: 200ms;
 }
@@ -1220,7 +1221,8 @@ StScrollBar {
 .show-apps:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-	background: white;
+/* activities bottom-button selected-bg-color*/
+	background: rgba(2,110,196,0.9);
 	border: 0;
 	box-shadow: inset 0 -2px 0 black;
 	border-radius: 0;
@@ -1247,17 +1249,17 @@ StScrollBar {
 /* Running App */
 .app-well-app.running > .overview-icon {
 	border-radius: 0;
-	color:white;
+	color:black;
 	box-shadow: inset 0 -2px 0 0#3c93b8;
 	background-image: none;
 	background-gradient-direction: none;
 }
-
+/* Active App underline */
 .app-well-app-running-dot {
-	width: 15px;
+	width: 40px;
 	height: 3px;
-	background-color: white;
-	margin-bottom: 4px;
+	background-color: rgba(53,156,196,0.95);
+	margin-bottom: 2px;
 }
 
 .search-provider-icon,
@@ -1266,7 +1268,7 @@ StScrollBar {
 .show-apps .overview-icon,
 .grid-search-result .overview-icon {
 	color: white;
-	border-radius: 4px;
+	border-radius: 0;
 	padding: 6px;
 	border: 1px solid transparent;
 	transition-duration: 100ms;
@@ -1964,7 +1966,7 @@ StScrollBar {
 			text-shadow: none; }
 		#LookingGlassDialog .notebook-tab:selected {
 			border-bottom-width: 2px;
-			border-color:#3c90b5;
+			border-color:#026ec4;
 			color: white;
 			text-shadow: none; }
 	#LookingGlassDialog StBoxLayout#EvalBox {
@@ -1974,7 +1976,7 @@ StScrollBar {
 		spacing: 4px; }
 
 .lg-dialog StEntry {
-	selection-background-color: #3c90b5;
+	selection-background-color: #026ec4;
 	selected-color: white; }
 .lg-dialog .shell-link {
 	color: #2d73b5; }
@@ -2070,10 +2072,10 @@ StScrollBar {
 
 /* Menus */
 .popup-submenu-menu-item:open {
-	background-color: #3c90b5;}
+	background-color: #026ec4;}
 
 .popup-menu-item:active {
-	background-color: #3c90b5;}
+	background-color: #026ec4;}
 
 .popup-menu-item:insensitive {
 	color: #4c4c4c;}
diff --git a/Windows 10 Light/gtk-3.0/apps/gnome-applications.css b/Windows 10 Light/gtk-3.0/apps/gnome-applications.css
index 38d1395..4d0fe95 100644
--- a/Windows 10 Light/gtk-3.0/apps/gnome-applications.css	
+++ b/Windows 10 Light/gtk-3.0/apps/gnome-applications.css	
@@ -367,10 +367,15 @@ GtkLabel.pin-label {
     text-shadow: 1px 1px @desktop_item_text_shadow;
 }
 
-.nemo-desktop.nemo-canvas-item:selected {
+.nautilus-desktop.nautilus-canvas-item:active {
+    background-color: @desktop_item_selected_fg;
+    background-image: none;
+    color: @theme_fg_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:selected {
     background-color: alpha(@theme_selected_bg_color, 0.8);
     background-image: none;
     color: @theme_selected_fg_color;
-    text-shadow: none;
 }
 
diff --git a/Windows 10 Light/gtk-3.0/gtk-widgets.css b/Windows 10 Light/gtk-3.0/gtk-widgets.css
index 120f940..cc21032 100644
--- a/Windows 10 Light/gtk-3.0/gtk-widgets.css	
+++ b/Windows 10 Light/gtk-3.0/gtk-widgets.css	
@@ -1744,7 +1744,7 @@ GtkSidebarRow .sidebar-label:dir(rtl) {
 
 .sidebar-button.button.image-button {
   padding: 3px;
-  border-radius: 16px;
+  border-radius: 0;
   box-shadow: 0px 0px 0px alpha(@dark_shadow,0)}
 .sidebar-button.button:not(:hover):not(:active) > GtkImage {
   opacity: 0.5; }
diff --git a/Windows 10 Light/gtk-3.0/gtk.css b/Windows 10 Light/gtk-3.0/gtk.css
index 9f7002a..3363866 100644
--- a/Windows 10 Light/gtk-3.0/gtk.css	
+++ b/Windows 10 Light/gtk-3.0/gtk.css	
@@ -30,7 +30,7 @@
 
 /*Nemo Desktop shadow fix*/
  @define-color desktop_item_fg #ffffff;
- @define-color desktop_item_selected_fg @theme_selected_fg_color;
+ @define-color desktop_item_selected_fg shade(@theme_selected_fg_color, 0.8);
  @define-color desktop_item_text_shadow alpha(black, 0.8);
 
 /* shadow effects */