Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java
===================================================================
--- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java	(revision 27295)
+++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java	(revision 27296)
@@ -34,4 +34,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -105,12 +106,12 @@
 
             buttonList = new ArrayList<IconToggleButton>(7);
-            buttonList.add(new IconToggleButton(movePictureAction));
-            buttonList.add(new IconToggleButton(movePointAction));
-            buttonList.add(new IconToggleButton(transformPointAction));
-            buttonList.add(new IconToggleButton(rotatePictureAction));
-            buttonList.add(new IconToggleButton(scaleXYPictureAction));
-            buttonList.add(new IconToggleButton(scaleXPictureAction));
-            buttonList.add(new IconToggleButton(scaleYPictureAction));
-            buttonList.add(new IconToggleButton(shearPictureAction));
+            buttonList.add(picLayerActionButtonFactory(movePictureAction));
+            buttonList.add(picLayerActionButtonFactory(movePointAction));
+            buttonList.add(picLayerActionButtonFactory(transformPointAction));
+            buttonList.add(picLayerActionButtonFactory(rotatePictureAction));
+            buttonList.add(picLayerActionButtonFactory(scaleXYPictureAction));
+            buttonList.add(picLayerActionButtonFactory(scaleXPictureAction));
+            buttonList.add(picLayerActionButtonFactory(scaleYPictureAction));
+            buttonList.add(picLayerActionButtonFactory(shearPictureAction));
 
             for(IconToggleButton btn : buttonList) {
@@ -118,4 +119,10 @@
             }
         }
+    }
+    
+    private IconToggleButton picLayerActionButtonFactory(MapMode action) {
+    	IconToggleButton button = new IconToggleButton(action);
+    	button.setAutoHideDisabledButton(true);
+    	return button;
     }