diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16/clearsearch.gif b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16/clearsearch.gif
deleted file mode 100644
index 2d3935a..0000000
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16/clearsearch.gif
+++ /dev/null
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16/scrolllock.gif b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16/scrolllock.gif
deleted file mode 100644
index 68fd6cf..0000000
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16/scrolllock.gif
+++ /dev/null
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16_d/clearsearch.gif b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16_d/clearsearch.gif
deleted file mode 100644
index 7f32480..0000000
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/loctool_16_d/clearsearch.gif
+++ /dev/null
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock$d.png b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock$d.png
new file mode 100644
index 0000000..683438a
--- /dev/null
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock$d.png
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock.png b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock.png
new file mode 100644
index 0000000..df111d4
--- /dev/null
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock.png
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock@2x.png b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock@2x.png
new file mode 100644
index 0000000..8742944
--- /dev/null
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrolllock@2x.png
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrollock$d@2x.png b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrollock$d@2x.png
new file mode 100644
index 0000000..cde2a0f
--- /dev/null
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/icons/tool_16/scrollock$d@2x.png
Binary files differ
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedUIResources.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedUIResources.java
index 97f04ac..f40e242 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedUIResources.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedUIResources.java
@@ -75,10 +75,8 @@
 	public static final String LOCTOOL_EXPANDALL_IMAGE_ID = UIMiscellanyPlugin.BUNDLE_ID + "/images/loctool/expandall"; //$NON-NLS-1$
 	public static final String LOCTOOL_COLLAPSEALL_IMAGE_ID = UIMiscellanyPlugin.BUNDLE_ID + "/images/loctool/collapseall"; //$NON-NLS-1$
 	
-	public static final String LOCTOOL_SCROLLLOCK_IMAGE_ID = UIMiscellanyPlugin.BUNDLE_ID + "/images/loctool/scrolllock"; //$NON-NLS-1$
-	
-	public static final String LOCTOOL_CLEARSEARCH_IMAGE_ID = UIMiscellanyPlugin.BUNDLE_ID + "/images/loctool/clearsearch"; //$NON-NLS-1$
-	public static final String LOCTOOLD_CLEARSEARCH_IMAGE_ID = UIMiscellanyPlugin.BUNDLE_ID + "/images/loctoold/clearsearch"; //$NON-NLS-1$
+	public static final String TOOL_SCROLLLOCK_IMAGE_ID= UIMiscellanyPlugin.BUNDLE_ID + "/images/tool/scrolllock"; //$NON-NLS-1$
+	public static final String TOOL_SCROLLLOCK_DISABLED_IMAGE_ID= UIMiscellanyPlugin.BUNDLE_ID + "/images/tool/scrolllock$d"; //$NON-NLS-1$
 	
 	public static final String LOCTOOL_SYNCHRONIZED_IMAGE_ID = UIMiscellanyPlugin.BUNDLE_ID + "/images/loctool/synchronized"; //$NON-NLS-1$
 	
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java
index 1a940af..bb95252 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/internal/ecommons/ui/UIMiscellanyPlugin.java
@@ -164,10 +164,8 @@
 		util.register(SharedUIResources.LOCTOOL_EXPANDALL_IMAGE_ID, ImageRegistryUtil.T_LOCTOOL, "expandall.gif"); //$NON-NLS-1$
 		util.register(SharedUIResources.LOCTOOL_COLLAPSEALL_IMAGE_ID, ImageRegistryUtil.T_LOCTOOL, "collapseall.gif"); //$NON-NLS-1$
 		
-		util.register(SharedUIResources.LOCTOOL_SCROLLLOCK_IMAGE_ID, ImageRegistryUtil.T_LOCTOOL, "scrolllock.gif"); //$NON-NLS-1$
-		
-		util.register(SharedUIResources.LOCTOOL_CLEARSEARCH_IMAGE_ID, ImageRegistryUtil.T_LOCTOOL, "clearsearch.gif"); //$NON-NLS-1$
-		util.register(SharedUIResources.LOCTOOLD_CLEARSEARCH_IMAGE_ID, ImageRegistryUtil.T_LOCTOOL_D, "clearsearch.gif"); //$NON-NLS-1$
+		util.register(SharedUIResources.TOOL_SCROLLLOCK_IMAGE_ID, ".png"); //$NON-NLS-1$
+		util.register(SharedUIResources.TOOL_SCROLLLOCK_DISABLED_IMAGE_ID, ".png"); //$NON-NLS-1$
 		
 		util.register(SharedUIResources.LOCTOOL_SYNCHRONIZED_IMAGE_ID, ImageRegistryUtil.T_LOCTOOL, "synced.png"); //$NON-NLS-1$