diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java
index 83ff8d386..a992c5a26 100755
--- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java
@@ -111,30 +111,55 @@ public void paintComponent(Graphics g) {
 
         if (this.iconImage != null) {            
             if(!isEnabled()){
-                this.iconImage = new ImageIcon(LightGrayFilter
-                        .createDisabledImage(iconImage)).getImage();            
-            }
-            // draw the button icon depending the current button layout
-            if (this.iconLayout.equals(SIPCommButton.CENTER_ICON_LAYOUT))
-                g.drawImage(this.iconImage,
+                Image disabledImage = new ImageIcon(LightGrayFilter
+                        .createDisabledImage(iconImage)).getImage();
+                
+//              draw the button icon depending the current button layout
+                if (this.iconLayout.equals(SIPCommButton.CENTER_ICON_LAYOUT))
+                    g.drawImage(disabledImage,
                                 (this.bgImage.getWidth(null) - 
-                                this.iconImage.getWidth(null)) / 2,
+                                disabledImage.getWidth(null)) / 2,
                                 (this.bgImage.getHeight(null) - 
-                                this.iconImage.getHeight(null)) / 2, this);
-            
-            else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT))
-                g.drawImage(this.iconImage,
-                            7, 
+                                disabledImage.getHeight(null)) / 2, this);
+                
+                else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT))
+                    g.drawImage(disabledImage,
+                                7, 
+                                (this.bgImage.getHeight(null) - 
+                                disabledImage.getHeight(null)) / 2, 
+                                this);
+                
+                else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT))
+                    g.drawImage(disabledImage,
+                            this.bgImage.getWidth(null) - 3, 
+                            (this.bgImage.getHeight(null) - 
+                            disabledImage.getHeight(null)) / 2, 
+                            this);
+            }
+            else{
+//              draw the button icon depending the current button layout
+                if (this.iconLayout.equals(SIPCommButton.CENTER_ICON_LAYOUT))
+                    g.drawImage(this.iconImage,
+                                    (this.bgImage.getWidth(null) - 
+                                    this.iconImage.getWidth(null)) / 2,
+                                    (this.bgImage.getHeight(null) - 
+                                    this.iconImage.getHeight(null)) / 2, this);
+                
+                else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT))
+                    g.drawImage(this.iconImage,
+                                7, 
+                                (this.bgImage.getHeight(null) - 
+                                this.iconImage.getHeight(null)) / 2, 
+                                this);
+                
+                else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT))
+                    g.drawImage(this.iconImage,
+                            this.bgImage.getWidth(null) - 3, 
                             (this.bgImage.getHeight(null) - 
                             this.iconImage.getHeight(null)) / 2, 
                             this);
+            }
             
-            else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT))
-                g.drawImage(this.iconImage,
-                        this.bgImage.getWidth(null) - 3, 
-                        (this.bgImage.getHeight(null) - 
-                        this.iconImage.getHeight(null)) / 2, 
-                        this);
 		}
 
 		if (this.bgRolloverImage != null && this.getModel().isRollover()) {
diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java
index fa141fa5f..38a252c6c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java
@@ -64,7 +64,10 @@ public void init(){
 		this.buttonPanel.add(addToChatButton);		
 		
 		this.add(contactsScrollPane, BorderLayout.CENTER);
-		this.add(buttonPanel, BorderLayout.SOUTH);		
+		this.add(buttonPanel, BorderLayout.SOUTH);
+        
+        //Disable all unused buttons. 
+        this.addToChatButton.setEnabled(false);
 	}
 	
 	public void addContactToChat (MetaContact contactItem){