Bug 562006: Remove redundant themes on Parts TabsI20200414-1010

Default: Reorder styles between platforms
Dark: Move duplicated tabs styles into dark_tabstyle

Change-Id: I97cc4a7df6b76b3c4fdb64ed2a0e3f6f083335e4
Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>

12 files changed, 107 insertions, 275 deletions

diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css
index 79fe28d9444..11c5ebcc100 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css
@@ -190,25 +190,6 @@ WebSite {
     color: #dddddd;
 }
 
-CTabFolder {
-    /* Set the styles for the inner tabs: */
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR';
-    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
-    padding: 0px 2px 2px;
-    swt-tab-outline: '#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR'; /* border color for selected tab */
-    swt-outer-keyline-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR'; /* border color for whole tabs container */
-    swt-unselected-tabs-color: '#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START' '#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END' 100% 100%; /* title background for unselected tab */
-    swt-selected-tab-fill: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* title background for selected tab */
-    swt-shadow-visible: false;
-    swt-corner-radius: 16px;
-    swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
-}
-CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
-    /* Set the styles for the bottom inner tabs (Bug 430051): */
-    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
-    swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
-}
-
 Form,
 FormHeading {
     background: #505f70;
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css
index cfc0b30b45e..cb00b1d6bba 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css
@@ -17,10 +17,19 @@
 /* ################################ CSS for .MParts ########################## */
 
 .MPart {
+    font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
     background-color: #323435;
     color: #DDDDDD;
 }
 
+.MPart.busy {
+    font-style: italic;
+}
+
+.MPart.highlighted {
+    font-weight: bold;
+}
+
 .MPart Composite,
 .MPart Composite > *,
 .MPart Composite > * > *,
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css
index b1321091b86..04c81e5f9dc 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css
@@ -14,9 +14,10 @@
  *******************************************************************************/
 
 
-/* ################################ CSS for .MPartStack ########################## */
+/* ################################ CSS for Tabs ########################## */
 
 .MPartStack {
+    font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
     swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
     padding: 0px 2px 2px;
     swt-shadow-visible: false;
@@ -24,4 +25,56 @@
     swt-corner-radius: 16px;
 }
 
+CTabFolder {
+    /* Set the styles for the inner tabs: */
+    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR';
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    padding: 0px 2px 2px;
+    swt-tab-outline: '#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR'; /* border color for selected tab */
+    swt-outer-keyline-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR'; /* border color for whole tabs container */
+    swt-unselected-tabs-color: '#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START' '#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END' 100% 100%; /* title background for unselected tab */
+    swt-selected-tab-fill: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* title background for selected tab */
+    swt-shadow-visible: false;
+    swt-corner-radius: 16px;
+    swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
+}
+
+CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] {
+    /* Set the styles for the bottom inner tabs (Bug 430051): */
+    swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering');
+    swt-unselected-hot-tab-color-background: #161616; /* Bug 465711 */
+}
+
+CTabItem,
+CTabItem CLabel {
+    background-color: '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
+    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_UNSELECTED_TEXT_COLOR';
+}
+
+CTabItem:selected,
+CTabItem:selected CLabel {
+    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR';
+}
+
+.MPartStack.active > CTabItem,
+.MPartStack.active > CTabItem CLabel {
+    background-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
+    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR';
+}
+.MPartStack.active > CTabItem:selected,
+.MPartStack.active > CTabItem:selected CLabel {
+    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR';
+}
+
+.MPartStack.active.noFocus > CTabItem:selected {
+    color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR';
+}
+
+CTabItem.busy {
+    color: #888888;
+}
+
+CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active {
+    swt-shadow-visible: false;
+}
 
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
index 4289e7b7a94..9516310dcf7 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
@@ -27,47 +27,6 @@
 	margin-right: 1px;
 }
 
-.MPartStack, .MPart {
-    font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
-}
-
-
-.MPart.busy {
-    font-style: italic;
-}
-
-.MPart.highlighted {
-    font-weight: bold;
-}
-
-CTabItem,
-CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-CTabItem:selected,
-CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active > CTabItem,
-.MPartStack.active > CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-.MPartStack.active > CTabItem:selected,
-.MPartStack.active > CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active.noFocus > CTabItem:selected {
-    color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR';
-}
-
-CTabItem.busy {
-    color: #888888;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
@@ -76,11 +35,6 @@ CTabItem.busy {
     frame-cuts: 5px 1px 5px 16px;
 }
 
-
-CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active {
-    swt-shadow-visible: false;
-}
-
 CTabFolder Canvas {
     background-color: #2F2F2F;
     color: #CCC;
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
index 11127706334..93716288ccd 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
@@ -33,46 +33,6 @@
 	margin-right: 1px;
 }
 
-.MPartStack, .MPart {
-    font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
-}
-
-.MPart.busy {
-    font-style: italic;
-}
-
-.MPart.highlighted {
-    font-weight: bold;
-}
-
-CTabItem,
-CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-CTabItem:selected,
-CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active > CTabItem,
-.MPartStack.active > CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-.MPartStack.active > CTabItem:selected,
-.MPartStack.active > CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active.noFocus > CTabItem:selected {
-    color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR';
-}
-
-CTabItem.busy {
-    color: #888888;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
@@ -81,15 +41,12 @@ CTabItem.busy {
     frame-cuts: 5px 1px 5px 16px;
 }
 
-CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active {
-    swt-shadow-visible: false;
-}
-
 .MPartStack.active CTabFolder Canvas {
     background-color: #262626;
     color: #CCC;
 }
 
+
 /* #################### Bottom Status Bar ######################## */
 
 StatusLine,
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css b/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
index c8c53e393d2..23899528f99 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
@@ -32,48 +32,6 @@
 	margin-right: 1px;
 }
 
-.MPartStack, .MPart {
-    font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
-}
-
-
-
-.MPart.busy {
-    font-style: italic;
-}
-
-.MPart.highlighted {
-    font-weight: bold;
-}
-
-CTabItem,
-CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-CTabItem:selected,
-CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active > CTabItem,
-.MPartStack.active > CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-.MPartStack.active > CTabItem:selected,
-.MPartStack.active > CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active.noFocus > CTabItem:selected {
-    color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR';
-}
-
-CTabItem.busy {
-    color: #888888;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
@@ -82,12 +40,6 @@ CTabItem.busy {
     frame-cuts: 5px 1px 5px 16px;
 }
 
-
-CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active {
-    swt-shadow-visible: false;
-}
-
-
 CTabFolder Canvas {
     background-color: #2F2F2F;
     color: #CCC;
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
index d73a219903e..e5fef704250 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
@@ -72,47 +72,6 @@ Table {
 	margin-right: 1px;
 }
 
-.MPartStack, .MPart {
-    font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
-}
-
-
-.MPart.busy {
-    font-style: italic;
-}
-
-.MPart.highlighted {
-    font-weight: bold;
-}
-
-CTabItem,
-CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-CTabItem:selected,
-CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active > CTabItem,
-.MPartStack.active > CTabItem CLabel {
-    background-color: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END'; /* HACK for background of CTabFolder inner Toolbars */
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR';
-}
-.MPartStack.active > CTabItem:selected,
-.MPartStack.active > CTabItem:selected CLabel {
-    color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR';
-}
-
-.MPartStack.active.noFocus > CTabItem:selected {
-    color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR';
-}
-
-CTabItem.busy {
-    color: #888888;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
@@ -121,11 +80,6 @@ CTabItem.busy {
     frame-cuts: 5px 1px 5px 16px;
 }
 
-CTabFolder.MArea .MPartStack,CTabFolder.MArea .MPartStack.active {
-    swt-shadow-visible: false;
-}
-
-
 CTabFolder Canvas {
     background-color: #2F2F2F;
     color: #CCC;
diff --git a/bundles/org.eclipse.ui.themes/css/e4_basestyle.css b/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
index 274e403b1ea..756674943de 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
@@ -132,6 +132,11 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR {
 	font-weight: bold;
 }
 
+#org-eclipse-ui-editorss {
+	swt-tab-height: 8px;
+	padding: 0px 5px 7px;
+}
+
 .MPartStack, .MPart {
 	font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT';
 }
@@ -170,6 +175,10 @@ CTabItem:selected {
 	color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR';
 }
 
+CTabFolder.MArea .MPartStack, CTabFolder.MArea .MPartStack.active {
+	swt-shadow-visible: false;
+}
+
 .MToolControl.TrimStack {
 	frame-image:  url(./winXPTSFrame.png);
 	handle-image:  url(./winXPHandle.png);
diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css b/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css
index 03bc4704ef9..0899eb8a464 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css
@@ -77,11 +77,6 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR {
 	background-color: #E2E2E2;
 }
 
-.MPartStack {
-	swt-simple: false;
-	swt-mru-visible: false;
-}
-
 .MTrimBar {
 	background-color: #E2E2E2;
 }
@@ -97,13 +92,9 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR {
 	handle-image-rotated:  url(./gtkHandle-rotated.png);
 }
 
-#org-eclipse-ui-editorss {
-	swt-tab-height: 8px;
-	padding: 0px 5px 7px;
-}
-
-CTabFolder.MArea .MPartStack, CTabFolder.MArea .MPartStack.active {
-	swt-shadow-visible: false;
+.MPartStack {
+	swt-simple: false;
+	swt-mru-visible: false;
 }
 
 CTabFolder Canvas {
diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css
index 26d1b002108..7e487d97e34 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css
@@ -28,25 +28,11 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	color: #C4C5C1;
 }
 
+
 .MTrimmedWindow {
 	background-color: #E8E8E8;
 }
 
-.MPartStack {
-	swt-simple: false;
-	swt-mru-visible: false;
-	swt-unselected-tabs-color: #E8E8E8 #FFFFFF 100%;
-	swt-outer-keyline-color: #FFFFFF;
-	swt-inner-keyline-color: #FFFFFF;
-	swt-tab-outline: #B6BCCC;
-}
-
-.MPartStack.active {
-	swt-tab-outline: #B6BCCC;
-	swt-shadow-visible: false;
-	swt-outer-keyline-color: #C4C5C1;
-}
-
 .MTrimBar {
 	background-color: #E8E8E8;
 }
@@ -67,13 +53,7 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	handle-image: url(./macHandle.png);
 }
 
-.MTrimmedWindow {
-	background-color: #E8E8E8;
-}
-
 #org-eclipse-ui-editorss {
-	swt-tab-height: 8px;
-	padding: 0px 5px 7px;
 	swt-unselected-tabs-color: #D6DDE5 #D6DDE5 #D6DDE5 100% 100%;
 	swt-outer-keyline-color: #D6DDE5;
 	swt-inner-keyline-color: #D6DDE5;
@@ -81,8 +61,27 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	color: #D6DDE5;
 }
 
-CTabFolder.MArea .MPartStack, CTabFolder.MArea .MPartStack.active {
+.MPartStack {
+	swt-simple: false;
+	swt-mru-visible: false;
+	swt-unselected-tabs-color: #E8E8E8 #FFFFFF 100%;
+	swt-outer-keyline-color: #FFFFFF;
+	swt-inner-keyline-color: #FFFFFF;
+	swt-tab-outline: #B6BCCC;
+}
+
+.MPartStack.active {
+	swt-tab-outline: #B6BCCC;
 	swt-shadow-visible: false;
+	swt-outer-keyline-color: #C4C5C1;
+}
+
+CTabFolder {
+  swt-selected-tabs-background: #CCE0F6 #3F97F9 100%;
+}
+
+CTabFolder CTabItem:selected {
+  background-color: #E9E8E9;
 }
 
 CTabFolder Canvas {
@@ -116,14 +115,6 @@ Section {
   	border-color-titlebar: #ffffff;
 }
 
-CTabFolder {
-  swt-selected-tabs-background: #CCE0F6 #3F97F9 100%;
-}
-
-CTabFolder CTabItem:selected {
-  background-color: #E9E8E9;
-}
-
 TabbedPropertyTitle > CLabel{
 	color: #505050;
 }
diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_mru_on_win7.css b/bundles/org.eclipse.ui.themes/css/e4_default_mru_on_win7.css
index 14aafac3d4d..dc7f95c4edc 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_mru_on_win7.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_mru_on_win7.css
@@ -31,15 +31,14 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	background-color: #E1E6F6;
 }
 
-.MPartStack {
-	swt-simple: true;
-	swt-mru-visible: true;
-}
-
 .MTrimBar {
 	background-color: #E1E6F6;
 }
 
+.MTrimBar#org-eclipse-ui-main-toolbar {
+	background-image:  url(./win7.png);
+}
+
 .MToolControl.TrimStack {
 	frame-image:  url(./win7TSFrame.png);
 	handle-image:  url(./win7Handle.png);
@@ -47,17 +46,9 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR {
 	handle-image-rotated:  url(./win7Handle-rotated.png);
 }
 
-.MTrimBar#org-eclipse-ui-main-toolbar {
-	background-image:  url(./win7.png);
-}
-
-#org-eclipse-ui-editorss {
-	swt-tab-height: 8px;
-	padding: 0px 5px 7px;
-}
-
-CTabFolder.MArea .MPartStack, CTabFolder.MArea .MPartStack.active {
-	swt-shadow-visible: false;
+.MPartStack {
+	swt-simple: true;
+	swt-mru-visible: true;
 }
 
 CTabFolder Canvas {
diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_win.css b/bundles/org.eclipse.ui.themes/css/e4_default_win.css
index 4bfd83cd334..df1982c5fa9 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_win.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_win.css
@@ -58,11 +58,6 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END {
 	background-color: #E1E6F6;
 }
 
-.MPartStack {
-	swt-simple: true;
-	swt-mru-visible: false;
-}
-
 .MTrimBar {
 	background-color: #E1E6F6;
 }
@@ -78,13 +73,9 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END {
 	handle-image-rotated:  url(./win7Handle-rotated.png);
 }
 
-#org-eclipse-ui-editorss {
-	swt-tab-height: 8px;
-	padding: 0px 5px 7px;
-}
-
-CTabFolder.MArea .MPartStack, CTabFolder.MArea .MPartStack.active {
-	swt-shadow-visible: false;
+.MPartStack {
+	swt-simple: true;
+	swt-mru-visible: false;
 }
 
 CTabFolder Canvas {
@@ -110,7 +101,6 @@ Form {
 }
 
 
-
 Section {
 	background-color: #ffffff;
   	color: #505050;