diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co.png
new file mode 100644
index 00000000000..df111d48fb3
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co@2x.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co@2x.png
new file mode 100644
index 00000000000..df6d4317702
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co@2x.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co.png
new file mode 100644
index 00000000000..6f061961726
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co@2x.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co@2x.png
new file mode 100644
index 00000000000..692fa10d326
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co@2x.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co.png
new file mode 100644
index 00000000000..df111d48fb3
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co@2x.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co@2x.png
new file mode 100644
index 00000000000..df6d4317702
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co@2x.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view.png
new file mode 100644
index 00000000000..ca77aee5bca
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view@2x.png b/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view@2x.png
new file mode 100644
index 00000000000..54ecae20f3f
Binary files /dev/null and b/plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view@2x.png differ
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
index db83344b7ff..569d0c48d45 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
+++ b/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
@@ -152,7 +152,7 @@
                label="%toolbar.terminal.label">
 	         <command
 	               commandId="org.eclipse.tm.terminal.view.ui.command.launchToolbar"
-	               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
+	               icon="icons/eview16/console_view.png"
 	               id="org.eclipse.tm.terminal.view.ui.commands.launchToolbar"
 	               label="%command.launch.label"
 	               style="push"
@@ -163,7 +163,7 @@
       <menuContribution locationURI="toolbar:org.eclipse.tm.terminal.view.ui.TerminalsView">
          <command
                commandId="org.eclipse.tm.terminal.view.ui.command.launchToolbar"
-               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
+               icon="icons/eview16/console_view.png"
                id="org.eclipse.tm.terminal.view.ui.commands.launchToolbarTerminalsView"
                label="%command.launch.label"
                style="push"
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
index ac6b57d3270..d692c59d750 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
@@ -14,7 +14,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.custom.CTabFolder;
@@ -211,21 +210,18 @@ public class UIPlugin extends AbstractUIPlugin {
 	 */
 	@Override
 	protected void initializeImageRegistry(ImageRegistry registry) {
-		Bundle bundle = Platform.getBundle("org.eclipse.ui.console"); //$NON-NLS-1$
-		if (bundle != null) {
-			URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_EVIEW + "console_view.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-			registry.put(ImageConsts.VIEW_Terminals, ImageDescriptor.createFromURL(url));
+		Bundle bundle = getBundle();
+		URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_EVIEW + "console_view.png"); //$NON-NLS-1$
+		registry.put(ImageConsts.VIEW_Terminals, ImageDescriptor.createFromURL(url));
 
-			url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_CLCL + "lock_co.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-			registry.put(ImageConsts.ACTION_ScrollLock_Hover, ImageDescriptor.createFromURL(url));
-			url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_ELCL + "lock_co.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-			registry.put(ImageConsts.ACTION_ScrollLock_Enabled, ImageDescriptor.createFromURL(url));
-			url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_DLCL + "lock_co.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-			registry.put(ImageConsts.ACTION_ScrollLock_Disabled, ImageDescriptor.createFromURL(url));
-		}
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "lock_co.png"); //$NON-NLS-1$
+		registry.put(ImageConsts.ACTION_ScrollLock_Hover, ImageDescriptor.createFromURL(url));
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ELCL + "lock_co.png"); //$NON-NLS-1$
+		registry.put(ImageConsts.ACTION_ScrollLock_Enabled, ImageDescriptor.createFromURL(url));
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_DLCL + "lock_co.png"); //$NON-NLS-1$
+		registry.put(ImageConsts.ACTION_ScrollLock_Disabled, ImageDescriptor.createFromURL(url));
 
-		bundle = getBundle();
-		URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "command_input_field.gif"); //$NON-NLS-1$
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "command_input_field.gif"); //$NON-NLS-1$
 		registry.put(ImageConsts.ACTION_ToggleCommandField_Hover, ImageDescriptor.createFromURL(url));
 		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ELCL + "command_input_field.gif"); //$NON-NLS-1$
 		registry.put(ImageConsts.ACTION_ToggleCommandField_Enabled, ImageDescriptor.createFromURL(url));