diff --git a/resources/images/images.properties b/resources/images/images.properties
index e483ebf97..86881b33d 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -258,6 +258,7 @@ service.gui.buttons.CONTACT_LIST_DIAL_BUTTON_PRESSED=resources/images/impl/gui/b
 service.gui.buttons.DIAL_PAD_CALL_BUTTON_BG=resources/images/impl/gui/buttons/dialPadCallButtonBg.png
 service.gui.buttons.DIAL_PAD_CALL_BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/dialPadCallButtonBgRollover.png
 service.gui.buttons.CALL_INFO=resources/images/impl/gui/buttons/callInfo.png
+service.gui.buttons.ZRTP_ID_BUTTON=resources/images/impl/gui/buttons/zrtpEditId.png
 
 # Sound level icons
 service.gui.soundlevel.SOUND_LEVEL_ACTIVE=resources/images/impl/gui/common/soundlevel/soundActive.png
diff --git a/resources/images/impl/gui/buttons/zrtpEditId.png b/resources/images/impl/gui/buttons/zrtpEditId.png
new file mode 100644
index 000000000..6bde9e027
Binary files /dev/null and b/resources/images/impl/gui/buttons/zrtpEditId.png differ
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
index 70c660f99..94e983b35 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
@@ -179,7 +179,7 @@ public ZrtpSecurityPanel(   CallPeerRenderer peerRenderer,
         zidPropertyName = "net.java.sip.communicator.zrtp.ZIDNAME" + zidString;
         configService = GuiActivator.getConfigurationService();
         zidPropertyValue = configService.getString(zidPropertyName);
-       
+
         loadSkin();
     }
 
@@ -431,7 +431,8 @@ private void initSasLabels()
     private void initZidNameButton()
     {
         zidNameButton = new SIPCommButton(
-            ImageLoader.getImage(new ImageID("service.gui.icons.ACCOUNT_ICON")));
+            ImageLoader.getImage(
+                new ImageID("service.gui.buttons.ZRTP_ID_BUTTON")));
         zidNameButton.setToolTipText(GuiActivator.getResources().getI18NString(
             "service.gui.ZID_NAME_BUTTON"));
 
@@ -450,8 +451,8 @@ public void actionPerformed(ActionEvent e)
                     zidNameDialogThread = new ZidToNameThread();
                     zidNameDialogThread.start();
                 }
-            }            
-        });        
+            }
+        });
     }
 
     /**