diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 3a627e75..0fbac82b 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2481,7 +2481,7 @@ void ComponentModes_constructToolbar( GtkToolbar* toolbar ){
 
 void Clipper_constructToolbar( GtkToolbar* toolbar ){
 
-	toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.png", "ToggleClipper" );
+	toolbar_append_toggle_button( toolbar, "Clipper (X)", "select_clipper.png", "ToggleClipper" );
 }
 
 void XYWnd_constructToolbar( GtkToolbar* toolbar ){
@@ -2492,7 +2492,7 @@ void Manipulators_constructToolbar( GtkToolbar* toolbar ){
 	toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.png", "MouseTranslate" );
 	toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.png", "MouseRotate" );
 	toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.png", "MouseScale" );
-	toolbar_append_toggle_button( toolbar, "Transform (Q)", "texture_vertexlock.png", "MouseTransform" );
+	toolbar_append_toggle_button( toolbar, "Transform (Q)", "select_mousetransform.png", "MouseTransform" );
 	toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.png", "MouseDrag" );
 
 	Clipper_constructToolbar( toolbar );
diff --git a/setup/data/tools/bitmaps/select_clipper.png b/setup/data/tools/bitmaps/select_clipper.png
new file mode 100644
index 00000000..f56698f3
Binary files /dev/null and b/setup/data/tools/bitmaps/select_clipper.png differ
diff --git a/setup/data/tools/bitmaps/select_mouseresize.png b/setup/data/tools/bitmaps/select_mouseresize.png
index c841f054..0e8a097c 100644
Binary files a/setup/data/tools/bitmaps/select_mouseresize.png and b/setup/data/tools/bitmaps/select_mouseresize.png differ
diff --git a/setup/data/tools/bitmaps/select_mouserotate.png b/setup/data/tools/bitmaps/select_mouserotate.png
index a2b127cb..c07ee34d 100644
Binary files a/setup/data/tools/bitmaps/select_mouserotate.png and b/setup/data/tools/bitmaps/select_mouserotate.png differ
diff --git a/setup/data/tools/bitmaps/select_mousescale.png b/setup/data/tools/bitmaps/select_mousescale.png
index 2ab67b2e..e55d26bd 100644
Binary files a/setup/data/tools/bitmaps/select_mousescale.png and b/setup/data/tools/bitmaps/select_mousescale.png differ
diff --git a/setup/data/tools/bitmaps/select_mousetransform.png b/setup/data/tools/bitmaps/select_mousetransform.png
new file mode 100644
index 00000000..8a697862
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mousetransform.png differ
diff --git a/setup/data/tools/bitmaps/select_mousetranslate.png b/setup/data/tools/bitmaps/select_mousetranslate.png
index 8d852683..e0b6e7e5 100644
Binary files a/setup/data/tools/bitmaps/select_mousetranslate.png and b/setup/data/tools/bitmaps/select_mousetranslate.png differ
diff --git a/setup/data/tools/bitmaps/view_clipper.png b/setup/data/tools/bitmaps/view_clipper.png
deleted file mode 100644
index b006c0c7..00000000
Binary files a/setup/data/tools/bitmaps/view_clipper.png and /dev/null differ