diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java
index e3084958b1f..184cc7862dd 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalAction.java
@@ -44,27 +44,29 @@ abstract public class TerminalAction extends Action {
 				strDisabledImage, bEnabled, imageRegistry);
 	}
 	protected void setupAction(String strText, String strToolTip,
-			String strImage, String strEnabledImage, String strDisabledImage,
+			String strHoverImage, String strEnabledImage, String strDisabledImage,
 			boolean bEnabled, ImageRegistry imageRegistry) {
-		ImageDescriptor imageDescriptor;
-
+		setupAction(strText,
+				strToolTip,
+				imageRegistry.getDescriptor(strHoverImage),	
+				imageRegistry.getDescriptor(strEnabledImage),	
+				imageRegistry.getDescriptor(strDisabledImage),
+				bEnabled);
+	}
+	protected void setupAction(String strText, String strToolTip,
+			ImageDescriptor hoverImage, ImageDescriptor enabledImage, ImageDescriptor disabledImage,
+			boolean bEnabled) {
 		setText(strText);
 		setToolTipText(strToolTip);
 		setEnabled(bEnabled);
-
-		imageDescriptor = imageRegistry.getDescriptor(strEnabledImage);
-		if (imageDescriptor != null) {
-			setImageDescriptor(imageDescriptor);
+		if (enabledImage != null) {
+			setImageDescriptor(enabledImage);
 		}
-
-		imageDescriptor = imageRegistry.getDescriptor(strDisabledImage);
-		if (imageDescriptor != null) {
-			setDisabledImageDescriptor(imageDescriptor);
+		if (disabledImage != null) {
+			setDisabledImageDescriptor(disabledImage);
 		}
-
-		imageDescriptor = imageRegistry.getDescriptor(strImage);
-		if (imageDescriptor != null) {
-			setHoverImageDescriptor(imageDescriptor);
+		if (hoverImage != null) {
+			setHoverImageDescriptor(hoverImage);
 		}
 	}
 }
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java
index c86a9597400..aca9606fe9e 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionClearAll.java
@@ -16,6 +16,7 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.actions;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.tm.terminal.internal.view.ITerminalView;
 
 public class TerminalActionClearAll extends TerminalAction
@@ -27,7 +28,7 @@ public class TerminalActionClearAll extends TerminalAction
 
         setupAction(ActionMessages.CLEARALL,
                     ActionMessages.CLEARALL,
-                    null,
+                    (ImageDescriptor)null,
                     null,
                     null,
                     false);
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java
index 49650672456..53f445795fc 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCopy.java
@@ -16,10 +16,9 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.actions;
 
-import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.tm.terminal.internal.view.ITerminalView;
 import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.PlatformUI;
 
 public class TerminalActionCopy extends TerminalAction
 {
@@ -27,17 +26,13 @@ public class TerminalActionCopy extends TerminalAction
     {
         super(target,
               TerminalActionCopy.class.getName());
-
-        ImageRegistry imageRegistry;
-        
-        imageRegistry = WorkbenchImages.getImageRegistry();
+        ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
         setupAction(ActionMessages.COPY,
                     ActionMessages.COPY,
-                    ISharedImages.IMG_TOOL_COPY,
-                    ISharedImages.IMG_TOOL_COPY,
-                    ISharedImages.IMG_TOOL_COPY_DISABLED,
-                    true,
-                    imageRegistry);
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED),
+                    true);
     }
 	public void run() {
 		fTarget.onEditCopy();
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java
index bb10424c0a5..c768dd757d9 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionCut.java
@@ -16,10 +16,9 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.actions;
 
-import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.tm.terminal.internal.view.ITerminalView;
 import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.PlatformUI;
 
 public class TerminalActionCut extends TerminalAction
 {
@@ -27,17 +26,13 @@ public class TerminalActionCut extends TerminalAction
     {
         super(target,
               TerminalActionCut.class.getName());
-
-        ImageRegistry imageRegistry;
-        
-        imageRegistry = WorkbenchImages.getImageRegistry();
+        ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
         setupAction(ActionMessages.CUT,
                     ActionMessages.CUT,
-                    ISharedImages.IMG_TOOL_CUT,
-                    ISharedImages.IMG_TOOL_CUT,
-                    ISharedImages.IMG_TOOL_CUT_DISABLED,
-                    true,
-                    imageRegistry);
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT),
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT),
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED),
+                    true);
     }
 	public void run() {
 		fTarget.onEditCut();
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java
index 30ea5974689..b04796c15da 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionPaste.java
@@ -16,10 +16,9 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.actions;
 
-import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.tm.terminal.internal.view.ITerminalView;
 import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.PlatformUI;
 
 public class TerminalActionPaste extends TerminalAction
 {
@@ -27,17 +26,13 @@ public class TerminalActionPaste extends TerminalAction
     {
         super(target,
               TerminalActionPaste.class.getName());
-
-        ImageRegistry imageRegistry;
-        
-        imageRegistry = WorkbenchImages.getImageRegistry();
+        ISharedImages si = PlatformUI.getWorkbench().getSharedImages();
         setupAction(ActionMessages.PASTE,
                     ActionMessages.PASTE,
-                    ISharedImages.IMG_TOOL_PASTE,
-                    ISharedImages.IMG_TOOL_PASTE_DISABLED,
-                    ISharedImages.IMG_TOOL_PASTE,
-                    false,
-                    imageRegistry);
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED),
+                    si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
+                    false);
     }
 	public void run() {
 		fTarget.onEditPaste();
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java
index e32216b0780..a89995dc494 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/actions/TerminalActionSelectAll.java
@@ -16,6 +16,7 @@
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.actions;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.tm.terminal.internal.view.ITerminalView;
 
 public class TerminalActionSelectAll extends TerminalAction
@@ -27,7 +28,7 @@ public class TerminalActionSelectAll extends TerminalAction
 
         setupAction(ActionMessages.SELECTALL,
                     ActionMessages.SELECTALL,
-                    null,
+                    (ImageDescriptor)null,
                     null,
                     null,
                     false);