Fixes some re-initializations for custom action buttons for UIGroups.

src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java

@@ -484,6 +484,9 @@ else if (value instanceof GroupNode)
 
             clearCustomActionButtons();
 
+            statusIcon = expanded
+                                ? openedGroupIcon
+                                : closedGroupIcon;
             this.statusLabel.setIcon(
                     expanded
                     ? openedGroupIcon
@@ -884,7 +887,9 @@ private void initButtonsPanel(UIGroup uiGroup)
         if (!isSelected)
             return;
 
-        int x = LEFT_BORDER + H_GAP;
+        int x = (statusIcon == null ? 0 : statusIcon.getIconWidth())
+                + LEFT_BORDER
+                + H_GAP;
         int gridX = 0;
 
         // The list of the actions
@@ -1245,6 +1250,16 @@ public void resetRolloverState()
                 button.getModel().setRollover(false);
             }
         }
+
+        if (customActionButtonsUIGroup != null)
+        {
+            Iterator<JButton> buttonsIter = customActionButtonsUIGroup.iterator();
+            while (buttonsIter.hasNext())
+            {
+                JButton button = buttonsIter.next();
+                button.getModel().setRollover(false);
+            }
+        }
     }
 
     /**
@@ -1281,6 +1296,19 @@ public void resetRolloverState(Component excludeComponent)
                     button.getModel().setRollover(false);
             }
         }
+
+        if (customActionButtonsUIGroup != null)
+        {
+            Iterator<JButton> buttonsIter =
+                customActionButtonsUIGroup.iterator();
+            while (buttonsIter.hasNext())
+            {
+                JButton button = buttonsIter.next();
+
+                if (!button.equals(excludeComponent))
+                    button.getModel().setRollover(false);
+            }
+        }
     }
 
     /**

src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/ExternalContactSource.java

@@ -63,7 +63,7 @@ public class ExternalContactSource
     /**
      * The list of action buttons for this source service.
      */
-    private static Map<ContactAction<ContactSourceService>, SIPCommButton>
+    private Map<ContactAction<ContactSourceService>, SIPCommButton>
                                     customServiceActionButtons;
 
     private final JTree contactListTree;