diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/obj_16/linked_rename.png b/ltk/org.eclipse.statet.ltk.ui/icons/obj_16/linked_rename.png
deleted file mode 100644
index 502d932..0000000
--- a/ltk/org.eclipse.statet.ltk.ui/icons/obj_16/linked_rename.png
+++ /dev/null
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/obj_16/linked_rename@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/obj_16/linked_rename@2x.png
deleted file mode 100644
index 1d02a84..0000000
--- a/ltk/org.eclipse.statet.ltk.ui/icons/obj_16/linked_rename@2x.png
+++ /dev/null
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename$d.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename$d.png
new file mode 100644
index 0000000..7427200
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename$d.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename$d@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename$d@2x.png
new file mode 100644
index 0000000..261c86b
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename$d@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename.png
new file mode 100644
index 0000000..ca78d6e
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename@2x.png
new file mode 100644
index 0000000..04b5deb
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/assist-linked_rename@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name$d.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name$d.png
new file mode 100644
index 0000000..d6f262a
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name$d.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name$d@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name$d@2x.png
new file mode 100644
index 0000000..6fd960a
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name$d@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name.png
index 9a9893b..4a71a40 100644
--- a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name.png
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name@2x.png
new file mode 100644
index 0000000..736a049
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/copy-name@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark-occurrences.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark-occurrences.png
deleted file mode 100644
index 06963d3..0000000
--- a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark-occurrences.png
+++ /dev/null
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences$d.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences$d.png
new file mode 100644
index 0000000..cf09daa
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences$d.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences$d@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences$d@2x.png
new file mode 100644
index 0000000..ebb497c
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences$d@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences.png
new file mode 100644
index 0000000..464a9f0
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences@2x.png
new file mode 100644
index 0000000..13b7358
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/mark_occurrences@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search$d.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search$d.png
new file mode 100644
index 0000000..eab3c9a
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search$d.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search$d@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search$d@2x.png
new file mode 100644
index 0000000..ec5daa3
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search$d@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search.gif b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search.gif
deleted file mode 100644
index d540a01..0000000
--- a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search.gif
+++ /dev/null
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search.png
new file mode 100644
index 0000000..f484551
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search@2x.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search@2x.png
new file mode 100644
index 0000000..4eef44e
--- /dev/null
+++ b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16/search@2x.png
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16_d/mark-occurrences.png b/ltk/org.eclipse.statet.ltk.ui/icons/tool_16_d/mark-occurrences.png
deleted file mode 100644
index c0da743..0000000
--- a/ltk/org.eclipse.statet.ltk.ui/icons/tool_16_d/mark-occurrences.png
+++ /dev/null
Binary files differ
diff --git a/ltk/org.eclipse.statet.ltk.ui/plugin.xml b/ltk/org.eclipse.statet.ltk.ui/plugin.xml
index 80c0cc4..e1bca53 100644
--- a/ltk/org.eclipse.statet.ltk.ui/plugin.xml
+++ b/ltk/org.eclipse.statet.ltk.ui/plugin.xml
@@ -263,17 +263,20 @@
          point="org.eclipse.ui.commandImages">
       <image
             commandId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences"
-            icon="icons/tool_16/mark-occurrences.png"
-            disabledIcon="icons/tool_16_d/mark-occurrences.png" />
+            icon="icons/tool_16/mark_occurrences.png"
+            disabledIcon="icons/tool_16/mark_occurrences$d.png" />
       <image
             commandId="org.eclipse.statet.workbench.commands.CopyElementName"
-            icon="icons/tool_16/copy-name.png"/>
+            icon="icons/tool_16/copy-name.png"
+            disabledIcon="icons/tool_16/copy-name$d.png"/>
       <image
             commandId="org.eclipse.statet.workbench.commands.OpenSearchDialog"
-            icon="icons/tool_16/search.gif"/>
+            icon="icons/tool_16/search.png"
+            disabledIcon="icons/tool_16/search$d.png"/>
       <image
             commandId="org.eclipse.statet.ltk.commands.QuickAssistRenameInFile"
-            icon="icons/obj_16/linked_rename.png"/>
+            icon="icons/tool_16/assist-linked_rename.png"
+            disabledIcon="icons/tool_16/assist-linked_rename$d.png"/>
    </extension>
    
    <extension
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java
index 5eae949..8168ed8 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/internal/ltk/ui/LtkUIPlugin.java
@@ -148,7 +148,7 @@
 		
 		util.register(LtkUIResources.OBJ_TEXT_TEMPLATE_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-template.png"); //$NON-NLS-1$
 		util.register(LtkUIResources.OBJ_TEXT_AT_TAG_IMAGE_ID, ImageRegistryUtil.T_OBJ, "text-at_tag.png"); //$NON-NLS-1$
-		util.register(LtkUIResources.OBJ_TEXT_LINKEDRENAME_IMAGE_ID, ImageRegistryUtil.T_OBJ, "linked_rename.png"); //$NON-NLS-1$
+		util.register(LtkUIResources.OBJ_TEXT_LINKEDRENAME_IMAGE_ID, ".png"); //$NON-NLS-1$
 	}
 	
 	
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIResources.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIResources.java
index 321ace7..7282b01 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIResources.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/LtkUIResources.java
@@ -28,17 +28,17 @@
 	private static final String NS= LtkUI.BUNDLE_ID;
 	
 	
-	public static final String OBJ_ERROR_IMAGE_ID= NS + "/image/obj/Error"; //$NON-NLS-1$
-	public static final String OBJ_ERROR_AWAY_IMAGE_ID= NS + "/image/obj/Error.away"; //$NON-NLS-1$
-	public static final String OBJ_WARNING_IMAGE_ID= NS + "/image/obj/Warning"; //$NON-NLS-1$
-	public static final String OBJ_WARNING_AWAY_IMAGE_ID= NS + "/image/obj/Warning.away"; //$NON-NLS-1$
-	public static final String OBJ_INFO_IMAGE_ID= NS + "/image/obj/Info"; //$NON-NLS-1$
-	public static final String OBJ_INFO_AWAY_IMAGE_ID= NS + "/image/obj/Info.away"; //$NON-NLS-1$
+	public static final String OBJ_ERROR_IMAGE_ID= NS + "/images/obj/Error"; //$NON-NLS-1$
+	public static final String OBJ_ERROR_AWAY_IMAGE_ID= NS + "/images/obj/Error.away"; //$NON-NLS-1$
+	public static final String OBJ_WARNING_IMAGE_ID= NS + "/images/obj/Warning"; //$NON-NLS-1$
+	public static final String OBJ_WARNING_AWAY_IMAGE_ID= NS + "/images/obj/Warning.away"; //$NON-NLS-1$
+	public static final String OBJ_INFO_IMAGE_ID= NS + "/images/obj/Info"; //$NON-NLS-1$
+	public static final String OBJ_INFO_AWAY_IMAGE_ID= NS + "/images/obj/Info.away"; //$NON-NLS-1$
 	
-	public static final String OBJ_TEXT_TEMPLATE_IMAGE_ID= NS + "/image/obj/text.template"; //$NON-NLS-1$
-	public static final String OBJ_TEXT_AT_TAG_IMAGE_ID= NS + "/image/obj/text.at_tag"; //$NON-NLS-1$
+	public static final String OBJ_TEXT_TEMPLATE_IMAGE_ID= NS + "/images/obj/text.template"; //$NON-NLS-1$
+	public static final String OBJ_TEXT_AT_TAG_IMAGE_ID= NS + "/images/obj/text.at_tag"; //$NON-NLS-1$
 	
-	public static final String OBJ_TEXT_LINKEDRENAME_IMAGE_ID= NS + "/image/obj/assist.linked_rename"; //$NON-NLS-1$
+	public static final String OBJ_TEXT_LINKEDRENAME_IMAGE_ID= NS + "/images/tool/assist-linked_rename"; //$NON-NLS-1$
 	
 	
 	static final LtkUIResources INSTANCE= new LtkUIResources();