Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 8045)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 8047)
@@ -265,5 +265,5 @@
     class KeepMineAction extends AbstractAction implements ListSelectionListener {
         public KeepMineAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);
@@ -297,5 +297,5 @@
     class KeepTheirAction extends AbstractAction implements ListSelectionListener {
         public KeepTheirAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);
@@ -395,5 +395,5 @@
 
         public UndecideAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide");
             if (icon != null) {
                 putValue(Action.SMALL_ICON, icon);