Upon Yana's request, restores ImageLoader back into .impl.gui.utils from .swing and works with the ResourceManagementService in .swing.

59 files changed, 178 insertions, 126 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
index 0350f07..22f9bc6 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
@@ -6,15 +6,16 @@
  */
 package net.java.sip.communicator.impl.gui.customcontrols;
 
-import java.io.*;
-
 import java.awt.*;
 import java.awt.event.*;
+import java.io.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java b/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java
index eb0ab09..b9f5a30 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java
@@ -10,7 +10,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
index a7afff5..028f48d 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
@@ -13,6 +13,7 @@ import java.lang.reflect.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
index 4672768..35bcf20 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
@@ -12,6 +12,7 @@ import java.awt.image.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 public class SCScrollPane
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java
index df8ea96..d7f0e1f 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java
@@ -12,7 +12,7 @@ import java.awt.image.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The SIPCommToolBar is a <tt>JToolBar</tt>, which has its own drag icon
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
index ae11fe1..898e778 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
@@ -8,10 +8,12 @@ package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
index 776df07..1d1778d 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
@@ -13,6 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
index aa0ff79..4ad0f50 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
@@ -16,7 +16,6 @@ import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 
 /**
  * SipCommunicator default theme.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
index 56c2aff..31cf18f 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
@@ -12,6 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
index b664de5..20a423c 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
@@ -14,7 +14,7 @@ import javax.swing.border.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * Divider used by SIPCommSplitPaneUI.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
index 48849a3..9904e8f 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
@@ -14,6 +14,7 @@ import javax.swing.plaf.metal.*;
 import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
index 10aa8b9..bd33f59 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
@@ -12,6 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
index 1601f16..a6a0035 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
@@ -17,6 +17,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
index 39d44c4..f2b0128 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
@@ -9,10 +9,12 @@ package net.java.sip.communicator.impl.gui.main.account;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
index 1d11fb1..91995b0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
@@ -15,6 +15,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
index a0ef5a7..5b41132 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
@@ -15,6 +15,7 @@ import javax.swing.Timer;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
index 6df6d21..ef017ac 100755
--- a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
@@ -20,7 +20,6 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.audionotifier.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
index f427b85..6f4b916 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
@@ -11,9 +11,9 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 
 /**
  * Represents an UI means to put an associated <tt>CallPariticant</tt> on/off
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
index f5a2fbd..f272b59 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
@@ -18,6 +18,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
index 4b801b2..f86f98a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
@@ -11,8 +11,8 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 
 /**
  * Represents an UI means to mute the audio stream sent to an associated
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
index b1f81e2..04bb687 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
@@ -14,6 +14,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
index d6d4231..f1cd898 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
@@ -11,8 +11,8 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 
 /**
  * The UI button used to toggle on or off call securing
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
index ddeb1ad..e39d052 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
@@ -15,9 +15,9 @@ import javax.swing.*;
 import org.osgi.framework.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
index 38cb52a..7566c05 100755
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
@@ -12,9 +12,9 @@ import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.GuiActivator;
-import net.java.sip.communicator.service.gui.PopupDialog;
-import net.java.sip.communicator.service.gui.UIService;
+import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
index 586ab31..093fcb4 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
@@ -14,6 +14,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index 3271504..e6a3a88 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -24,7 +24,6 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
index e69fe05..31471c0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The <tt>SmiliesSelectorBox</tt> is the component where user could choose a
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
index 6417f34..2ac73ca 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
@@ -14,8 +14,8 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
index 3e06191..63a82b0 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
@@ -13,6 +13,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
index 31baa49..34593b9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The <tt>ChatRightButtonMenu</tt> appears when the user makes a right button
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
index fc2e761..5537ff1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The <tt>EditMenu</tt> is the menu in the chat window menu bar, which contains
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
index 1f8529a..b360392 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The <tt>FileMenu</tt> is the menu in the chat window menu bar that contains
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
index 9600c09..2f5a368 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
@@ -15,9 +15,9 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
index 3858977..9749659 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The <tt>WritePanelRightButtonMenu</tt> appears when the user makes a right
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
index 059a59d..2527e8e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
@@ -16,6 +16,7 @@ import javax.swing.text.html.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
index 045f869..02cb753 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
@@ -18,6 +18,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
index 8f255c0..b37dd60 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
@@ -18,6 +18,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
index b5ac6c0..d5a4bad 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
@@ -20,9 +20,9 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
index 63ac119..0849753 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
@@ -14,7 +14,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
index 129a714..6000cea 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The <tt>ChatRoomsListRightButtonMenu</tt> is the menu, opened when user clicks
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
index 3b43d7b..063994a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
@@ -14,6 +14,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java
index 18797d1..795d067 100644
--- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java
+++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java
@@ -10,8 +10,8 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
index ce9c999..ef892df 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
@@ -14,7 +14,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The GroupRightButtonMenu is the menu, opened when user clicks with the
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
index 4677c0d..8753d77 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
@@ -24,7 +24,6 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.systray.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
index c2b4a7c..7c426bf 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
@@ -19,6 +19,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
index 489a4cf..71dff24 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
@@ -15,7 +15,6 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;

 import net.java.sip.communicator.impl.gui.utils.*;

 import net.java.sip.communicator.service.gui.*;

-import net.java.sip.communicator.swing.*;

 

 public class AboutWindow

     extends JDialog

diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
index 88278c9..0371985 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
@@ -20,8 +20,8 @@ import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.UIService;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
index 2b3d528..90d3fd1 100755
--- a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
-import net.java.sip.communicator.swing.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 
 /**
  * The main menu bar. This is the menu bar that appears on top of the main
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
index 5a4a8ce..b2802bf 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
@@ -13,10 +13,10 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
-import net.java.sip.communicator.swing.*;
 
 public class MoreButton
     extends JLabel
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
index 4b9f4d5..19cb061 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
@@ -19,7 +19,6 @@ import net.java.sip.communicator.impl.gui.main.login.*;
 import net.java.sip.communicator.impl.gui.main.presence.message.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
index 9f5cc28..83f72aa 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
@@ -17,7 +17,6 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
index eccac75..20f291d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
@@ -12,6 +12,7 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
diff --git a/src/net/java/sip/communicator/impl/gui/utils/Constants.java b/src/net/java/sip/communicator/impl/gui/utils/Constants.java
index 12407dc..0859ca6 100755
--- a/src/net/java/sip/communicator/impl/gui/utils/Constants.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/Constants.java
@@ -16,7 +16,6 @@ import javax.swing.text.html.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/swing/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
index e6ccb20..17cea7c 100644
--- a/src/net/java/sip/communicator/swing/ImageLoader.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.impl.gui.utils;
 
 import java.awt.*;
 import java.awt.image.*;
@@ -16,6 +16,7 @@ import java.util.List;
 import javax.imageio.*;
 import javax.imageio.stream.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
@@ -106,48 +107,6 @@ public class ImageLoader {
 
     /**
      * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
-     * of a tab.
-     */
-    public static final ImageID TAB_LEFT_BG
-        = new ImageID("service.gui.lookandfeel.TAB_LEFT_BG");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
-     * of a tab.
-     */
-    public static final ImageID TAB_MIDDLE_BG
-        = new ImageID("service.gui.lookandfeel.TAB_MIDDLE_BG");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
-     * of a tab.
-     */
-    public static final ImageID TAB_RIGHT_BG
-        = new ImageID("service.gui.lookandfeel.TAB_RIGHT_BG");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
-     * of a selected tab.
-     */
-    public static final ImageID SELECTED_TAB_LEFT_BG
-        = new ImageID("service.gui.lookandfeel.SELECTED_TAB_LEFT_BG");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
-     * of a selected tab.
-     */
-    public static final ImageID SELECTED_TAB_MIDDLE_BG
-        = new ImageID("service.gui.lookandfeel.SELECTED_TAB_MIDDLE_BG");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
-     * of a selected tab.
-     */
-    public static final ImageID SELECTED_TAB_RIGHT_BG
-        = new ImageID("service.gui.lookandfeel.SELECTED_TAB_RIGHT_BG");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
      * of a closable tab.
      */
     public static final ImageID CLOSABLE_TAB_BG
@@ -161,20 +120,6 @@ public class ImageLoader {
         = new ImageID("service.gui.lookandfeel.SELECTED_CLOSABLE_TAB_BG");
 
     /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint a close
-     * button on a tab.
-     */
-    public static final ImageID CLOSE_TAB_ICON
-        = new ImageID("service.gui.lookandfeel.CLOSE_TAB_ICON");
-
-    /**
-     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint a rollover
-     * close button on a tab.
-     */
-    public static final ImageID CLOSE_TAB_SELECTED_ICON
-        = new ImageID("service.gui.lookandfeel.CLOSE_TAB_SELECTED_ICON");
-
-    /**
      * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the icon
      * used to delete text in text fields and editable combo boxes.
      */
@@ -1147,9 +1092,7 @@ public class ImageLoader {
         }
         else
         {
-            URL path =
-                SwingCommonActivator.getResources()
-                    .getImageURL(imageID.getId());
+            URL path = GuiActivator.getResources().getImageURL(imageID.getId());
 
             if (path == null)
             {
@@ -1203,8 +1146,7 @@ public class ImageLoader {
     public static byte[] getImageInBytes(ImageID imageID)
     {
         InputStream in =
-            SwingCommonActivator.getResources().getImageInputStream(
-                imageID.getId());
+            GuiActivator.getResources().getImageInputStream(imageID.getId());
 
         if (in == null)
             return null;
@@ -1303,8 +1245,8 @@ public class ImageLoader {
 
                 try
                 {
-                    return SwingCommonActivator.getResources().getImageURL(
-                        imageID).toURI().toString();
+                    return GuiActivator.getResources().getImageURL(imageID)
+                        .toURI().toString();
                 }
                 catch(URISyntaxException ex)
                 {
diff --git a/src/net/java/sip/communicator/swing/Smiley.java b/src/net/java/sip/communicator/impl/gui/utils/Smiley.java
index c84ccfe..0482199 100644
--- a/src/net/java/sip/communicator/swing/Smiley.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/Smiley.java
@@ -4,10 +4,11 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.swing;
+package net.java.sip.communicator.impl.gui.utils;
 
 import java.net.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.resources.*;
 
 /**
@@ -79,8 +80,8 @@ public class Smiley {
      */
     public String getImagePath() 
     {
-        URL url = SwingCommonActivator.getResources().
-            getImageURL(this.getImageID().getId());
+        URL url =
+            GuiActivator.getResources().getImageURL(this.getImageID().getId());
         
         if(url == null)
             return null;
diff --git a/src/net/java/sip/communicator/swing/SIPCommFrame.java b/src/net/java/sip/communicator/swing/SIPCommFrame.java
index 987ca3a..60cd23d 100644
--- a/src/net/java/sip/communicator/swing/SIPCommFrame.java
+++ b/src/net/java/sip/communicator/swing/SIPCommFrame.java
@@ -28,6 +28,9 @@ public abstract class SIPCommFrame
     extends JFrame
     implements Observer
 {
+    private static final String SIP_COMMUNICATOR_LOGO =
+        "service.gui.SIP_COMMUNICATOR_LOGO";
+
     private final Logger logger = Logger.getLogger(SIPCommFrame.class);
 
     private final ActionMap amap;
@@ -40,7 +43,7 @@ public abstract class SIPCommFrame
     {
         this.setContentPane(new MainContentPane());
 
-        Image scLogo = ImageLoader.getImage(ImageLoader.SIP_COMMUNICATOR_LOGO);
+        Image scLogo = SwingCommonActivator.getImage(SIP_COMMUNICATOR_LOGO);
         this.setIconImage(scLogo);
 
         // In order to have the same icon when using option panes
diff --git a/src/net/java/sip/communicator/swing/SwingCommonActivator.java b/src/net/java/sip/communicator/swing/SwingCommonActivator.java
index 2ff0296..c0a0db1 100644
--- a/src/net/java/sip/communicator/swing/SwingCommonActivator.java
+++ b/src/net/java/sip/communicator/swing/SwingCommonActivator.java
@@ -6,12 +6,23 @@
  */
 package net.java.sip.communicator.swing;
 
+import java.awt.image.*;
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import javax.imageio.*;
+
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.resources.*;
+import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
 
+/**
+ * @author Lubomir Marinov
+ */
 public class SwingCommonActivator
     implements BundleActivator
 {
@@ -19,8 +30,14 @@ public class SwingCommonActivator
 
     private static ConfigurationService configurationService;
 
+    private static final Map<String, BufferedImage> imageCache =
+        new HashMap<String, BufferedImage>();
+
     private static KeybindingsService keybindingsService;
 
+    private static final Logger logger =
+        Logger.getLogger(SwingCommonActivator.class);
+
     private static ResourceManagementService resources;
 
     public static ConfigurationService getConfigurationService()
@@ -55,6 +72,29 @@ public class SwingCommonActivator
         return keybindingsService;
     }
 
+    public static BufferedImage getImage(String key)
+    {
+        if (imageCache.containsKey(key))
+            return imageCache.get(key);
+
+        URL url = getResources().getImageURL(key);
+        BufferedImage image = null;
+        if (url != null)
+        {
+            try
+            {
+                image = ImageIO.read(url);
+
+                imageCache.put(key, image);
+            }
+            catch (IOException ex)
+            {
+                logger.error("Failed to load image " + key, ex);
+            }
+        }
+        return image;
+    }
+
     public static ResourceManagementService getResources()
     {
         if (resources == null)
diff --git a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneEnhancedUI.java b/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneEnhancedUI.java
index a189a74..51ec16b 100644
--- a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneEnhancedUI.java
+++ b/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneEnhancedUI.java
@@ -29,8 +29,9 @@ import net.java.sip.communicator.swing.*;
  * @author David Bismut, davidou@mageos.com
  * @author Yana Stamcheva
  */
-public class SIPCommTabbedPaneEnhancedUI extends SIPCommTabbedPaneUI {
-
+public class SIPCommTabbedPaneEnhancedUI
+    extends SIPCommTabbedPaneUI
+{
     private static final Color whiteColor = Color.white;
 
     private static final int TAB_OVERLAP
@@ -39,6 +40,48 @@ public class SIPCommTabbedPaneEnhancedUI extends SIPCommTabbedPaneUI {
 
     private static final int PREFERRED_WIDTH = 150;
 
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
+     * of a selected tab.
+     */
+    private static final String SELECTED_TAB_LEFT_BG =
+        "service.gui.lookandfeel.SELECTED_TAB_LEFT_BG";
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
+     * of a selected tab.
+     */
+    private static final String SELECTED_TAB_MIDDLE_BG =
+        "service.gui.lookandfeel.SELECTED_TAB_MIDDLE_BG";
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
+     * of a selected tab.
+     */
+    private static final String SELECTED_TAB_RIGHT_BG =
+        "service.gui.lookandfeel.SELECTED_TAB_RIGHT_BG";
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
+     * of a tab.
+     */
+    private static final String TAB_LEFT_BG =
+        "service.gui.lookandfeel.TAB_LEFT_BG";
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
+     * of a tab.
+     */
+    private static final String TAB_MIDDLE_BG =
+        "service.gui.lookandfeel.TAB_MIDDLE_BG";
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
+     * of a tab.
+     */
+    private static final String TAB_RIGHT_BG =
+        "service.gui.lookandfeel.TAB_RIGHT_BG";
+
     public static ComponentUI createUI(JComponent c) {
         return new SIPCommTabbedPaneEnhancedUI();
     }
@@ -122,33 +165,25 @@ public class SIPCommTabbedPaneEnhancedUI extends SIPCommTabbedPaneUI {
         {
             if (tabPane.isEnabledAt(tabIndex))
             {
-                leftImg = ImageLoader.getImage(
-                    ImageLoader.SELECTED_TAB_LEFT_BG);
-                middleImg = ImageLoader.getImage(
-                    ImageLoader.SELECTED_TAB_MIDDLE_BG);
-                rightImg = ImageLoader.getImage(
-                    ImageLoader.SELECTED_TAB_RIGHT_BG);
-                
+                leftImg = SwingCommonActivator.getImage(SELECTED_TAB_LEFT_BG);
+                middleImg =
+                    SwingCommonActivator.getImage(SELECTED_TAB_MIDDLE_BG);
+                rightImg = SwingCommonActivator.getImage(SELECTED_TAB_RIGHT_BG);
+
                 tabOverlap = TAB_OVERLAP;
             }
             else
             {
-                leftImg = ImageLoader.getImage(
-                    ImageLoader.TAB_LEFT_BG);
-                middleImg = ImageLoader.getImage(
-                    ImageLoader.TAB_MIDDLE_BG);
-                rightImg = ImageLoader.getImage(
-                    ImageLoader.TAB_RIGHT_BG);
+                leftImg = SwingCommonActivator.getImage(TAB_LEFT_BG);
+                middleImg = SwingCommonActivator.getImage(TAB_MIDDLE_BG);
+                rightImg = SwingCommonActivator.getImage(TAB_RIGHT_BG);
             }
         }
         else
         {
-            leftImg = ImageLoader.getImage(
-                ImageLoader.TAB_LEFT_BG);
-            middleImg = ImageLoader.getImage(
-                ImageLoader.TAB_MIDDLE_BG);
-            rightImg = ImageLoader.getImage(
-                ImageLoader.TAB_RIGHT_BG);
+            leftImg = SwingCommonActivator.getImage(TAB_LEFT_BG);
+            middleImg = SwingCommonActivator.getImage(TAB_MIDDLE_BG);
+            rightImg = SwingCommonActivator.getImage(TAB_RIGHT_BG);
         }
         
         g2.drawImage(leftImg, x, y, null);
diff --git a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneUI.java b/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneUI.java
index 8efca27..03ffd81 100644
--- a/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneUI.java
+++ b/src/net/java/sip/communicator/swing/plaf/SIPCommTabbedPaneUI.java
@@ -31,6 +31,21 @@ import net.java.sip.communicator.swing.*;
 public class SIPCommTabbedPaneUI
     extends BasicTabbedPaneUI
 {
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint a close
+     * button on a tab.
+     */
+    private static final String CLOSE_TAB_ICON =
+        "service.gui.lookandfeel.CLOSE_TAB_ICON";
+
+    /**
+     * The image used in the <tt>SIPCommLookAndFeel</tt> to paint a rollover
+     * close button on a tab.
+     */
+    private static final String CLOSE_TAB_SELECTED_ICON =
+        "service.gui.lookandfeel.CLOSE_TAB_SELECTED_ICON";
+
     // Instance variables initialized at installation
     private ContainerListener containerListener;
 
@@ -101,12 +116,12 @@ public class SIPCommTabbedPaneUI
     {
         super();
 
-        closeImgB = ImageLoader.getImage(ImageLoader.CLOSE_TAB_SELECTED_ICON);
+        closeImgB = SwingCommonActivator.getImage(CLOSE_TAB_SELECTED_ICON);
 
         maxImgB = new BufferedImage(BUTTONSIZE, BUTTONSIZE,
                 BufferedImage.TYPE_4BYTE_ABGR);
 
-        closeImgI = ImageLoader.getImage(ImageLoader.CLOSE_TAB_ICON);
+        closeImgI = SwingCommonActivator.getImage(CLOSE_TAB_ICON);
 
         maxImgI = new BufferedImage(BUTTONSIZE, BUTTONSIZE,
                 BufferedImage.TYPE_4BYTE_ABGR);