diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
index a4b2e276b40..6864ac58d5c 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java
@@ -64,8 +64,6 @@ public class ApiUIPlugin extends AbstractUIPlugin {
 	 */
 	private static final String ICONS_PATH = "$nl$/icons/full/"; //$NON-NLS-1$
 
-	private static final String DLCL = ICONS_PATH + "dlcl16/"; //basic colors - size 16x16 disabled//$NON-NLS-1$
-
 	private static final String ELCL = ICONS_PATH + "elcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
 
 	/**
@@ -300,17 +298,11 @@ protected void initializeImageRegistry(ImageRegistry reg) {
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_HELP_PAGE, ELCL + "help.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_COMPARE_APIS, ELCL + "compare_apis.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_CONFIG_SEV, ELCL + "configure_problem_severity.png"); //$NON-NLS-1$
-		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_COMPARE_APIS_DISABLED, DLCL + "compare_apis.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_EXPORT, ELCL + "export.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_NEXT_NAV, ELCL + "next_nav.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_PREV_NAV, ELCL + "prev_nav.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_EXPANDALL, ELCL + "expandall.png"); //$NON-NLS-1$
 		declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_TEXT_EDIT, ELCL + "text_edit.png"); //$NON-NLS-1$
-		// disabled images
-		declareRegistryImage(reg, IApiToolsConstants.IMG_DLCL_EXPORT, DLCL + "export.png"); //$NON-NLS-1$
-		declareRegistryImage(reg, IApiToolsConstants.IMG_DLCL_NEXT_NAV, DLCL + "next_nav.png"); //$NON-NLS-1$
-		declareRegistryImage(reg, IApiToolsConstants.IMG_DLCL_PREV_NAV, DLCL + "prev_nav.png"); //$NON-NLS-1$
-		declareRegistryImage(reg, IApiToolsConstants.IMG_DLCL_EXPANDALL, DLCL + "expandall.png"); //$NON-NLS-1$
 	}
 
 	void showAPIToolingView() {
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/IApiToolsConstants.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/IApiToolsConstants.java
index b08d8d6313a..c345913dd4b 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/IApiToolsConstants.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/IApiToolsConstants.java
@@ -55,10 +55,6 @@ public interface IApiToolsConstants {
 	public static final String IMG_ELCL_COMPARE_APIS = "IMG_ELCL_COMPARE_APIS"; //$NON-NLS-1$
 
 	public static final String IMG_ELCL_CONFIG_SEV = "IMG_ELCL_CONFIG_SEV"; //$NON-NLS-1$
-	/**
-	 * Key for a compare api disabled image
-	 */
-	public static final String IMG_ELCL_COMPARE_APIS_DISABLED = "IMG_ELCL_COMPARE_APIS_DISABLED"; //$NON-NLS-1$
 	/**
 	 * Key for filter resolution image
 	 */
@@ -152,10 +148,6 @@ public interface IApiToolsConstants {
 	 * Key for enabled export image
 	 */
 	public static final String IMG_ELCL_EXPORT = "IMG_ELCL_EXPORT"; //$NON-NLS-1$
-	/**
-	 * Key for disabled export image
-	 */
-	public static final String IMG_DLCL_EXPORT = "IMG_DLCL_EXPORT"; //$NON-NLS-1$
 	/**
 	 * Key for enabled next navigation image
 	 */
@@ -164,20 +156,8 @@ public interface IApiToolsConstants {
 	 * Key for enabled previous navigation image
 	 */
 	public static final String IMG_ELCL_PREV_NAV = "IMG_ELCL_PREV_NAV"; //$NON-NLS-1$
-	/**
-	 * Key for disabled next navigation image
-	 */
-	public static final String IMG_DLCL_NEXT_NAV = "IMG_DLCL_NEXT_NAV"; //$NON-NLS-1$
-	/**
-	 * Key for disabled previous navigation image
-	 */
-	public static final String IMG_DLCL_PREV_NAV = "IMG_DLCL_PREV_NAV"; //$NON-NLS-1$
 	/**
 	 * Key for enabled expand all image
 	 */
 	public static final String IMG_ELCL_EXPANDALL = "IMG_ELCL_EXPANDALL"; //$NON-NLS-1$
-	/**
-	 * Key for disabled expand all image
-	 */
-	public static final String IMG_DLCL_EXPANDALL = "IMG_DLCL_EXPANDALL"; //$NON-NLS-1$
 }
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java
index a1b440cf540..5f21ca6b144 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExpandAllAction.java
@@ -31,8 +31,6 @@ public ExpandAllAction(TreeViewer viewer) {
 		setToolTipText(ActionMessages.ExpandAllAction_tooltip);
 		ImageDescriptor enabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_EXPANDALL);
 		setImageDescriptor(enabledImageDescriptor);
-		ImageDescriptor disabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_DLCL_EXPANDALL);
-		setDisabledImageDescriptor(disabledImageDescriptor);
 		fViewer = viewer;
 	}
 
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportSessionAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportSessionAction.java
index 68e2c347959..debe7fe7537 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportSessionAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/ExportSessionAction.java
@@ -62,8 +62,6 @@ public ExportSessionAction(APIToolingView view) {
 		setToolTipText(ActionMessages.ExportSessionAction_tooltip);
 		ImageDescriptor enabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_EXPORT);
 		setImageDescriptor(enabledImageDescriptor);
-		ImageDescriptor disabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_DLCL_EXPORT);
-		setDisabledImageDescriptor(disabledImageDescriptor);
 		setEnabled(false);
 		this.view = view;
 	}
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java
index 901e81ac6c3..4994ad17f08 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/NavigateAction.java
@@ -41,8 +41,6 @@ public NavigateAction(APIToolingView view, boolean next) {
 			setToolTipText(ActionMessages.NextAction_tooltip);
 			ImageDescriptor enabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_NEXT_NAV);
 			setImageDescriptor(enabledImageDescriptor);
-			ImageDescriptor disabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_DLCL_NEXT_NAV);
-			setDisabledImageDescriptor(disabledImageDescriptor);
 			setActionDefinitionId(ActionFactory.NEXT.getCommandId());
 			if (bars != null) {
 				bars.setGlobalActionHandler(ActionFactory.NEXT.getId(), this);
@@ -52,8 +50,6 @@ public NavigateAction(APIToolingView view, boolean next) {
 			setToolTipText(ActionMessages.PreviousAction_tooltip);
 			ImageDescriptor enabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_PREV_NAV);
 			setImageDescriptor(enabledImageDescriptor);
-			ImageDescriptor disabledImageDescriptor = ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_DLCL_PREV_NAV);
-			setDisabledImageDescriptor(disabledImageDescriptor);
 			setActionDefinitionId(ActionFactory.PREVIOUS.getCommandId());
 			if (bars != null) {
 				bars.setGlobalActionHandler(ActionFactory.PREVIOUS.getId(), this);
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/SelectSessionAction.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/SelectSessionAction.java
index b076af8c3cb..7de750ec38a 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/SelectSessionAction.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/SelectSessionAction.java
@@ -38,7 +38,6 @@ public SelectSessionAction() {
 		setText(ActionMessages.SelectSessionAction_label);
 		setToolTipText(ActionMessages.SelectSessionAction_tooltip);
 		setImageDescriptor(ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_COMPARE_APIS));
-		setDisabledImageDescriptor(ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_COMPARE_APIS_DISABLED));
 		setMenuCreator(this);
 		setEnabled(false);
 	}
diff --git a/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/views/repository/RepositoriesView.java b/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/views/repository/RepositoriesView.java
index 7d4f3f82857..da25152ad4a 100644
--- a/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/views/repository/RepositoriesView.java
+++ b/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/views/repository/RepositoriesView.java
@@ -513,7 +513,6 @@ private void setPrefrences(BndPreferences preferences) {
 			offlineAction.setChecked(false);
 			offlineAction.setToolTipText("Go Offline");
 			offlineAction.setImageDescriptor(Resources.getImageDescriptor("connect.png"));
-			offlineAction.setDisabledImageDescriptor(Resources.getImageDescriptor("connect_d.png"));
 			offlineAction.setEnabled(false);
 			return;
 		}
@@ -526,12 +525,10 @@ protected void updateOfflineAction(boolean offline) {
 			offlineAction.setChecked(true);
 			offlineAction.setToolTipText("Go Online");
 			offlineAction.setImageDescriptor(Resources.getImageDescriptor("disconnect.png"));
-			offlineAction.setDisabledImageDescriptor(Resources.getImageDescriptor("disconnect_d.png"));
 		} else {
 			offlineAction.setChecked(false);
 			offlineAction.setToolTipText("Go Offline");
 			offlineAction.setImageDescriptor(Resources.getImageDescriptor("connect.png"));
-			offlineAction.setDisabledImageDescriptor(Resources.getImageDescriptor("connect_d.png"));
 		}
 		offlineAction.setEnabled(true);
 	}
@@ -622,7 +619,6 @@ public void run() {
 		collapseAllAction.setText("Collapse All");
 		collapseAllAction.setToolTipText("Collapse All");
 		collapseAllAction.setImageDescriptor(Resources.getImageDescriptor("collapseall.png"));
-		collapseAllAction.setDisabledImageDescriptor(Resources.getImageDescriptor("collapseall_d.png"));
 
 		refreshAction = new Action() {
 			@Override
@@ -658,7 +654,6 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 		refreshAction.setText("Refresh");
 		refreshAction.setToolTipText("Refresh Repositories Tree");
 		refreshAction.setImageDescriptor(Resources.getImageDescriptor("arrow_refresh.png"));
-		refreshAction.setDisabledImageDescriptor(Resources.getImageDescriptor("arrow_refresh_d.png"));
 
 		addBundlesAction = new Action() {
 			@Override
@@ -681,7 +676,6 @@ public void run() {
 		addBundlesAction.setText("Add");
 		addBundlesAction.setToolTipText("Add Bundles to Repository");
 		addBundlesAction.setImageDescriptor(Resources.getImageDescriptor("add_obj.png"));
-		addBundlesAction.setDisabledImageDescriptor(Resources.getImageDescriptor("add_obj_d.png"));
 
 		advancedSearchAction = new Action("Advanced Search", IAction.AS_CHECK_BOX) {
 			@Override
@@ -728,7 +722,6 @@ public void run() {
 		advancedSearchAction.setText("Advanced Search");
 		advancedSearchAction.setToolTipText("Toggle Advanced Search");
 		advancedSearchAction.setImageDescriptor(Resources.getImageDescriptor("search.png"));
-		advancedSearchAction.setDisabledImageDescriptor(Resources.getImageDescriptor("search_d.png"));
 
 		downloadAction = new Action() {
 			@Override
@@ -781,7 +774,6 @@ private <T> List<T> selectionByType(IStructuredSelection selection, Class<T> typ
 		downloadAction.setEnabled(false);
 		downloadAction.setText("Download Repository Content");
 		downloadAction.setImageDescriptor(Resources.getImageDescriptor("download.png"));
-		downloadAction.setDisabledImageDescriptor(Resources.getImageDescriptor("download_d.png"));
 
 		offlineAction = new Action("Online/Offline Mode", IAction.AS_CHECK_BOX) {
 			@Override
@@ -795,7 +787,6 @@ public void run() {
 		offlineAction.setEnabled(false);
 		offlineAction.setToolTipText("Go Offline");
 		offlineAction.setImageDescriptor(Resources.getImageDescriptor("connect.png"));
-		offlineAction.setDisabledImageDescriptor(Resources.getImageDescriptor("connect_d.png"));
 
 		viewer.addSelectionChangedListener(event -> {
 			IStructuredSelection selection = (IStructuredSelection) event.getSelection();
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
index 47745d94443..1b8a8c75ca0 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
@@ -28,7 +28,6 @@ public class PDERuntimePluginImages {
 	public final static String ICONS_PATH = "icons/"; //$NON-NLS-1$
 
 	private static final String PATH_OBJ = ICONS_PATH + "obj16/"; //$NON-NLS-1$
-	private static final String PATH_DCL = ICONS_PATH + "dlcl16/"; //$NON-NLS-1$
 	private static final String PATH_LCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$
 	private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$
 
@@ -57,7 +56,6 @@ public class PDERuntimePluginImages {
 	public static final ImageDescriptor COPY_QNAME = create(PATH_LCL, IMG_COPY_QNAME);
 	public static final ImageDescriptor UP_NAV = create(PATH_LCL, IMG_UP_NAV);
 
-	public static final ImageDescriptor DESC_REFRESH_DISABLED = create(PATH_DCL, "refresh.png"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_REFRESH = create(PATH_LCL, "refresh.svg"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.svg"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_EXT_POINT_OBJ = create(PATH_OBJ, "ext_point_obj.svg"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
index f0dea59a42a..ad63171444b 100644
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
+++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
@@ -412,7 +412,6 @@ public void run() {
 		fRefreshAction.setText(PDERuntimeMessages.RegistryView_refresh_label);
 		fRefreshAction.setToolTipText(PDERuntimeMessages.RegistryView_refresh_tooltip);
 		fRefreshAction.setImageDescriptor(PDERuntimePluginImages.DESC_REFRESH);
-		fRefreshAction.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_REFRESH_DISABLED);
 
 		fShowPluginsAction = new Action(PDERuntimeMessages.RegistryView_showRunning_label) {
 			@Override
diff --git a/ui/org.eclipse.pde.ui.tests/tests/performance/plugin/org.eclipse.jdt.ui/plugin.xml b/ui/org.eclipse.pde.ui.tests/tests/performance/plugin/org.eclipse.jdt.ui/plugin.xml
index e621790d53d..3dca2c3349d 100644
--- a/ui/org.eclipse.pde.ui.tests/tests/performance/plugin/org.eclipse.jdt.ui/plugin.xml
+++ b/ui/org.eclipse.pde.ui.tests/tests/performance/plugin/org.eclipse.jdt.ui/plugin.xml
@@ -1125,7 +1125,6 @@
                toolbarPath="org.eclipse.ui.edit.text.actionSet.presentation/Presentation"
                id="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences"
                definitionId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences"
-               disabledIcon="$nl$/icons/full/dtool16/mark_occurrences.gif"
                icon="$nl$/icons/full/etool16/mark_occurrences.gif"
                helpContextId="toggle_mark_occurrences_action_context"
                label="%toggleMarkOccurrences.label"
@@ -1515,7 +1514,6 @@
                id="org.eclipse.jdt.ui.actions.NewTypeDropDown"
                toolbarPath="Normal/JavaWizards"
                class="org.eclipse.jdt.internal.ui.wizards.NewTypeDropDownAction"
-               disabledIcon="$nl$/icons/full/dtool16/newclass_wiz.gif"
                icon="$nl$/icons/full/etool16/newclass_wiz.gif"
                label="%OpenClassWizardAction.label"
                style="pulldown"
diff --git a/ui/org.eclipse.pde.ui/plugin.xml b/ui/org.eclipse.pde.ui/plugin.xml
index e59c3d5b94a..9d024942eb1 100644
--- a/ui/org.eclipse.pde.ui/plugin.xml
+++ b/ui/org.eclipse.pde.ui/plugin.xml
@@ -1823,7 +1823,6 @@
                 locationURI="popup:org.eclipse.ui.popup.any?after=additions">
              <command
                    commandId="org.eclipse.pde.ui.importFromRepository"
-                   disabledIcon="icons/dtool16/imp_extplug.png"
                    icon="icons/etool16/imp_extplug.png"
                    label="%importFromRepository.action.menu.name"
                    style="push"
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
index cf3441309b2..c3b906cd165 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
@@ -44,7 +44,6 @@ public class PDEPluginImages {
 	private static final String PATH_VIEW = ICONS_PATH + "view16/"; //$NON-NLS-1$
 	private static final String PATH_DVIEW = ICONS_PATH + "dview16/"; //$NON-NLS-1$
 	private static final String PATH_LCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$
-	private static final String PATH_LCL_DISABLED = ICONS_PATH + "dlcl16/"; //$NON-NLS-1$
 	private static final String PATH_TOOL = ICONS_PATH + "etool16/"; //$NON-NLS-1$
 	private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$
 	private static final String PATH_WIZBAN = ICONS_PATH + "wizban/"; //$NON-NLS-1$
@@ -252,30 +251,6 @@ public class PDEPluginImages {
 	public static final ImageDescriptor DESC_FILTER = create(PATH_LCL, "filter_ps.png"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_FILTER_RELATED = create(PATH_LCL, "filter_related.png"); //$NON-NLS-1$
 
-	public static final ImageDescriptor DESC_ADD_ATT_DISABLED = create(PATH_LCL_DISABLED, "add_att.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ALPHAB_SORT_CO_DISABLED = create(PATH_LCL_DISABLED, "alphab_sort_co.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CLONE_ATT_DISABLED = create(PATH_LCL_DISABLED, "clone_att.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CLONE_EL_DISABLED = create(PATH_LCL_DISABLED, "clone_el.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GENERATE_CLASS_DISABLED = create(PATH_LCL_DISABLED, "generate_class.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GOTOOBJ_DISABLED = create(PATH_LCL_DISABLED, "goto_obj.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROPERTIES_DISABLED = create(PATH_LCL_DISABLED, "properties.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REFRESH_DISABLED = create(PATH_LCL_DISABLED, "refresh.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REMOVE_ATT_DISABLED = create(PATH_LCL_DISABLED, "remove_att.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HORIZONTAL_DISABLED = create(PATH_LCL_DISABLED, "th_horizontal.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_VERTICAL_DISABLED = create(PATH_LCL_DISABLED, "th_vertical.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COLLAPSE_ALL_DISABLED = create(PATH_LCL_DISABLED, "collapseall.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TOGGLE_EXPAND_STATE_DISABLED = create(PATH_LCL_DISABLED, "toggle_expand_state.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINK_WITH_EDITOR_DISABLED = create(PATH_LCL_DISABLED, "synced.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CALLEES_DISABLED = create(PATH_LCL_DISABLED, "ch_callees.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CALLERS_DISABLED = create(PATH_LCL_DISABLED, "ch_callers.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEP_LOOP_DISABLED = create(PATH_LCL_DISABLED, "dep_loop.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FLAT_LAYOUT_DISABLED = create(PATH_LCL_DISABLED, "flatLayout.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HIERARCHICAL_LAYOUT_DISABLED = create(PATH_LCL_DISABLED, "hierarchicalLayout.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HISTORY_LIST_DISABLED = create(PATH_LCL_DISABLED, "history_list.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DCLEAR = create(PATH_LCL_DISABLED, "clear.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FILTER_DISABLED = create(PATH_LCL_DISABLED, "filter_ps.png"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FILTER_RELATED_DISABLED = create(PATH_LCL_DISABLED, "filter_related.png"); //$NON-NLS-1$
-
 	public static final ImageDescriptor DESC_RUN_EXC = create(PATH_OBJ, "run_exc.png"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_DEBUG_EXC = create(PATH_OBJ, "debug_exc.png"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_PROFILE_EXC = create(PATH_OBJ, "profile_exc.png"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/OrientableBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/OrientableBlock.java
index 51a94b23249..e383de3373a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/OrientableBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/OrientableBlock.java
@@ -41,7 +41,6 @@ public void run() {
 		haction.setChecked(true);
 		haction.setToolTipText(PDEUIMessages.DetailsBlock_horizontal);
 		haction.setImageDescriptor(PDEPluginImages.DESC_HORIZONTAL);
-		haction.setDisabledImageDescriptor(PDEPluginImages.DESC_HORIZONTAL_DISABLED);
 
 		Action vaction = new Action("ver", IAction.AS_RADIO_BUTTON) { //$NON-NLS-1$
 			@Override
@@ -53,7 +52,6 @@ public void run() {
 		vaction.setChecked(false);
 		vaction.setToolTipText(PDEUIMessages.DetailsBlock_vertical);
 		vaction.setImageDescriptor(PDEPluginImages.DESC_VERTICAL);
-		vaction.setDisabledImageDescriptor(PDEPluginImages.DESC_VERTICAL_DISABLED);
 		form.getToolBarManager().add(haction);
 		form.getToolBarManager().add(vaction);
 	}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java
index 2ee30d16fff..93e44ae06d3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java
@@ -201,7 +201,6 @@ public SortingAction() {
 			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.OUTLINE_SORT_ACTION);
 			setText(PDEUIMessages.PDEMultiPageContentOutline_SortingAction_label);
 			setImageDescriptor(PDEPluginImages.DESC_ALPHAB_SORT_CO);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_ALPHAB_SORT_CO_DISABLED);
 			setToolTipText(PDEUIMessages.PDEMultiPageContentOutline_SortingAction_tooltip);
 			setDescription(PDEUIMessages.PDEMultiPageContentOutline_SortingAction_description);
 			setChecked(sortingOn);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java
index d8071d40bb5..643838e46ee 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java
@@ -37,7 +37,6 @@ public ToggleLinkWithEditorAction(PDEFormEditor editor) {
 		setToolTipText(PDEUIMessages.ToggleLinkWithEditorAction_toolTip);
 		setDescription(PDEUIMessages.ToggleLinkWithEditorAction_description);
 		setImageDescriptor(PDEPluginImages.DESC_LINK_WITH_EDITOR);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_LINK_WITH_EDITOR_DISABLED);
 	}
 
 	@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FilterRelatedExtensionsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FilterRelatedExtensionsAction.java
index 9b5d7ae96c6..f768babfa88 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FilterRelatedExtensionsAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/FilterRelatedExtensionsAction.java
@@ -33,7 +33,6 @@ public class FilterRelatedExtensionsAction extends Action {
 
 	public FilterRelatedExtensionsAction(TreeViewer treeViewer, FormFilteredTree filteredTree, ExtensionsSection section) {
 		setImageDescriptor(PDEPluginImages.DESC_FILTER_RELATED);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_FILTER_RELATED_DISABLED);
 		// Extensions section attaches this action to the global find keybinding
 //		String filterBinding = ((IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class)).getBestActiveBindingFormattedFor(ActionFactory.FIND.getCommandId());
 		setText(PDEUIMessages.Actions_filter_relatedPluginElements /*+ ((filterBinding != null) ? "\t" + filterBinding : "")*/);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/ToggleExpandStateAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/ToggleExpandStateAction.java
index 6c065958465..4e6853367ba 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/ToggleExpandStateAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/actions/ToggleExpandStateAction.java
@@ -41,7 +41,6 @@ public class ToggleExpandStateAction extends Action {
 
 	public ToggleExpandStateAction(FormFilteredTree filteredTree, TreeViewer treeViewer) {
 		setImageDescriptor(PDEPluginImages.DESC_TOGGLE_EXPAND_STATE);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_TOGGLE_EXPAND_STATE_DISABLED);
 		setText(PDEUIMessages.ExtensionsPage_toggleExpandState);
 		fExtensionTree = treeViewer;
 		fFilteredTree = filteredTree;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
index e46379ae8ef..3639f233e1a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
@@ -462,11 +462,6 @@ public ImageDescriptor getImageDescriptor() {
 					return PDEPluginImages.DESC_DELETE;
 				}
 
-				@Override
-				public ImageDescriptor getDisabledImageDescriptor() {
-					return PDEPluginImages.DESC_REMOVE_ATT_DISABLED;
-				}
-
 				@Override
 				public void run() {
 					handleDelete();
@@ -556,11 +551,6 @@ public void run() {
 				public ImageDescriptor getImageDescriptor() {
 					return PDEPluginImages.DESC_DELETE;
 				}
-
-				@Override
-				public ImageDescriptor getDisabledImageDescriptor() {
-					return PDEPluginImages.DESC_REMOVE_ATT_DISABLED;
-				}
 			};
 			deleteAction.setEnabled(page.getModel().isEditable());
 			manager.add(deleteAction);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java
index bcddd043f39..a81e800a92b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesView.java
@@ -120,7 +120,6 @@ public ShowLoopsAction() {
 			setDescription(PDEUIMessages.DependenciesView_ShowLoopsAction_description);
 			setToolTipText(PDEUIMessages.DependenciesView_ShowLoopsAction_tooltip);
 			setImageDescriptor(PDEPluginImages.DESC_DEP_LOOP);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_DEP_LOOP_DISABLED);
 			setEnabled(false);
 		}
 
@@ -139,7 +138,6 @@ public ShowCalleesAction() {
 			setDescription(PDEUIMessages.DependenciesView_ShowCalleesAction_description);
 			setToolTipText(PDEUIMessages.DependenciesView_ShowCalleesAction_tooltip);
 			setImageDescriptor(PDEPluginImages.DESC_CALLEES);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_CALLEES_DISABLED);
 		}
 
 		@Override
@@ -158,7 +156,6 @@ public ShowCallersAction() {
 			setDescription(PDEUIMessages.DependenciesView_ShowCallersAction_description);
 			setToolTipText(PDEUIMessages.DependenciesView_ShowCallersAction_tooltip);
 			setImageDescriptor(PDEPluginImages.DESC_CALLERS);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_CALLERS_DISABLED);
 		}
 
 		@Override
@@ -177,7 +174,6 @@ public ShowListAction() {
 			setDescription(PDEUIMessages.DependenciesView_ShowListAction_description);
 			setToolTipText(PDEUIMessages.DependenciesView_ShowListAction_tooltip);
 			setImageDescriptor(PDEPluginImages.DESC_FLAT_LAYOUT);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_FLAT_LAYOUT_DISABLED);
 		}
 
 		@Override
@@ -197,7 +193,6 @@ public ShowTreeAction() {
 			setDescription(PDEUIMessages.DependenciesView_ShowTreeAction_description);
 			setToolTipText(PDEUIMessages.DependenciesView_ShowTreeAction_tooltip);
 			setImageDescriptor(PDEPluginImages.DESC_HIERARCHICAL_LAYOUT);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_HIERARCHICAL_LAYOUT_DISABLED);
 		}
 
 		@Override
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java
index 5c4b85ba17a..801fe780049 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryDropDownAction.java
@@ -36,7 +36,6 @@ public HistoryDropDownAction(DependenciesView view) {
 		fMenu = null;
 		setToolTipText(PDEUIMessages.HistoryDropDownAction_tooltip);
 		setImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST_DISABLED);
 		setMenuCreator(this);
 	}
 
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java
index ba29d6fda8e..d4987751e10 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/HistoryListAction.java
@@ -30,7 +30,6 @@ public HistoryListAction(DependenciesView view) {
 		fView = view;
 		setText(PDEUIMessages.HistoryListAction_label);
 		setImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST_DISABLED);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.HISTORY_LIST_ACTION);
 	}