Bug 563497: Trim bar handles are not scaled properly

- Trim bar handle icons had the wrong dimensions. They have been
  20x5 pixels but where drawn as 22x5 pixels.
- Also unified the trim bar handle icons in the light themes as it was
  already in the dark theme. No using the same 4 dots on all OSes and
  themes.
- Add high-DPI version of the images in org.eclipse.e4.ui.workbench.swt
- Do not rotate the drag handle image in code
- Remove all the drag-handle attributes in all themes (as they anyway
  are the same as the default)
- Remove the border around trim stacks (as discussed in bug 563277)

Change-Id: I644e66dea4a694a701a0a284d9c0e94b22573054

63 files changed, 17 insertions, 131 deletions

diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated.png b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated.png
new file mode 100644
index 00000000000..7f4ee606924
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated.png
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated@2x.png b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated@2x.png
new file mode 100644
index 00000000000..963c6c3d088
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated@2x.png
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.png b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.png
index bea11793b12..e8cc22ca0e3 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.png
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.png
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle@2x.png b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle@2x.png
new file mode 100644
index 00000000000..a171382e103
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle@2x.png
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java
index 711755e1c61..9fd3fe1fb4f 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java
@@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Listener;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 import org.w3c.dom.css.CSSPrimitiveValue;
 import org.w3c.dom.css.CSSStyleDeclaration;
 import org.w3c.dom.css.CSSValue;
@@ -47,6 +48,7 @@ import org.w3c.dom.css.CSSValueList;
 public class CSSRenderingUtils {
 
 	private static final String DRAG_HANDLE = "org.eclipse.e4.ui.workbench.swt.DRAG_HANDLE";
+	private static final String DRAG_HANDLE_ROTATED = "org.eclipse.e4.ui.workbench.swt.DRAG_HANDLE-ROTATED";
 
 	private static final String FRAME_IMAGE_PROP = "frame-image";
 
@@ -91,7 +93,8 @@ public class CSSRenderingUtils {
 			// see bug 472761
 			handleImage = JFaceResources.getImage(DRAG_HANDLE);
 			if (handleImage == null) {
-				handleImage = initDragHandleResource();
+				initDragHandleResource();
+				handleImage = JFaceResources.getImage(DRAG_HANDLE);
 			}
 
 		}
@@ -101,7 +104,11 @@ public class CSSRenderingUtils {
 			if (handleImageRotated != null) {
 				handleImage = handleImageRotated;
 			} else {
-				handleImage = rotateImage(toFrame.getDisplay(), handleImage, null);
+				handleImage = JFaceResources.getImage(DRAG_HANDLE_ROTATED);
+				if (handleImage == null) {
+					initDragHandleResource();
+					handleImage = JFaceResources.getImage(DRAG_HANDLE_ROTATED);
+				}
 			}
 		}
 		if (frameImage != null) {
@@ -121,14 +128,18 @@ public class CSSRenderingUtils {
 		return toFrame;
 	}
 
-	private Image initDragHandleResource() {
-		Bundle bundle = org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator.getDefault().getBundle();
+	private void initDragHandleResource() {
+		Bundle bundle = FrameworkUtil.getBundle(getClass());
 		IPath path = new Path("$ws$/images/dragHandle.png");
 		URL url = FileLocator.find(bundle, path, null);
 		ImageDescriptor desc = ImageDescriptor.createFromURL(url);
 		if (desc != null)
 			JFaceResources.getImageRegistry().put(DRAG_HANDLE, desc);
-		return JFaceResources.getImage(DRAG_HANDLE);
+		path = new Path("$ws$/images/dragHandle-rotated.png");
+		url = FileLocator.find(bundle, path, null);
+		ImageDescriptor desc_rotated = ImageDescriptor.createFromURL(url);
+		if (desc_rotated != null)
+			JFaceResources.getImageRegistry().put(DRAG_HANDLE_ROTATED, desc_rotated);
 	}
 
 	private Image rotateImage(Display display, Image image, Integer[] frameInts) {
diff --git a/bundles/org.eclipse.ui.themes/build.properties b/bundles/org.eclipse.ui.themes/build.properties
index 1f6560f49be..7816daf2ce2 100644
--- a/bundles/org.eclipse.ui.themes/build.properties
+++ b/bundles/org.eclipse.ui.themes/build.properties
@@ -18,6 +18,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                plugin.properties,\
-               css/,\
-               images/
+               css/
 src.includes = about.html
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css
index 66636c441e0..e133b236c15 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css
@@ -15,15 +15,6 @@
 
 /* ################################ CSS related to drag and drop ########################## */
 
-
-.MToolBar.Draggable {
-    handle-image:  url(./dragHandle.png);
-}
-
-.MToolControl.Draggable {
-    handle-image:  url(./dragHandle.png);
-}
-
 .DragFeedback {
     background-color: COLOR-WIDGET-NORMAL-SHADOW;
 }
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 3dec8e2f6a7..9bc2b981185 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
@@ -20,14 +20,6 @@
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-.MToolControl.TrimStack {
-    /*frame-image:  url(./gtkTSFrame.png);*/
-    handle-image:  url(./dragHandle.png);
-    /*frame-image-rotated:  url(./gtkTSFrame-rotated.png);*/
-    handle-image-rotated:  url(./dragHandle-rotated.png);
-    frame-cuts: 5px 1px 5px 16px;
-}
-
 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 af14fd24f85..17873c94eb7 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
@@ -19,14 +19,6 @@
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-.MToolControl.TrimStack {
-    /*frame-image:  url(./gtkTSFrame.png);*/
-    handle-image:  url(./dragHandle.png);
-    /*frame-image-rotated:  url(./gtkTSFrame-rotated.png);*/
-    handle-image-rotated:  url(./dragHandle-rotated.png);
-    frame-cuts: 5px 1px 5px 16px;
-}
-
 .MPartStack.active CTabFolder Canvas {
     background-color: #262626;
     color: #CCC;
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 535c85b9490..241e91be7c3 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
@@ -19,14 +19,6 @@
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-.MToolControl.TrimStack {
-    /*frame-image:  url(./gtkTSFrame.png);*/
-    handle-image:  url(./dragHandle.png);
-    /*frame-image-rotated:  url(./gtkTSFrame-rotated.png);*/
-    handle-image-rotated:  url(./dragHandle-rotated.png);
-    frame-cuts: 5px 1px 5px 16px;
-}
-
 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 49ba3384ce7..9c3354cb108 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
@@ -22,14 +22,6 @@
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-.MToolControl.TrimStack {
-    /*frame-image:  url(./gtkTSFrame.png);*/
-    handle-image:  url(./dragHandle.png);
-    /*frame-image-rotated:  url(./gtkTSFrame-rotated.png);*/
-    handle-image-rotated:  url(./dragHandle-rotated.png);
-    frame-cuts: 5px 1px 5px 16px;
-}
-
 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 ac85034089b..a9abd7757fc 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
@@ -19,11 +19,3 @@
 @import url("platform:/plugin/org.eclipse.ui.themes/css/light/e4-light_partstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/light/e4-light_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/light/e4-light-drag-styling.css");
-
-.MToolControl.TrimStack {
-	frame-image:  url(./winXPTSFrame.png);
-	handle-image:  url(./winXPHandle.png);
-	frame-image-rotated:  url(./winXPTSFrame-rotated.png);
-	handle-image-rotated:  url(./winXPHandle-rotated.png);
-	frame-cuts: 5px 1px 5px 16px;
-}
diff --git a/bundles/org.eclipse.ui.themes/css/e4_classic.css b/bundles/org.eclipse.ui.themes/css/e4_classic.css
index e4be9b54cc0..776ff662336 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_classic.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_classic.css
@@ -55,22 +55,6 @@ CTabItem:selected {
 	color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR';
 }
 
-.MToolControl.TrimStack {
-	frame-image:  url(./winClassicTSFrame.png);
-	handle-image:  url(./winClassicHandle.png);
-	frame-image-rotated:  url(./winClassicTSFrame-rotated.png);
-	handle-image-rotated:  url(./winClassicHandle-rotated.png);
-	frame-cuts: 5px 1px 5px 16px;
-}
-
-.MToolBar.Draggable {
-	handle-image:  url(./dragHandle.png);
-}
-
-.MToolControl.Draggable {
-	handle-image:  url(./dragHandle.png);
-}
-
 .DragFeedback {
 	background-color: COLOR-WIDGET-NORMAL-SHADOW;
 }
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 1231dc38409..607c0e78846 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css
@@ -83,13 +83,6 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_NOFOCUS_TAB_BG_END {
 	background-color: COLOR-WIDGET-BACKGROUND #F6F5F4 100%;
 }
 
-.MToolControl.TrimStack {
-	frame-image:  url(./gtkTSFrame.png);
-	handle-image:  url(./gtkHandle.png);
-	frame-image-rotated:  url(./gtkTSFrame-rotated.png);
-	handle-image-rotated:  url(./gtkHandle-rotated.png);
-}
-
 .MPartStack {
 	swt-simple: false;
 }
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 c2d9d950ff2..4a3881a2e77 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css
@@ -65,18 +65,6 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END {
 	background-color: rgb(255, 255, 255);
 }
 
-.MToolControl.TrimStack {
-	frame-image: url(./macTSFrame.png);
-	handle-image: url(./macHandle.png);
-	frame-image-rotated: url(./macTSFrame-rotated.png);
-	handle-image-rotated: url(./macHandle-rotated.png);
-	frame-cuts: 5px 1px 5px 16px;
-}
-
-.MToolBar.Draggable {
-	handle-image: url(./macHandle.png);
-}
-
 .MPartStack {
 	swt-simple: false;
 	swt-unselected-tabs-color: rgb(255, 255, 255);
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 50775ab991d..6e66f99f665 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_default_win.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_default_win.css
@@ -58,13 +58,6 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END {
 	color: #F0F0F0;
 }
 
-.MToolControl.TrimStack {
-	frame-image:  url(./winTSFrame.png);
-	handle-image:  url(./winHandle.png);
-	frame-image-rotated:  url(./winTSFrame-rotated.png);
-	handle-image-rotated:  url(./winHandle-rotated.png);
-}
-
 .MPartStack {
 	swt-simple: true;
 }
diff --git a/bundles/org.eclipse.ui.themes/css/e4_system.css b/bundles/org.eclipse.ui.themes/css/e4_system.css
index 6b0f2e333e6..5b074851d6a 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_system.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_system.css
@@ -22,14 +22,6 @@
 @import url("platform:/plugin/org.eclipse.ui.themes/css/system/e4-light_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/system/e4-light-drag-styling.css");
 
-.MToolControl.TrimStack {
-	frame-image:  url(./winXPTSFrame.png);
-	handle-image:  url(./winXPHandle.png);
-	frame-image-rotated:  url(./winXPTSFrame-rotated.png);
-	handle-image-rotated:  url(./winXPHandle-rotated.png);
-	frame-cuts: 5px 1px 5px 16px;
-}
-
 ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START {
 	color: '#COLOR-WIDGET-BACKGROUND';
 }
@@ -96,13 +88,6 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_NOFOCUS_TAB_BG_END {
 	background-color: COLOR-WIDGET-BACKGROUND '#COLOR-WIDGET-BACKGROUND' 100%;
 }
 
-.MToolControl.TrimStack {
-	frame-image:  url(./gtkTSFrame.png);
-	handle-image:  url(./gtkHandle.png);
-	frame-image-rotated:  url(./gtkTSFrame-rotated.png);
-	handle-image-rotated:  url(./gtkHandle-rotated.png);
-}
-
 .MPartStack {
 	swt-simple: false;
 }
diff --git a/bundles/org.eclipse.ui.themes/css/light/e4-light-drag-styling.css b/bundles/org.eclipse.ui.themes/css/light/e4-light-drag-styling.css
index ad17b8ed779..606799b2724 100644
--- a/bundles/org.eclipse.ui.themes/css/light/e4-light-drag-styling.css
+++ b/bundles/org.eclipse.ui.themes/css/light/e4-light-drag-styling.css
@@ -16,15 +16,6 @@
 
 /* ################################ CSS related to drag and drop ########################## */
 
-
-.MToolBar.Draggable {
-    handle-image:  url(./dragHandle.png);
-}
-
-.MToolControl.Draggable {
-    handle-image:  url(./dragHandle.png);
-}
-
 .DragFeedback {
 	background-color: COLOR-WIDGET-NORMAL-SHADOW;
 }
diff --git a/bundles/org.eclipse.ui.themes/css/system/e4-light-drag-styling.css b/bundles/org.eclipse.ui.themes/css/system/e4-light-drag-styling.css
index ad17b8ed779..606799b2724 100644
--- a/bundles/org.eclipse.ui.themes/css/system/e4-light-drag-styling.css
+++ b/bundles/org.eclipse.ui.themes/css/system/e4-light-drag-styling.css
@@ -16,15 +16,6 @@
 
 /* ################################ CSS related to drag and drop ########################## */
 
-
-.MToolBar.Draggable {
-    handle-image:  url(./dragHandle.png);
-}
-
-.MToolControl.Draggable {
-    handle-image:  url(./dragHandle.png);
-}
-
 .DragFeedback {
 	background-color: COLOR-WIDGET-NORMAL-SHADOW;
 }
diff --git a/bundles/org.eclipse.ui.themes/images/dragHandle-rotated.png b/bundles/org.eclipse.ui.themes/images/dragHandle-rotated.png
deleted file mode 100644
index 19a6db408f4..00000000000
--- a/bundles/org.eclipse.ui.themes/images/dragHandle-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/dragHandle-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/dragHandle-rotated@2x.png
deleted file mode 100644
index 77ac096fd1d..00000000000
--- a/bundles/org.eclipse.ui.themes/images/dragHandle-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/dragHandle.png b/bundles/org.eclipse.ui.themes/images/dragHandle.png
deleted file mode 100644
index 40845df1778..00000000000
--- a/bundles/org.eclipse.ui.themes/images/dragHandle.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/dragHandle@2x.png b/bundles/org.eclipse.ui.themes/images/dragHandle@2x.png
deleted file mode 100644
index 4ba5f7f66da..00000000000
--- a/bundles/org.eclipse.ui.themes/images/dragHandle@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkHandle-rotated.png b/bundles/org.eclipse.ui.themes/images/gtkHandle-rotated.png
deleted file mode 100644
index 6332aea0995..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkHandle-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkHandle-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/gtkHandle-rotated@2x.png
deleted file mode 100644
index 589cbb50217..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkHandle-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkHandle.png b/bundles/org.eclipse.ui.themes/images/gtkHandle.png
deleted file mode 100644
index 45da990b405..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkHandle.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkHandle@2x.png b/bundles/org.eclipse.ui.themes/images/gtkHandle@2x.png
deleted file mode 100644
index b62d0463576..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkHandle@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkTSFrame-rotated.png b/bundles/org.eclipse.ui.themes/images/gtkTSFrame-rotated.png
deleted file mode 100644
index 35a65d6533c..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkTSFrame-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkTSFrame-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/gtkTSFrame-rotated@2x.png
deleted file mode 100644
index 45e2cf6fd1a..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkTSFrame-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkTSFrame.png b/bundles/org.eclipse.ui.themes/images/gtkTSFrame.png
deleted file mode 100644
index 0d1a021f308..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkTSFrame.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/gtkTSFrame@2x.png b/bundles/org.eclipse.ui.themes/images/gtkTSFrame@2x.png
deleted file mode 100644
index cf7e626f878..00000000000
--- a/bundles/org.eclipse.ui.themes/images/gtkTSFrame@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macHandle-rotated.png b/bundles/org.eclipse.ui.themes/images/macHandle-rotated.png
deleted file mode 100644
index 6332aea0995..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macHandle-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macHandle-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/macHandle-rotated@2x.png
deleted file mode 100644
index 589cbb50217..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macHandle-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macHandle.png b/bundles/org.eclipse.ui.themes/images/macHandle.png
deleted file mode 100644
index 45da990b405..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macHandle.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macHandle@2x.png b/bundles/org.eclipse.ui.themes/images/macHandle@2x.png
deleted file mode 100644
index b62d0463576..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macHandle@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macTSFrame-rotated.png b/bundles/org.eclipse.ui.themes/images/macTSFrame-rotated.png
deleted file mode 100644
index 6ece9c05c89..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macTSFrame-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macTSFrame-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/macTSFrame-rotated@2x.png
deleted file mode 100644
index 9e6e4fbca38..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macTSFrame-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macTSFrame.png b/bundles/org.eclipse.ui.themes/images/macTSFrame.png
deleted file mode 100644
index e8caa5f4a83..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macTSFrame.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/macTSFrame@2x.png b/bundles/org.eclipse.ui.themes/images/macTSFrame@2x.png
deleted file mode 100644
index ab487f196cc..00000000000
--- a/bundles/org.eclipse.ui.themes/images/macTSFrame@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicHandle-rotated.png b/bundles/org.eclipse.ui.themes/images/winClassicHandle-rotated.png
deleted file mode 100644
index 6332aea0995..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicHandle-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicHandle-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/winClassicHandle-rotated@2x.png
deleted file mode 100644
index 589cbb50217..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicHandle-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicHandle.png b/bundles/org.eclipse.ui.themes/images/winClassicHandle.png
deleted file mode 100644
index 45da990b405..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicHandle.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicHandle@2x.png b/bundles/org.eclipse.ui.themes/images/winClassicHandle@2x.png
deleted file mode 100644
index b62d0463576..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicHandle@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame-rotated.png b/bundles/org.eclipse.ui.themes/images/winClassicTSFrame-rotated.png
deleted file mode 100644
index 6d114c6fd72..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/winClassicTSFrame-rotated@2x.png
deleted file mode 100644
index 1710a476bb9..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame.png b/bundles/org.eclipse.ui.themes/images/winClassicTSFrame.png
deleted file mode 100644
index 7bc17157ab5..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame@2x.png b/bundles/org.eclipse.ui.themes/images/winClassicTSFrame@2x.png
deleted file mode 100644
index 669fa74fb61..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winClassicTSFrame@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winHandle-rotated.png b/bundles/org.eclipse.ui.themes/images/winHandle-rotated.png
deleted file mode 100644
index 6332aea0995..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winHandle-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winHandle-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/winHandle-rotated@2x.png
deleted file mode 100644
index 589cbb50217..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winHandle-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winHandle.png b/bundles/org.eclipse.ui.themes/images/winHandle.png
deleted file mode 100644
index 45da990b405..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winHandle.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winHandle@2x.png b/bundles/org.eclipse.ui.themes/images/winHandle@2x.png
deleted file mode 100644
index b62d0463576..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winHandle@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winTSFrame-rotated.png b/bundles/org.eclipse.ui.themes/images/winTSFrame-rotated.png
deleted file mode 100644
index e2ccfbafa1c..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winTSFrame-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winTSFrame-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/winTSFrame-rotated@2x.png
deleted file mode 100644
index a9886f47e79..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winTSFrame-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winTSFrame.png b/bundles/org.eclipse.ui.themes/images/winTSFrame.png
deleted file mode 100644
index c1e7b25a361..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winTSFrame.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winTSFrame@2x.png b/bundles/org.eclipse.ui.themes/images/winTSFrame@2x.png
deleted file mode 100644
index 0c5f7d0a481..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winTSFrame@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPHandle-rotated.png b/bundles/org.eclipse.ui.themes/images/winXPHandle-rotated.png
deleted file mode 100644
index 6332aea0995..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPHandle-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPHandle-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/winXPHandle-rotated@2x.png
deleted file mode 100644
index 589cbb50217..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPHandle-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPHandle.png b/bundles/org.eclipse.ui.themes/images/winXPHandle.png
deleted file mode 100644
index 45da990b405..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPHandle.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPHandle@2x.png b/bundles/org.eclipse.ui.themes/images/winXPHandle@2x.png
deleted file mode 100644
index b62d0463576..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPHandle@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPTSFrame-rotated.png b/bundles/org.eclipse.ui.themes/images/winXPTSFrame-rotated.png
deleted file mode 100644
index 703568461ef..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPTSFrame-rotated.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPTSFrame-rotated@2x.png b/bundles/org.eclipse.ui.themes/images/winXPTSFrame-rotated@2x.png
deleted file mode 100644
index 9e1325598b8..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPTSFrame-rotated@2x.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPTSFrame.png b/bundles/org.eclipse.ui.themes/images/winXPTSFrame.png
deleted file mode 100644
index a204d003c66..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPTSFrame.png
+++ /dev/null
diff --git a/bundles/org.eclipse.ui.themes/images/winXPTSFrame@2x.png b/bundles/org.eclipse.ui.themes/images/winXPTSFrame@2x.png
deleted file mode 100644
index 1506403ba7e..00000000000
--- a/bundles/org.eclipse.ui.themes/images/winXPTSFrame@2x.png
+++ /dev/null