diff --git a/src/stylesheets/default.css b/src/stylesheets/default.css
index 10eac4a..93c7971 100644
--- a/src/stylesheets/default.css
+++ b/src/stylesheets/default.css
@@ -115,55 +115,55 @@ ads--CDockWidgetSideTab {
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="0"] {
+	border-top: 3px solid grey;
 	border-right: 1px solid white;
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="1"] {
+	border-left: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="2"] {
+	border-right: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="3"] {
+	border-bottom: 3px solid grey;
 	border-right: 1px solid white;
 }
 
 ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
-
+	border-top: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
-
+	border-left: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
-
+	border-right: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
-
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"][activeTab="true"] {
-
+	border-bottom: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
-
+	border-top: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
-
+	border-left: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
-
+	border-right: 3px solid palette(highlight);
 }
 
 ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
-
+	border-bottom: 3px solid palette(highlight);
 }
 
 /*
diff --git a/src/stylesheets/default_linux.css b/src/stylesheets/default_linux.css
index e92531e..19dfd4c 100644
--- a/src/stylesheets/default_linux.css
+++ b/src/stylesheets/default_linux.css
@@ -43,7 +43,10 @@ ads--CDockWidgetTab[activeTab="true"] QLabel {
 	color: palette(foreground);
 }
 
-/* Side tab styling */
+/*-----------------------------------------------------------------------------
+ * Styling of auto hide functionality
+ *----------------------------------------------------------------------------
+ */
 ads--CDockWidgetSideTab {
 	background: palette(window);
 	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
@@ -54,17 +57,17 @@ ads--CDockWidgetSideTab[sideTabBarArea="0"] {
 	border-right: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="1"],[sideTabBarArea="2"] {
+ads--CDockWidgetSideTab[sideTabBarArea="1"] {
 	border-left: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="3"],[sideTabBarArea="4"] {
+ads--CDockWidgetSideTab[sideTabBarArea="2"] {
 	border-right: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="5"] {
+ads--CDockWidgetSideTab[sideTabBarArea="3"] {
 	border-bottom: 3px solid grey;
 	border-right: 1px solid white;
 }
@@ -73,38 +76,33 @@ ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
 	border-top: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"],:hover[sideTabBarArea="2"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
 	border-left: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"],:hover[sideTabBarArea="4"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
 	border-right: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="5"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
 	border-bottom: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"][activeTab="true"] {
-	border-top: 3px solid palette(highlight);
-}
-
 ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
 	border-top: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"],[sideTabBarArea="2"][activeTab="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
 	border-left: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"],[sideTabBarArea="4"][focused="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
 	border-right: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="5"][activeTab="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
 	border-bottom: 3px solid palette(highlight);
 }
-/* Side tab styling */
 
 ads--CDockWidget {
 	background: palette(light);
diff --git a/src/stylesheets/focus_highlighting.css b/src/stylesheets/focus_highlighting.css
index 84df17e..cb15762 100644
--- a/src/stylesheets/focus_highlighting.css
+++ b/src/stylesheets/focus_highlighting.css
@@ -36,7 +36,10 @@ ads--CDockWidgetTab[activeTab="true"] QLabel {
 	color: palette(foreground);
 }
 
-/* Side tab styling */
+/*-----------------------------------------------------------------------------
+ * Styling of auto hide functionality
+ *----------------------------------------------------------------------------
+ */
 ads--CDockWidgetSideTab {
 	background: palette(window);
 	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
@@ -47,17 +50,17 @@ ads--CDockWidgetSideTab[sideTabBarArea="0"] {
 	border-right: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="1"],[sideTabBarArea="2"] {
+ads--CDockWidgetSideTab[sideTabBarArea="1"] {
 	border-left: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="3"],[sideTabBarArea="4"] {
+ads--CDockWidgetSideTab[sideTabBarArea="2"] {
 	border-right: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="5"] {
+ads--CDockWidgetSideTab[sideTabBarArea="3"] {
 	border-bottom: 3px solid grey;
 	border-right: 1px solid white;
 }
@@ -66,38 +69,33 @@ ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
 	border-top: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"],:hover[sideTabBarArea="2"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
 	border-left: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"],:hover[sideTabBarArea="4"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
 	border-right: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="5"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
 	border-bottom: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"][activeTab="true"] {
-	border-top: 3px solid palette(highlight);
-}
-
 ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
 	border-top: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"],[sideTabBarArea="2"][activeTab="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
 	border-left: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"],[sideTabBarArea="4"][focused="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
 	border-right: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="5"][activeTab="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
 	border-bottom: 3px solid palette(highlight);
 }
-/* Side tab styling */
 
 ads--CDockWidget {
 	background: palette(light);
diff --git a/src/stylesheets/focus_highlighting_linux.css b/src/stylesheets/focus_highlighting_linux.css
index 140d6d7..5c9e2d9 100644
--- a/src/stylesheets/focus_highlighting_linux.css
+++ b/src/stylesheets/focus_highlighting_linux.css
@@ -44,7 +44,10 @@ ads--CDockWidgetTab[activeTab="true"] QLabel {
         color: palette(foreground);
 }
 
-/* Side tab styling */
+/*-----------------------------------------------------------------------------
+ * Styling of auto hide functionality
+ *----------------------------------------------------------------------------
+ */
 ads--CDockWidgetSideTab {
 	background: palette(window);
 	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
@@ -55,17 +58,17 @@ ads--CDockWidgetSideTab[sideTabBarArea="0"] {
 	border-right: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="1"],[sideTabBarArea="2"] {
+ads--CDockWidgetSideTab[sideTabBarArea="1"] {
 	border-left: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="3"],[sideTabBarArea="4"] {
+ads--CDockWidgetSideTab[sideTabBarArea="2"] {
 	border-right: 3px solid grey;
 	border-bottom: 1px solid white;
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="5"] {
+ads--CDockWidgetSideTab[sideTabBarArea="3"] {
 	border-bottom: 3px solid grey;
 	border-right: 1px solid white;
 }
@@ -74,38 +77,33 @@ ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
 	border-top: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"],:hover[sideTabBarArea="2"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
 	border-left: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"],:hover[sideTabBarArea="4"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
 	border-right: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="5"] {
+ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
 	border-bottom: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"][activeTab="true"] {
-	border-top: 3px solid palette(highlight);
-}
-
 ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
 	border-top: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"],[sideTabBarArea="2"][activeTab="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
 	border-left: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"],[sideTabBarArea="4"][focused="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
 	border-right: 3px solid palette(highlight);
 }
 
-ads--CDockWidgetSideTab[sideTabBarArea="5"][activeTab="true"] {
+ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
 	border-bottom: 3px solid palette(highlight);
 }
-/* Side tab styling */
 
 ads--CDockWidget {
         background: palette(light);