diff --git a/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java b/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
index de8d017e2..5bb62b74e 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
@@ -217,17 +217,23 @@ private Dimension calculateLabelSize(JLabel label)
         String text = label.getText();
 
         int iconWidth = 0;
+        int iconHeight = 0;
         if (icon != null)
+        {
             iconWidth = icon.getIconWidth();
+            iconHeight = icon.getIconHeight();
+        }
 
-        int stringWidth
+        int labelWidth
             = GuiUtils.getStringWidth(label, text)
                 + iconWidth
                 + label.getIconTextGap();
 
-        int stringHeight = GuiUtils.getStringSize(label, text).height;
+        int textHeight = GuiUtils.getStringSize(label, text).height;
+
+        int labelHeight = (iconHeight > textHeight) ? iconHeight : textHeight;
 
-        return new Dimension(stringWidth, stringHeight);
+        return new Dimension(labelWidth, labelHeight);
     }
 
     /**