Applying new resource name convention.

115 files changed, 2060 insertions, 1694 deletions

diff --git a/resources/colors/colors.properties b/resources/colors/colors.properties
index 278357e..0454874 100644
--- a/resources/colors/colors.properties
+++ b/resources/colors/colors.properties
@@ -1,168 +1,159 @@
 # Look & Feel color constants
 
 # Used to paint a gradient for a check box or a radio button.
-buttonGradientDark=3f6296
+service.gui.BUTTON_GRADIENT_DARK=3f6296
 
 # Used to paint a gradient for sliders.
-sliderGradientDark=3f6296
+service.gui.SLIDER_GRADIENT_DARK=3f6296
 
 # Used for tooltip borders, progress bar selection background, scroll bar
 # thumb shadow, tabbed pane focus, toolbar docking foreground.
-primaryControlDarkShadow=3f6296
+service.gui.PRIMARY_CONTROL_DARK_SHADOW=3f6296
 
 # Used for progress bar border, tooltip border inactive, tooltip foreground
 # inactive, scroll bar dark shadow.
-controlDarkShadow=3f6296
+service.gui.CONTROL_DARK_SHADOW=3f6296
 
 # Used to paint a gradient for a check box or a radio button.
-buttonGradientLight=C0C0C0
+service.gui.BUTTON_GRADIENT_LIGHT=C0C0C0
 
 # These two are not used for now.
-scrollBarTrackHighlight=C0C0C0
-scrollBarDarkShadow=C0C0C0
+service.gui.SCROLLBAR_TRACK_LIGHT=C0C0C0
+service.gui.SCROLLBAR_DARK_SHADOW=C0C0C0
 
 # Used for text hightlight color, window title background, scroll bar thumb
 # hightlight, split pane devider focus color, tree line, tree hash,
 # toolBar floating foreground.
-primaryControlColor=C0C0C0
+service.gui.PRIMARY_COLOR_CONTROL=C0C0C0
 
 # Tabbed pane shadow.
-controlShadow=C0C0C0
+service.gui.CONTROL_SHADOW=C0C0C0
 
 # Used to paint a gradient for sliders.
-sliderGradientLight=D3DDED
+service.gui.SLIDER_GRADIENT_LIGHT=D3DDED
 
 # Table grid color.
-tableGrid=D3DDED
+service.gui.TABLE_GRID=D3DDED
 
-# Used to paint a focused split pane devider.
-splitPaneDeviderFocused=D3DDED
+# Used to paint a focused split pane divider.
+service.gui.SPLIT_PANE_DIVIDER_FOCUSED=D3DDED
 
 # Foreground color for selected components.
-selectionForeground=474747
+service.gui.SELECTION_FOREGROUND=474747
 
 # Background color for selected components.
-selectionBackground=EEEEEE
+service.gui.SELECTION_BACKGROUND=EEEEEE
 
 # Used for window title inactive background, menu background, tooltip
 # inactive background, combo box background, desktop icon background,
 # scroll bar background, tabbed pane tab area background.
-controlColor=EEEEEE
+service.gui.colors.CONTROL=EEEEEE
 
 # Tabbed pane border highlight color.
-tabbedPaneBorderHighlight=96A9C6
+service.gui.TABBED_PANE_BORDER_HIGHLIGHT=96A9C6
 
 # Used for menu selected background, focus color, slider foreground,
 # progress bar foreground, combo box selection background, scroll bar thumb
-primaryControlShadow=96A9C6
+service.gui.PRIMARY_CONTROL_SHADOW=96A9C6
 
 # Background color for all windows.
-desktopBackgroundColor=e1f0fd
+service.gui.DESKTOP_BACKGROUND=E1F0FD
 
 # Text color for all texts.
-textColor=333333
+service.gui.TEXT=333333
 
 # Used for inactive labels, text areas, etc.
-inactiveTextColor=999999
+service.gui.INACTIVE_TEXT=999999
 
 # Foreground color for disabled menus.
-menuDisabledForeground=999999
+service.gui.MENU_DISABLED_FOREGROUND=999999
 
 # Color used in tab title for non read incoming messages.
-tabTitleHighlight=F9750A
+service.gui.TAB_TITLE_HIGHLIGHT=F9750A
 
 # Tab default text color.
-tabTitle=474747
+service.gui.TAB_TITLE=474747
 
 # Custom components GUI constants
 
 # Background color for incoming call lines in the call list.
-historyIncomingCallBackground=F9FFC5
+service.gui.HISTORY_INCOMING_CALL_BACKGROUND=F9FFC5
 
 # Background color for outgoing call lines in the call list.
-historyOutgoingCallBackground=F3F4F7
+service.gui.HISTORY_OUTGOING_CALL_BACKGROUND=F3F4F7
 
 # Selection color for all lists (contact list, call list, chat rooms list, etc.)
-listSelectionColor=add2ef
+service.gui.LIST_SELECTION_COLOR=ADD2EF
 
 # Selection border color of all lists (contact list, call list, chat rooms list, etc.)
-listSelectionBorderColor=8EA0BC
+service.gui.LIST_SELECTION_BORDER_COLOR=8EA0BC
 
 # Used for title panels (like the one in the settings window) and 
 # call participant dialpad panel.
-gradientDarkColor=E6E6E6
+service.gui.GRADIENT_DARK_COLOR=E6E6E6
 
 # Used as the light color for some gradients like in title panels,
 # call participant dialpad panel, chat contact panel ( the one in chat window
 # that contains the contact information) 
-gradientLightColor=FFFFFF
+service.gui.GRADIENT_LIGHT_COLOR=FFFFFF
 
 # Used for some custom borders, like the border in the chat window.
-borderColor=8EA0BC
+service.gui.BORDER_COLOR=8EA0BC
 
 # Splash screen text color.
-splashScreenTextColor=333333
+service.gui.SPLASH_SCREEN_TEXT_COLOR=333333
 
 # Splash screen title color.
-splashScreenTitleColor=375684
+service.gui.SPLASH_SCREEN_TITLE_COLOR=375684
 
 # Background color for the contact list background.
-contactListBackground=FFFFFF
+service.gui.CONTACT_LIST_BACKGROUND=FFFFFF
 
 # Main menu foreground color
-mainMenuForeground=333333
+service.gui.MAIN_MENU_FOREGROUND=333333
 
 # Chat menu foreground color
-chatMenuForeground=333333
+service.gui.CHAT_MENU_FOREGROUND=333333
 
 # Logo bar background color
-logoBarBackground=FFFFFF 
+service.gui.LOGO_BAR_BACKGROUND=FFFFFF
 
 # Main tool bar text foreground
-toolBarForeground=FFFFFF
+service.gui.TOOL_BAR_FOREGROUND=FFFFFF
 
 # Initial account registration protocol panel background.
-accountRegistrationBackground=C2CEE0
+plugin.simpleaccreg.ACCOUNT_REGISTRATION_BACKGROUND=C2CEE0
 
 # Contact list contact row color.
-contactListRowColor=add2ef
+service.gui.CONTACT_LIST_ROW=ADD2EF
 
 # Contact list group row background color.
-contactListGroupRowColor=d3d3d3
+service.gui.CONTACT_LIST_GROUP_ROW=D3D3D3
 
 # Contact list gradient group color.
-contactListGroupGradientColor=FFFFFF
+service.gui.CONTACT_LIST_GROUP_GRADIENT=FFFFFF
 
 # Main window background color.
-
-mainWindowBackground=FFFFFF
+service.gui.MAIN_WINDOW_BACKGROUND=FFFFFF
 
 # Tooltip background color.
-tooltipBackground=E8E9EF
+service.gui.TOOLTIP_BACKGROUND=E8E9EF
 
 # Rollover color for the toolbar button.
-toolbarRolloverBackground=414141
+service.gui.TOOL_BAR_ROLLOVER_BACKGROUND=414141
 
 # Contactlist contact text foreground color.
-contactListContactForeground=000000
+service.gui.CONTACT_LIST_CONTACT_FOREGROUND=000000
 
 # Contactlist group text foreground color.
-
-contactListGroupForeground=000000
-
-# Tooltip background.
-
-tooltipBackground=e8e9ef
+service.gui.CONTACT_LIST_GROUP_FOREGROUND=000000
 
 # The background color of all windows and dialogs.
-mainBackground=0575ce
-
-# The start color of the gradient painted to all windows.
-mainBackgroundStartColor=4a9bdb
+service.gui.MAIN_BACKGROUND=4A9BDB
 
 # The end color of the gradient painted to all windows.
-mainBackgroundEndColor=e1f0fd
+service.gui.MAIN_BACKGROUND_GRADIENT=E1F0FD
 
-actionPanelBgStartColor=474747
+service.gui.FAVORITES_PANEL_BACKGROUND=474747
 
-actionPanelBgEndColor=999999
+service.gui.FAVORITES_PANEL_BACKGROUND_GRADIENT=999999
diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties
index 58dd830..0daef98 100644
--- a/resources/config/defaults.properties
+++ b/resources/config/defaults.properties
@@ -1,56 +1,57 @@
-net.java.sip.communicator.impl.msghistory.isMessageHistoryEnabled=true
-net.java.sip.communicator.impl.gui.autoPopupNewMessage=false
-net.java.sip.communicator.impl.gui.sendMessageCommand=Enter
-net.java.sip.communicator.impl.gui.sendTypingNotifications=true
-net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled=true
-net.java.sip.communicator.impl.gui.isMessageHistoryShown=true
-net.java.sip.communicator.impl.gui.messageHistorySize=10
-net.java.sip.communicator.impl.gui.isTransparentWindowEnabled=false
-net.java.sip.communicator.impl.gui.windowTransparency=180
-net.java.sip.communicator.impl.gui.isWindowDecorated=true
-net.java.sip.communicator.impl.gui.isWindowImageBackgroundEnabled=false
-net.java.sip.communicator.impl.gui.isWindowColorBackgroundEnabled=true
+# service.gui
+service.gui.APPLICATION_NAME=SIP Communicator
+service.gui.APPLICATION_WEB_SITE=http://sip-communicator.org
+service.gui.FONT_NAME=Verdana
+service.gui.FONT_SIZE=12
+service.gui.AUTO_POPUP_NEW_MESSAGE=false
+service.gui.SEND_MESSAGE_COMMAND=Enter
+service.gui.SEND_TYPING_NOTIFICATIONS_ENABLED=true
+service.gui.IS_MULTI_CHAT_WINDOW_ENABLED=true
+service.gui.IS_MESSAGE_HISTORY_SHOWN=true
+service.gui.MESSAGE_HISTORY_SIZE=10
+service.gui.HTML_TEXT_STYLE=resources/styles/defaultStyle.css
 
-applicationName=SIP Communicator
-applicationWebSite=http://sip-communicator.org
-fontName=Verdana
-fontSize=12
-titleFontSize=14
-isLookAndFeelDecorated=false
-isToolBarExteneded=false
-defaultGroupName=
-preferredAccountWizard=
-tabOverlap=0
-mainWindowWidth=250
-mainWindowHeight=600
-minMainWindowWidth=100
-minMainWindowHeight=400
-chatWindowWidth=500
-chatWindowHeight=400
-logoBarWidth=0
-logoBarHeight=0
-mainToolbarButtonHeight=28
-mainToolbarButtonWidth=28
-dialPadWidth=150
-dialPadHeight=150
-dialPadHorizontalGap=5
-dialPadVerticalGap=5
-mainWindowBorderSize=10
-contactListRowTransparency=200
+# impl.gui
+impl.gui.IS_LOOK_AND_FEEL_DECORATED=false
+impl.gui.IS_TOOLBAR_EXTENDED=false
+impl.gui.DEFAULT_GROUP_NAME=
+impl.gui.PREFERRED_ACCOUNT_WIZARD=
+impl.gui.TAB_OVERLAP=0
+impl.gui.MAIN_WINDOW_WIDTH=250
+impl.gui.MAIN_WINDOW_HEIGHT=600
+impl.gui.MAIN_WINDOW_MIN_WIDTH=100
+impl.gui.MAIN_WINDOW_MIN_HEIGHT=400
+impl.gui.CHAT_WINDOW_WIDTH=500
+impl.gui.CHAT_WINDOW_HEIGHT=400
+impl.gui.LOGO_BAR_WIDTH=0
+impl.gui.LOGO_BAR_HEIGHT=0
+impl.gui.MAIN_TOOLBAR_BUTTON_HEIGHT=28
+impl.gui.MAIN_TOOLBAR_BUTTON_WIDTH=28
+impl.gui.DIAL_PAD_WIDTH=150
+impl.gui.DIAL_PAD_HEIGHT=150
+impl.gui.DIAL_PAD_HORIZONTAL_GAP=5
+impl.gui.DIAL_PAD_VERTICAL_GAP=5
+impl.gui.MAIN_WINDOW_BORDER_SIZE=10
+impl.gui.CONTACT_LIST_TRANSPARENCY=200
+impl.gui.IS_TRANSPARENT_WINDOW_ENABLED=false
+impl.gui.WINDOW_TRANSPARENCY=180
+impl.gui.IS_WINDOW_DECORATED=true
+impl.gui.IS_WINDOW_BACKGROUND_ENABLED=false
+impl.gui.IS_WINDOW_COLOR_BACKGROUND_ENABLED=true
+impl.gui.IS_TEXTURE_BACKGROUND=false
+impl.gui.GREY_HISTORY_ENABLED=false
 
-isTextureBackground=false
+# impl.msghistory
+impl.msghistory.IS_MESSAGE_HISTORY_ENABLED=true
 
 # branding
-aboutLogoFontSize=14
-aboutWindowTextIndent=180
-splashScreenTextIndent=190
-paragraphGap=10
-textStyle=resources/styles/defaultStyle.css
+plugin.branding.ABOUT_LOGO_FONT_SIZE=14
+plugin.branding.ABOUT_TEXT_INDENT=180
+plugin.branding.SPLASH_SCREEN_TEXT_INDENT=190
+plugin.branding.ABOUT_PARAGRAPH_GAP=10
 
 # jabber accregwizz
-commentsFile=net/java/sip/communicator/plugin/jabberaccregwizz/resources/servercomments.xml
+plugin.jabberaccregwizz.SERVER_COMMENTS=net/java/sip/communicator/plugin/jabberaccregwizz/resources/servercomments.xml
 
 # protocol order for the simple initial account registration wizard
-simpleWizards=SIP|MSN|Yahoo|ICQ|AIM|Jabber
-
-hiddenProtocolGreyHistoryDisabled=false
+plugin.simpleaccreg.PROTOCOL_ORDER=SIP|MSN|Yahoo|ICQ|AIM|Jabber
diff --git a/resources/images/images.properties b/resources/images/images.properties
index c212623..323e584 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -1,431 +1,350 @@
-# gui
-SIP_COMMUNICATOR_LOGO=resources/images/logo/sc_logo16x16.png
-
-ADD_ICON=resources/images/impl/gui/buttons/add.png
-ACCOUNT_ICON=resources/images/impl/gui/buttons/addAccount.png
-QUICK_MENU_ADD_ICON=resources/images/impl/gui/buttons/addContactIcon.png
-QUICK_MENU_CONFIGURE_ICON=resources/images/impl/gui/buttons/configureIcon.png
-QUICK_MENU_INFO_ICON=resources/images/impl/gui/buttons/infoIcon.png
-QUICK_MENU_SHOW_OFFLINE_ICON=resources/images/impl/gui/buttons/showOffline.png
-QUICK_MENU_HIDE_OFFLINE_ICON=resources/images/impl/gui/buttons/hideOffline.png
-QUICK_MENU_SOUND_ON_ICON=resources/images/impl/gui/buttons/soundOn.png
-QUICK_MENU_SOUND_OFF_ICON=resources/images/impl/gui/buttons/soundOff.png
-QUICK_MENU_MY_CHAT_ROOMS_ICON=resources/images/impl/gui/buttons/myChatRooms.png
-QUICK_MENU_CALL_HISTORY_ICON=resources/images/impl/gui/buttons/callHistory.png
-
-SEARCH_ICON=resources/images/impl/gui/buttons/searchIcon.png
-SEARCH_ICON_16x16=resources/images/impl/gui/common/searchIcon16x16.png
-CALL_BUTTON_BG=resources/images/impl/gui/buttons/callButton.png
-CALL_BUTTON_PRESSED_BG=resources/images/impl/gui/buttons/callButtonPressed.png
-HANGUP_BUTTON_BG=resources/images/impl/gui/buttons/hangupButton.png
-HANGUP_ROLLOVER_BUTTON_BG=resources/images/impl/gui/buttons/hangupButtonRollover.png
-HANGUP_BUTTON_PRESSED_BG=resources/images/impl/gui/buttons/hangupButtonPressed.png
-STATUS_SELECTOR_BOX=resources/images/impl/gui/buttons/combobox.png
-BUTTON_BG=resources/images/impl/gui/buttons/dialButtonBg.png
-BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/dialButtonRolloverBg.png
-ONE_DIAL_BUTTON=resources/images/impl/gui/buttons/one.png
-TWO_DIAL_BUTTON=resources/images/impl/gui/buttons/two.png
-THREE_DIAL_BUTTON=resources/images/impl/gui/buttons/three.png
-FOUR_DIAL_BUTTON=resources/images/impl/gui/buttons/four.png
-FIVE_DIAL_BUTTON=resources/images/impl/gui/buttons/five.png
-SIX_DIAL_BUTTON=resources/images/impl/gui/buttons/six.png
-SEVEN_DIAL_BUTTON=resources/images/impl/gui/buttons/seven.png
-EIGHT_DIAL_BUTTON=resources/images/impl/gui/buttons/eight.png
-NINE_DIAL_BUTTON=resources/images/impl/gui/buttons/nine.png
-STAR_DIAL_BUTTON=resources/images/impl/gui/buttons/star.png
-ZERO_DIAL_BUTTON=resources/images/impl/gui/buttons/zero.png
-DIEZ_DIAL_BUTTON=resources/images/impl/gui/buttons/diez.png
-DEFAULT_USER_PHOTO=resources/images/impl/gui/common/personPhoto.png
-USER_PHOTO_FRAME=resources/images/impl/gui/common/personPhotoFrame.png
-USER_PHOTO_SHADOW=resources/images/impl/gui/common/personPhotoShadow.png
-CALL_PANEL_MINIMIZE_BUTTON=resources/images/impl/gui/buttons/callPanelMinimizeButton.png
-CALL_PANEL_RESTORE_BUTTON=resources/images/impl/gui/buttons/callPanelRestoreButton.png
-CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/callPanelMinimizeButtonRollover.png
-CALL_PANEL_RESTORE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/callPanelRestoreButtonRollover.png
-ADD_TO_CHAT_ICON=resources/images/impl/gui/buttons/addToChat.png
-RIGHT_ARROW_ICON=resources/images/impl/gui/common/rightArrow.png
-DOWN_ARROW_ICON=resources/images/impl/gui/common/downArrow.png
-RIGHT_ARROW_ROLLOVER_ICON=resources/images/impl/gui/common/rightArrowRollover.png
-ALIGN_LEFT_BUTTON=resources/images/impl/gui/buttons/alignLeft.png
-ALIGN_RIGHT_BUTTON=resources/images/impl/gui/buttons/alignRight.png
-ALIGN_CENTER_BUTTON=resources/images/impl/gui/buttons/alignCenter.png
-ALIGN_LEFT_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/alignLeftRollover.png
-ALIGN_RIGHT_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/alignRightRollover.png
-ALIGN_CENTER_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/alignCenterRollover.png
-TEXT_BOLD_BUTTON=resources/images/impl/gui/buttons/textBold.png
-TEXT_ITALIC_BUTTON=resources/images/impl/gui/buttons/textItalic.png
-TEXT_UNDERLINED_BUTTON=resources/images/impl/gui/buttons/textUnderlined.png
-EDIT_TOOLBAR_BUTTON=resources/images/impl/gui/buttons/editToolbarButton.png
-EDIT_TOOLBAR_BUTTON_PRESSED=resources/images/impl/gui/buttons/editToolbarButtonPressed.png
-DIAL_BUTTON=resources/images/impl/gui/buttons/dialButton.png
-HOLD_BUTTON=resources/images/impl/gui/buttons/holdButton.png
-MUTE_BUTTON=resources/images/impl/gui/buttons/muteButton.png
-TRANSFER_CALL_BUTTON=resources/images/impl/gui/buttons/transferCallButton.png
-SECURE_BUTTON_ON=resources/images/impl/gui/buttons/secureOn.png
-SECURE_BUTTON_OFF=resources/images/impl/gui/buttons/secureOff.png
-ENTER_FULL_SCREEN_BUTTON=resources/images/impl/gui/buttons/enterFullScreen.png
-EXIT_FULL_SCREEN_BUTTON=resources/images/impl/gui/buttons/exitFullScreen.png
-INVITE_DIALOG_ICON=resources/images/impl/gui/common/inviteDialogIcon.png
-SEND_SMS_ICON=resources/images/impl/gui/common/gsm.png
-DIAL_BUTTON_BG=resources/images/impl/gui/buttons/dialButtonBg.png
-DIAL_BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/dialButtonRolloverBg.png
-MSG_TOOLBAR_BUTTON_BG=resources/images/impl/gui/buttons/msgToolbarBg.png
-MSG_TOOLBAR_ROLLOVER_BUTTON_BG=resources/images/impl/gui/buttons/msgToolBarRolloverBg.png
-COPY_ICON=resources/images/impl/gui/buttons/copy.png
-CUT_ICON=resources/images/impl/gui/buttons/cut.png
-PASTE_ICON=resources/images/impl/gui/buttons/paste.png
-SMILIES_ICON=resources/images/impl/gui/buttons/smiley.png
-SAVE_ICON=resources/images/impl/gui/buttons/save.png
-PRINT_ICON=resources/images/impl/gui/buttons/print.png
-CLOSE_ICON=resources/images/impl/gui/buttons/close.png
-PREVIOUS_ICON=resources/images/impl/gui/buttons/previous.png
-NEXT_ICON=resources/images/impl/gui/buttons/next.png
-HISTORY_ICON=resources/images/impl/gui/buttons/history.png
-SEND_FILE_ICON=resources/images/impl/gui/buttons/sendFile.png
-FONT_ICON=resources/images/impl/gui/buttons/fontIcon.png
-ADD_CONTACT_CHAT_ICON=resources/images/impl/gui/buttons/addContactChatIcon.png
-DELETE_BUTTON_ICON=resources/images/impl/gui/buttons/delete.png
-
-CHAT_CONTACT_INFO_BUTTON=resources/images/impl/gui/buttons/chatInfoButton.png
-CHAT_CONTACT_INFO_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatInfoButtonRollover.png
-CHAT_CONTACT_CALL_BUTTON=resources/images/impl/gui/buttons/chatCallButton.png
-CHAT_CONTACT_CALL_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatCallButtonRollover.png
-CHAT_CONTACT_SEND_FILE_BUTTON=resources/images/impl/gui/buttons/chatSendFile.png
-CHAT_SEND_FILE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatSendFileRollover.png
-CHAT_CONFIGURE_ICON=resources/images/impl/gui/buttons/chatConfigureIcon.png
-
-WARNING_ICON=resources/images/impl/gui/common/warning.png
-ERROR_ICON=resources/images/impl/gui/common/error.png
-INFO_ICON=resources/images/impl/gui/common/info.png
-
-SEND_MESSAGE_16x16_ICON=resources/images/impl/gui/common/sendMessage16x16.png
-CALL_16x16_ICON=resources/images/impl/gui/common/call16x16.png
-DELETE_16x16_ICON=resources/images/impl/gui/common/delete16x16.png
-HISTORY_16x16_ICON=resources/images/impl/gui/common/history16x16.png
-SEND_FILE_16x16_ICON=resources/images/impl/gui/common/sendFile16x16.png
-GROUPS_16x16_ICON=resources/images/impl/gui/common/groups16x16.png
-ADD_CONTACT_16x16_ICON=resources/images/impl/gui/common/addContact16x16.png
-RENAME_16x16_ICON=resources/images/impl/gui/common/rename16x16.png
-MORE_INFO_ICON=resources/images/impl/gui/common/moreInfo.png
-TOOLBAR_DRAG_ICON=resources/images/impl/gui/common/toolbarDragIcon.png
-ADD_GROUP_ICON=resources/images/impl/gui/common/addGroup.png
-MOVE_CONTACT=resources/images/impl/gui/common/moveContact.png
-
-SMILEY1=resources/images/impl/gui/common/smilies/default/smiley1.gif
-SMILEY2=resources/images/impl/gui/common/smilies/default/smiley2.gif
-SMILEY3=resources/images/impl/gui/common/smilies/default/smiley3.gif
-SMILEY4=resources/images/impl/gui/common/smilies/default/smiley4.gif
-SMILEY5=resources/images/impl/gui/common/smilies/default/smiley5.gif
-SMILEY6=resources/images/impl/gui/common/smilies/default/smiley6.gif
-SMILEY7=resources/images/impl/gui/common/smilies/default/smiley7.gif
-SMILEY8=resources/images/impl/gui/common/smilies/default/smiley8.gif
-SMILEY9=resources/images/impl/gui/common/smilies/default/smiley9.gif
-SMILEY10=resources/images/impl/gui/common/smilies/default/smiley10.gif
-SMILEY11=resources/images/impl/gui/common/smilies/default/smiley11.gif
-SMILEY12=resources/images/impl/gui/common/smilies/default/smiley12.gif
-
-AUTH_WINDOW_BACKGROUND=resources/images/impl/gui/common/passWindowBackground.png
-
-USER_ONLINE_ICON=resources/images/impl/gui/common/statusicons/online.png
-USER_OFFLINE_ICON=resources/images/impl/gui/common/statusicons/offline.png
-USER_AWAY_ICON=resources/images/impl/gui/common/statusicons/away.png
-USER_NA_ICON=resources/images/impl/gui/common/statusicons/na.png
-USER_DND_ICON=resources/images/impl/gui/common/statusicons/dnd.png
-USER_FFC_ICON=resources/images/impl/gui/common/statusicons/freeForChat.png
-USER_OCCUPIED_ICON=resources/images/impl/gui/common/statusicons/occupied.png
-
-CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
-CLOSE_TAB_SELECTED_ICON=resources/images/impl/gui/buttons/closeTabSelected.png
-
-SELECTED_TAB_LEFT_BG=resources/images/impl/gui/lookandfeel/selectedTabLeft.png
-SELECTED_TAB_MIDDLE_BG=resources/images/impl/gui/lookandfeel/selectedTabMiddle.png
-SELECTED_TAB_RIGHT_BG=resources/images/impl/gui/lookandfeel/selectedTabRight.png
-TAB_LEFT_BG=resources/images/impl/gui/lookandfeel/tabLeft.png
-TAB_MIDDLE_BG=resources/images/impl/gui/lookandfeel/tabMiddle.png
-TAB_RIGHT_BG=resources/images/impl/gui/lookandfeel/tabRight.png
-DELETE_TEXT_ICON=resources/images/impl/gui/lookandfeel/delete.png
-DELETE_TEXT_ROLLOVER_ICON=resources/images/impl/gui/lookandfeel/deleteRollover.png
-
-BUTTON=resources/images/impl/gui/lookandfeel/button1.png
-BUTTON_ROLLOVER=resources/images/impl/gui/lookandfeel/button2.png
-TOGGLE_BUTTON_PRESSED=resources/images/impl/gui/lookandfeel/button3.png
-TOGGLE_BUTTON=resources/images/impl/gui/lookandfeel/button4.png
-
-SPLITPANE_HORIZONTAL=resources/images/impl/gui/lookandfeel/splitpaneHorizontal.png
-SPLITPANE_VERTICAL=resources/images/impl/gui/lookandfeel/splitpaneVertical.png
-
-SCROLLBAR_HORIZONTAL=resources/images/impl/gui/lookandfeel/scrollbar_horiz2.png
-SCROLLBAR_VERTICAL=resources/images/impl/gui/lookandfeel/scrollbar_vert1.png
-SCROLLBAR_THUMB_HORIZONTAL=resources/images/impl/gui/lookandfeel/horizThumbHandle.png
-SCROLLBAR_THUMB_VERTICAL=resources/images/impl/gui/lookandfeel/vertThumbHandle.png
-
-ADD_CONTACT_WIZARD_ICON=resources/images/impl/gui/common/addContactWizardIcon.png
-RENAME_DIALOG_ICON=resources/images/impl/gui/common/renameDialogIcon.png
-
-BROWSER_ICON=resources/images/impl/gui/common/browser16x16.png
-
-AUTHORIZATION_ICON=resources/images/impl/gui/common/padlock.gif
-
-INCOMING_CALL=resources/images/impl/gui/common/incomingCall.png
-OUTGOING_CALL=resources/images/impl/gui/common/outgoingCall.png
-
-EXCLAMATION_MARK=resources/images/impl/gui/common/exclamationMark.png
-
-ABOUT_WINDOW_BACKGROUND=resources/images/impl/gui/common/aboutWindowBackground.png
-
-OPENED_GROUP=resources/images/impl/gui/common/openedGroup.png
-CLOSED_GROUP=resources/images/impl/gui/common/closedGroup.png
-
-CHAT_ROOM_16x16_ICON=resources/images/impl/gui/common/chatRoom16x16.png
-CHAT_SERVER_16x16_ICON=resources/images/impl/gui/common/multiUserChatServer16x16.png
-
-MESSAGE_RECEIVED_ICON=resources/images/impl/gui/common/envelope.png
-
-REASON_DIALOG_ICON=resources/images/impl/gui/common/reasonDialogIcon.png
-
-JOIN_ICON=resources/images/impl/gui/common/join.png
-JOIN_AS_ICON=resources/images/impl/gui/common/join.png
-LEAVE_ICON=resources/images/impl/gui/common/leave.png
-
-STATUS_SEPARATOR_ICON=resources/images/impl/gui/common/statusSeparator.png
-
-MORE_BUTTON=resources/images/impl/gui/buttons/moreButton.png
-MORE_ACTIONS_BUTTON=resources/images/impl/gui/buttons/moreActions.png
-MORE_ACTIONS_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/moreActionsRollover.png
-HIDE_ACTIONS_BUTTON=resources/images/impl/gui/buttons/hideMoreActions.png
-HIDE_ACTIONS_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/hideMoreActionsRollover.png
-
-TOOL_BAR_BACKGROUND=resources/images/impl/gui/common/toolbarBackground.png
-MENU_BACKGROUND=resources/images/impl/gui/common/menuBackground.png
-WINDOW_TITLE_BAR=resources/images/impl/gui/common/windowTitleBarBackground.png
-WINDOW_TITLE_BAR_BG=resources/images/impl/gui/common/windowTitleBar.png
-MAIN_WINDOW_BACKGROUND=
+# service gui
+service.gui.SIP_COMMUNICATOR_LOGO=resources/images/logo/sc_logo16x16.png
+service.gui.MAIN_WINDOW_BACKGROUND=
+service.gui.AUTH_WINDOW_BACKGROUND=resources/images/impl/gui/common/passWindowBackground.png
+service.gui.ABOUT_WINDOW_BACKGROUND=resources/images/impl/gui/common/aboutWindowBackground.png
+service.gui.TOOL_BAR_BACKGROUND=resources/images/impl/gui/common/toolbarBackground.png
+service.gui.MENU_BACKGROUND=resources/images/impl/gui/common/menuBackground.png
+service.gui.WINDOW_TITLE_BAR=resources/images/impl/gui/common/windowTitleBarBackground.png
+service.gui.WINDOW_TITLE_BAR_BG=resources/images/impl/gui/common/windowTitleBar.png
+service.gui.USER_PHOTO_FRAME=resources/images/impl/gui/common/personPhotoFrame.png
+service.gui.USER_PHOTO_SHADOW=resources/images/impl/gui/common/personPhotoShadow.png
+service.gui.DEFAULT_USER_PHOTO=resources/images/impl/gui/common/personPhoto.png
+
+# service gui icons
+service.gui.icons.ADD_ICON=resources/images/impl/gui/buttons/add.png
+service.gui.icons.ACCOUNT_ICON=resources/images/impl/gui/buttons/addAccount.png
+service.gui.icons.QUICK_MENU_ADD_ICON=resources/images/impl/gui/buttons/addContactIcon.png
+service.gui.icons.QUICK_MENU_CONFIGURE_ICON=resources/images/impl/gui/buttons/configureIcon.png
+service.gui.icons.QUICK_MENU_INFO_ICON=resources/images/impl/gui/buttons/infoIcon.png
+service.gui.icons.QUICK_MENU_SHOW_OFFLINE_ICON=resources/images/impl/gui/buttons/showOffline.png
+service.gui.icons.QUICK_MENU_HIDE_OFFLINE_ICON=resources/images/impl/gui/buttons/hideOffline.png
+service.gui.icons.QUICK_MENU_SOUND_ON_ICON=resources/images/impl/gui/buttons/soundOn.png
+service.gui.icons.QUICK_MENU_SOUND_OFF_ICON=resources/images/impl/gui/buttons/soundOff.png
+service.gui.icons.QUICK_MENU_MY_CHAT_ROOMS_ICON=resources/images/impl/gui/buttons/myChatRooms.png
+service.gui.icons.SEARCH_ICON=resources/images/impl/gui/buttons/searchIcon.png
+service.gui.icons.SEARCH_ICON_16x16=resources/images/impl/gui/common/searchIcon16x16.png
+service.gui.icons.ADD_TO_CHAT_ICON=resources/images/impl/gui/buttons/addToChat.png
+service.gui.icons.RIGHT_ARROW_ICON=resources/images/impl/gui/common/rightArrow.png
+service.gui.icons.DOWN_ARROW_ICON=resources/images/impl/gui/common/downArrow.png
+service.gui.icons.INVITE_DIALOG_ICON=resources/images/impl/gui/common/inviteDialogIcon.png
+service.gui.icons.SEND_SMS_ICON=resources/images/impl/gui/common/gsm.png
+service.gui.icons.COPY_ICON=resources/images/impl/gui/buttons/copy.png
+service.gui.icons.CUT_ICON=resources/images/impl/gui/buttons/cut.png
+service.gui.icons.PASTE_ICON=resources/images/impl/gui/buttons/paste.png
+service.gui.icons.SMILIES_ICON=resources/images/impl/gui/buttons/smiley.png
+service.gui.icons.SAVE_ICON=resources/images/impl/gui/buttons/save.png
+service.gui.icons.PRINT_ICON=resources/images/impl/gui/buttons/print.png
+service.gui.icons.CLOSE_ICON=resources/images/impl/gui/buttons/close.png
+service.gui.icons.PREVIOUS_ICON=resources/images/impl/gui/buttons/previous.png
+service.gui.icons.NEXT_ICON=resources/images/impl/gui/buttons/next.png
+service.gui.icons.HISTORY_ICON=resources/images/impl/gui/buttons/history.png
+service.gui.icons.SEND_FILE_ICON=resources/images/impl/gui/buttons/sendFile.png
+service.gui.icons.FONT_ICON=resources/images/impl/gui/buttons/fontIcon.png
+service.gui.icons.ADD_CONTACT_CHAT_ICON=resources/images/impl/gui/buttons/addContactChatIcon.png
+service.gui.icons.CHAT_CONFIGURE_ICON=resources/images/impl/gui/buttons/chatConfigureIcon.png
+service.gui.icons.WARNING_ICON=resources/images/impl/gui/common/warning.png
+service.gui.icons.ERROR_ICON=resources/images/impl/gui/common/error.png
+service.gui.icons.INFO_ICON=resources/images/impl/gui/common/info.png
+service.gui.icons.SEND_MESSAGE_16x16_ICON=resources/images/impl/gui/common/sendMessage16x16.png
+service.gui.icons.CALL_16x16_ICON=resources/images/impl/gui/common/call16x16.png
+service.gui.icons.DELETE_16x16_ICON=resources/images/impl/gui/common/delete16x16.png
+service.gui.icons.HISTORY_16x16_ICON=resources/images/impl/gui/common/history16x16.png
+service.gui.icons.SEND_FILE_16x16_ICON=resources/images/impl/gui/common/sendFile16x16.png
+service.gui.icons.GROUPS_16x16_ICON=resources/images/impl/gui/common/groups16x16.png
+service.gui.icons.ADD_CONTACT_16x16_ICON=resources/images/impl/gui/common/addContact16x16.png
+service.gui.icons.RENAME_16x16_ICON=resources/images/impl/gui/common/rename16x16.png
+service.gui.icons.TOOLBAR_DRAG_ICON=resources/images/impl/gui/common/toolbarDragIcon.png
+service.gui.icons.ADD_GROUP_ICON=resources/images/impl/gui/common/addGroup.png
+service.gui.icons.MOVE_CONTACT=resources/images/impl/gui/common/moveContact.png
+service.gui.icons.ADD_CONTACT_WIZARD_ICON=resources/images/impl/gui/common/addContactWizardIcon.png
+service.gui.icons.RENAME_DIALOG_ICON=resources/images/impl/gui/common/renameDialogIcon.png
+service.gui.icons.BROWSER_ICON=resources/images/impl/gui/common/browser16x16.png
+service.gui.icons.AUTHORIZATION_ICON=resources/images/impl/gui/common/padlock.gif
+service.gui.icons.INCOMING_CALL=resources/images/impl/gui/common/incomingCall.png
+service.gui.icons.OUTGOING_CALL=resources/images/impl/gui/common/outgoingCall.png
+service.gui.icons.EXCLAMATION_MARK=resources/images/impl/gui/common/exclamationMark.png
+service.gui.icons.OPENED_GROUP=resources/images/impl/gui/common/openedGroup.png
+service.gui.icons.CLOSED_GROUP=resources/images/impl/gui/common/closedGroup.png
+service.gui.icons.CHAT_ROOM_16x16_ICON=resources/images/impl/gui/common/chatRoom16x16.png
+service.gui.icons.CHAT_SERVER_16x16_ICON=resources/images/impl/gui/common/multiUserChatServer16x16.png
+service.gui.icons.MESSAGE_RECEIVED_ICON=resources/images/impl/gui/common/envelope.png
+service.gui.icons.REASON_DIALOG_ICON=resources/images/impl/gui/common/reasonDialogIcon.png
+service.gui.icons.JOIN_ICON=resources/images/impl/gui/common/join.png
+service.gui.icons.JOIN_AS_ICON=resources/images/impl/gui/common/join.png
+service.gui.icons.LEAVE_ICON=resources/images/impl/gui/common/leave.png
+
+# Status icons
+service.gui.statusicons.USER_ONLINE_ICON=resources/images/impl/gui/common/statusicons/online.png
+service.gui.statusicons.USER_OFFLINE_ICON=resources/images/impl/gui/common/statusicons/offline.png
+service.gui.statusicons.USER_AWAY_ICON=resources/images/impl/gui/common/statusicons/away.png
+service.gui.statusicons.USER_NA_ICON=resources/images/impl/gui/common/statusicons/na.png
+service.gui.statusicons.USER_DND_ICON=resources/images/impl/gui/common/statusicons/dnd.png
+service.gui.statusicons.USER_FFC_ICON=resources/images/impl/gui/common/statusicons/freeForChat.png
+service.gui.statusicons.USER_OCCUPIED_ICON=resources/images/impl/gui/common/statusicons/occupied.png
+
+# service gui buttons
+service.gui.buttons.CALL_BUTTON_BG=resources/images/impl/gui/buttons/callButton.png
+service.gui.buttons.CALL_BUTTON_PRESSED_BG=resources/images/impl/gui/buttons/callButtonPressed.png
+service.gui.buttons.HANGUP_BUTTON_BG=resources/images/impl/gui/buttons/hangupButton.png
+service.gui.buttons.HANGUP_ROLLOVER_BUTTON_BG=resources/images/impl/gui/buttons/hangupButtonRollover.png
+service.gui.buttons.HANGUP_BUTTON_PRESSED_BG=resources/images/impl/gui/buttons/hangupButtonPressed.png
+service.gui.buttons.STATUS_SELECTOR_BOX=resources/images/impl/gui/buttons/combobox.png
+service.gui.buttons.BUTTON_BG=resources/images/impl/gui/buttons/dialButtonBg.png
+service.gui.buttons.BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/dialButtonRolloverBg.png
+service.gui.buttons.ONE_DIAL_BUTTON=resources/images/impl/gui/buttons/one.png
+service.gui.buttons.TWO_DIAL_BUTTON=resources/images/impl/gui/buttons/two.png
+service.gui.buttons.THREE_DIAL_BUTTON=resources/images/impl/gui/buttons/three.png
+service.gui.buttons.FOUR_DIAL_BUTTON=resources/images/impl/gui/buttons/four.png
+service.gui.buttons.FIVE_DIAL_BUTTON=resources/images/impl/gui/buttons/five.png
+service.gui.buttons.SIX_DIAL_BUTTON=resources/images/impl/gui/buttons/six.png
+service.gui.buttons.SEVEN_DIAL_BUTTON=resources/images/impl/gui/buttons/seven.png
+service.gui.buttons.EIGHT_DIAL_BUTTON=resources/images/impl/gui/buttons/eight.png
+service.gui.buttons.NINE_DIAL_BUTTON=resources/images/impl/gui/buttons/nine.png
+service.gui.buttons.STAR_DIAL_BUTTON=resources/images/impl/gui/buttons/star.png
+service.gui.buttons.ZERO_DIAL_BUTTON=resources/images/impl/gui/buttons/zero.png
+service.gui.buttons.DIEZ_DIAL_BUTTON=resources/images/impl/gui/buttons/diez.png
+service.gui.buttons.CALL_PANEL_MINIMIZE_BUTTON=resources/images/impl/gui/buttons/callPanelMinimizeButton.png
+service.gui.buttons.CALL_PANEL_RESTORE_BUTTON=resources/images/impl/gui/buttons/callPanelRestoreButton.png
+service.gui.buttons.CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/callPanelMinimizeButtonRollover.png
+service.gui.buttons.CALL_PANEL_RESTORE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/callPanelRestoreButtonRollover.png
+service.gui.buttons.TEXT_BOLD_BUTTON=resources/images/impl/gui/buttons/textBold.png
+service.gui.buttons.TEXT_ITALIC_BUTTON=resources/images/impl/gui/buttons/textItalic.png
+service.gui.buttons.TEXT_UNDERLINED_BUTTON=resources/images/impl/gui/buttons/textUnderlined.png
+service.gui.buttons.EDIT_TOOLBAR_BUTTON=resources/images/impl/gui/buttons/editToolbarButton.png
+service.gui.buttons.EDIT_TOOLBAR_BUTTON_PRESSED=resources/images/impl/gui/buttons/editToolbarButtonPressed.png
+service.gui.buttons.DIAL_BUTTON=resources/images/impl/gui/buttons/dialButton.png
+service.gui.buttons.HOLD_BUTTON=resources/images/impl/gui/buttons/holdButton.png
+service.gui.buttons.MUTE_BUTTON=resources/images/impl/gui/buttons/muteButton.png
+service.gui.buttons.TRANSFER_CALL_BUTTON=resources/images/impl/gui/buttons/transferCallButton.png
+service.gui.buttons.SECURE_BUTTON_ON=resources/images/impl/gui/buttons/secureOn.png
+service.gui.buttons.SECURE_BUTTON_OFF=resources/images/impl/gui/buttons/secureOff.png
+service.gui.buttons.ENTER_FULL_SCREEN_BUTTON=resources/images/impl/gui/buttons/enterFullScreen.png
+service.gui.buttons.EXIT_FULL_SCREEN_BUTTON=resources/images/impl/gui/buttons/exitFullScreen.png
+service.gui.buttons.DIAL_BUTTON_BG=resources/images/impl/gui/buttons/dialButtonBg.png
+service.gui.buttons.DIAL_BUTTON_ROLLOVER_BG=resources/images/impl/gui/buttons/dialButtonRolloverBg.png
+service.gui.buttons.CHAT_CONTACT_INFO_BUTTON=resources/images/impl/gui/buttons/chatInfoButton.png
+service.gui.buttons.CHAT_CONTACT_INFO_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatInfoButtonRollover.png
+service.gui.buttons.CHAT_CONTACT_CALL_BUTTON=resources/images/impl/gui/buttons/chatCallButton.png
+service.gui.buttons.CHAT_CONTACT_CALL_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatCallButtonRollover.png
+service.gui.buttons.CHAT_CONTACT_SEND_FILE_BUTTON=resources/images/impl/gui/buttons/chatSendFile.png
+service.gui.buttons.CHAT_SEND_FILE_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/chatSendFileRollover.png
+service.gui.buttons.MORE_BUTTON=resources/images/impl/gui/buttons/moreButton.png
+service.gui.buttons.MORE_ACTIONS_BUTTON=resources/images/impl/gui/buttons/moreActions.png
+service.gui.buttons.MORE_ACTIONS_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/moreActionsRollover.png
+service.gui.buttons.HIDE_ACTIONS_BUTTON=resources/images/impl/gui/buttons/hideMoreActions.png
+service.gui.buttons.HIDE_ACTIONS_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/hideMoreActionsRollover.png
+
+# Smilies icons
+service.gui.smilies.SMILEY1=resources/images/impl/gui/common/smilies/default/smiley1.gif
+service.gui.smilies.SMILEY2=resources/images/impl/gui/common/smilies/default/smiley2.gif
+service.gui.smilies.SMILEY3=resources/images/impl/gui/common/smilies/default/smiley3.gif
+service.gui.smilies.SMILEY4=resources/images/impl/gui/common/smilies/default/smiley4.gif
+service.gui.smilies.SMILEY5=resources/images/impl/gui/common/smilies/default/smiley5.gif
+service.gui.smilies.SMILEY6=resources/images/impl/gui/common/smilies/default/smiley6.gif
+service.gui.smilies.SMILEY7=resources/images/impl/gui/common/smilies/default/smiley7.gif
+service.gui.smilies.SMILEY8=resources/images/impl/gui/common/smilies/default/smiley8.gif
+service.gui.smilies.SMILEY9=resources/images/impl/gui/common/smilies/default/smiley9.gif
+service.gui.smilies.SMILEY10=resources/images/impl/gui/common/smilies/default/smiley10.gif
+service.gui.smilies.SMILEY11=resources/images/impl/gui/common/smilies/default/smiley11.gif
+service.gui.smilies.SMILEY12=resources/images/impl/gui/common/smilies/default/smiley12.gif
+
+# Look and Feel images
+service.gui.lookandfeel.CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
+service.gui.lookandfeel.CLOSE_TAB_SELECTED_ICON=resources/images/impl/gui/buttons/closeTabSelected.png
+service.gui.lookandfeel.SELECTED_TAB_LEFT_BG=resources/images/impl/gui/lookandfeel/selectedTabLeft.png
+service.gui.lookandfeel.SELECTED_TAB_MIDDLE_BG=resources/images/impl/gui/lookandfeel/selectedTabMiddle.png
+service.gui.lookandfeel.SELECTED_TAB_RIGHT_BG=resources/images/impl/gui/lookandfeel/selectedTabRight.png
+service.gui.lookandfeel.TAB_LEFT_BG=resources/images/impl/gui/lookandfeel/tabLeft.png
+service.gui.lookandfeel.TAB_MIDDLE_BG=resources/images/impl/gui/lookandfeel/tabMiddle.png
+service.gui.lookandfeel.TAB_RIGHT_BG=resources/images/impl/gui/lookandfeel/tabRight.png
+service.gui.lookandfeel.DELETE_TEXT_ICON=resources/images/impl/gui/lookandfeel/delete.png
+service.gui.lookandfeel.DELETE_TEXT_ROLLOVER_ICON=resources/images/impl/gui/lookandfeel/deleteRollover.png
+service.gui.lookandfeel.BUTTON=resources/images/impl/gui/lookandfeel/button1.png
+service.gui.lookandfeel.BUTTON_ROLLOVER=resources/images/impl/gui/lookandfeel/button2.png
+service.gui.lookandfeel.TOGGLE_BUTTON_PRESSED=resources/images/impl/gui/lookandfeel/button3.png
+service.gui.lookandfeel.TOGGLE_BUTTON=resources/images/impl/gui/lookandfeel/button4.png
+service.gui.lookandfeel.SPLITPANE_HORIZONTAL=resources/images/impl/gui/lookandfeel/splitpaneHorizontal.png
+service.gui.lookandfeel.SPLITPANE_VERTICAL=resources/images/impl/gui/lookandfeel/splitpaneVertical.png
+service.gui.lookandfeel.SCROLLBAR_HORIZONTAL=resources/images/impl/gui/lookandfeel/scrollbar_horiz2.png
+service.gui.lookandfeel.SCROLLBAR_VERTICAL=resources/images/impl/gui/lookandfeel/scrollbar_vert1.png
+service.gui.lookandfeel.SCROLLBAR_THUMB_HORIZONTAL=resources/images/impl/gui/lookandfeel/horizThumbHandle.png
+service.gui.lookandfeel.SCROLLBAR_THUMB_VERTICAL=resources/images/impl/gui/lookandfeel/vertThumbHandle.png
 
 # systray
-trayIcon=resources/images/impl/systray/systrayIcon.png
-trayIconOffline=resources/images/impl/systray/systrayIconOffline.png
-trayIconAway=resources/images/impl/systray/systrayIconAway.png
-trayIconFFC=resources/images/impl/systray/systrayIconFFC.png
-trayIconWindows=resources/images/impl/systray/systrayIconWindows.png
-trayIconWindowsOffline=resources/images/impl/systray/systrayIconWindowsOffline.png
-trayIconWindowsAway=resources/images/impl/systray/systrayIconWindowsAway.png
-trayIconWindowsFFC=resources/images/impl/systray/systrayIconWindowsFFC.png
-trayIconMacOSX=resources/images/impl/systray/systrayIconMacOSX.png
-trayIconMacOSXWhite=resources/images/impl/systray/systrayIconMacOSXWhite.png
-dockIconOffline=resources/images/impl/systray/dock-offline.png
-dockIconAway=resources/images/impl/systray/dock-away.png
-dockIconFFC=resources/images/impl/systray/dock-chatty.png
-addContactIcon=resources/images/impl/gui/buttons/addContactIcon.png
-statusMenuIcon=resources/images/impl/systray/statusIcon.png
-settingsMenuIcon=resources/images/impl/gui/buttons/configureIcon.png
-closeMenuIcon=resources/images/impl/systray/quit.png
-messageIcon=resources/images/impl/systray/envelope.png
-messageIconWindows=resources/images/impl/systray/envelopeWindows.png
-messageIconMacOSX=resources/images/impl/systray/envelopeMacOSX.png
-messageIconMacOSXWhite=resources/images/impl/systray/envelopeMacOSXWhite.png
-newStatusMessageIcon=resources/images/impl/gui/common/renameDialogIcon.png
-
-# dict accregwizz
-protocolIconDict=resources/images/protocol/dict/dict-16x16.png
-pageImageDict=resources/images/protocol/dict/dict-64x64.png
-
-# icq accregwiz
-protocolIconIcq=resources/images/protocol/icq/icq16x16-online.png
-pageImageIcq=resources/images/protocol/icq/icq64x64.png
-icqConnectingIcon=resources/images/protocol/icq/cr16-action-icq_connecting-1.gif
-icqFfcIcon=resources/images/protocol/icq/icq16x16-ffc.png
-icqInvisibleIcon=resources/images/protocol/icq/icq16x16-invisible.png
-icqAwayIcon=resources/images/protocol/icq/icq16x16-away.png
-icqNaIcon=resources/images/protocol/icq/icq16x16-na.png
-icqDndIcon=resources/images/protocol/icq/icq16x16-dnd.png
-icqOccupiedIcon=resources/images/protocol/icq/icq16x16-occupied.png
-icqOfflineIcon=resources/images/protocol/icq/icq16x16-offline.png
-
-# zeroconf accregwizz
-protocolIconZeroconf=resources/images/protocol/zeroconf/zeroconf-color-16.png
-pageImageZeroconf=resources/images/protocol/zeroconf/zeroconf-color-64.png
-zeroconfOnlineIcon=resources/images/protocol/zeroconf/zeroconf-online.png
-zeroconfOfflineIcon=resources/images/protocol/zeroconf/zeroconf-offline.png
-zeroconfDndIcon=resources/images/protocol/zeroconf/zeroconf-dnd.png
-zeroconfInvisibleIcon=resources/images/protocol/zeroconf/zeroconf-invisible.png
-
-# branding
-aboutWindowBg=resources/images/plugin/branding/aboutWindowBackground.png
-splashScreenBg=resources/images/plugin/branding/splashScreenBackground.png
-
-# yahoo accregwizz
-protocolIconYahoo=resources/images/protocol/yahoo/yahoo16x16.png
-pageImageYahoo=resources/images/protocol/yahoo/yahoo64x64.png
-yahooConnectingIcon=resources/images/protocol/yahoo/yahoo16x16-connecting.gif
-yahooOnlineIcon=resources/images/protocol/yahoo/yahoo16x16-online.png
-yahooIdleIcon=resources/images/protocol/yahoo/yahoo16x16-idle.png
-yahooInvisibleIcon=resources/images/protocol/yahoo/yahoo16x16-invisible.png
-yahooAwayIcon=resources/images/protocol/yahoo/yahoo16x16-away.png
-yahooLunchIcon=resources/images/protocol/yahoo/yahoo16x16-lunch.png
-yahooNaIcon=resources/images/protocol/yahoo/yahoo16x16-na.png
-yahooPhoneIcon=resources/images/protocol/yahoo/yahoo16x16-phone.png
-yahooVacationIcon=resources/images/protocol/yahoo/yahoo16x16-vacation.png
-
-# accountinfo
-accountInfoIcon=resources/images/plugin/accountinfo/userInfo16x16.png
-accountInfoDefaultPersonIcon=resources/images/plugin/accountinfo/personPhoto.png
-
-# ssh accregwizz
-protocolIconSsh=resources/images/protocol/ssh/ssh-online.png
-pageImageSsh=resources/images/protocol/ssh/ssh64x64.png
-sshOfflineIcon=resources/images/protocol/ssh/ssh-offline.png
-sshNaIcon=resources/images/protocol/ssh/ssh-na.png
-sshConnectingIcon=resources/images/protocol/ssh/ssh-connecting.png
-sshConnectedIcon=resources/images/protocol/ssh/ssh-connected.png
-sshFileTransferIcon=resources/images/protocol/ssh/ssh-filetransfer.png
-
-# general config
-pluginIconGeneralConfig=resources/images/plugin/generalconfig/configureIcon.png
+service.systray.TRAY_ICON=resources/images/impl/systray/systrayIcon.png
+service.systray.TRAY_ICON_OFFLINE=resources/images/impl/systray/systrayIconOffline.png
+service.systray.TRAY_ICON_AWAY=resources/images/impl/systray/systrayIconAway.png
+service.systray.TRAY_ICON_FFC=resources/images/impl/systray/systrayIconFFC.png
+service.systray.TRAY_ICON_WINDOWS=resources/images/impl/systray/systrayIconWindows.png
+service.systray.TRAY_ICON_WINDOWS_OFFLINE=resources/images/impl/systray/systrayIconWindowsOffline.png
+service.systray.TRAY_ICON_WINDOWS_AWAY=resources/images/impl/systray/systrayIconWindowsAway.png
+service.systray.TRAY_ICON_WINDOWS_FFC=resources/images/impl/systray/systrayIconWindowsFFC.png
+service.systray.TRAY_ICON_MACOSX=resources/images/impl/systray/systrayIconMacOSX.png
+service.systray.TRAY_ICON_MACOSX_WHITE=resources/images/impl/systray/systrayIconMacOSXWhite.png
+service.systray.DOCK_ICON_OFFLINE=resources/images/impl/systray/dock-offline.png	
+service.systray.DOCK_ICON_AWAY=resources/images/impl/systray/dock-away.png
+service.systray.DOCK_ICON_FFC=resources/images/impl/systray/dock-chatty.png
+service.systray.STATUS_MENU_ICON=resources/images/impl/systray/statusIcon.png
+service.systray.CLOSE_MENU_ICON=resources/images/impl/systray/quit.png
+service.systray.MESSAGE_ICON=resources/images/impl/systray/envelope.png
+service.systray.MESSAGE_ICON_WINDOWS=resources/images/impl/systray/envelopeWindows.png
+service.systray.MESSAGE_ICON_MACOSX=resources/images/impl/systray/envelopeMacOSX.png
+service.systray.MESSAGE_ICON_MACOSX_WHITE=resources/images/impl/systray/envelopeMacOSXWhite.png
+
+# dict protocol icons
+service.protocol.dict.PROTOCOL_ICON=resources/images/protocol/dict/dict-16x16.png
+service.protocol.dict.PROTOCOL_LARGE_ICON=resources/images/protocol/dict/dict-64x64.png
+service.protocol.dict.OFFLINE_STATUS_ICON=resources/images/protocol/dict/dict-16x16-offline.png
+
+# icq protocol icons
+service.protocol.icq.PROTOCOL_ICON=resources/images/protocol/icq/icq16x16-online.png
+service.protocol.icq.PROTOCOL_LARGE_ICON=resources/images/protocol/icq/icq64x64.png
+
+# yahoo protocol icons
+service.protocol.yahoo.PROTOCOL_ICON=resources/images/protocol/yahoo/yahoo16x16.png
+service.protocol.yahoo.PROTOCOL_LARGE_IMAGE=resources/images/protocol/yahoo/yahoo64x64.png
+
+# zeroconf protocol icons
+service.protocol.zeroconf.PROTOCOL_ICON=resources/images/protocol/zeroconf/zeroconf-color-16.png
+service.protocol.zeroconf.PROTOCOL_LARGE_ICON=resources/images/protocol/zeroconf/zeroconf-color-64.png
+service.protocol.zeroconf.ONLINE_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-online.png
+service.protocol.zeroconf.OFFLINE_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-offline.png
+service.protocol.zeroconf.DND_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-dnd.png
+service.protocol.zeroconf.INVISIBLE_STATUS_ICON=resources/images/protocol/zeroconf/zeroconf-invisible.png
 
 #msn accregwizz
-protocolIconMsn=resources/images/protocol/msn/msn16x16.png
-pageImageMsn=resources/images/protocol/msn/msn64x64.png
-msnConnectingIcon=resources/images/protocol/msn/msn16x16-connecting.gif
-msnOnlineIcon=resources/images/protocol/msn/msn16x16-online.png
-msnNaIcon=resources/images/protocol/msn/msn16x16-na.png
-msnInvisibleIcon=resources/images/protocol/msn/msn16x16-invisible.png
-msnAwayIcon=resources/images/protocol/msn/msn16x16-away.png
-msnLunchIcon=resources/images/protocol/msn/msn16x16-lunch.png
-msnPhoneIcon=resources/images/protocol/msn/msn16x16-phone.png
-msnBrbIcon=resources/images/protocol/msn/msn16x16-brb.png
-msnBusyIcon=resources/images/protocol/msn/msn16x16-busy.png
-msnOfflineIcon=resources/images/protocol/msn/msn16x16-offline.png
-
-# mailbox
-mailboxIcon=resources/images/tape.png
-
-# pluginmanager
-installedStateIcon=resources/images/plugin/pluginmanager/installed.png
-deactivatedStateIcon=resources/images/plugin/pluginmanager/deactivated.png
-startingStateIcon=resources/images/plugin/pluginmanager/starting.png
-stoppingStateIcon=resources/images/plugin/pluginmanager/stopping.png
-activeStateIcon=resources/images/plugin/pluginmanager/active.png
-pluginIconPluginManager=resources/images/plugin/pluginmanager/pluginIcon.png
-
-# sip accregwizz
-protocolIconSip=resources/images/protocol/sip/sip16x16.png
-pageImageSip=resources/images/protocol/sip/sip64x64.png
-
-# extended callhistorysearch
-searchIcon=resources/images/plugin/extendedcallhistorysearch/searchIcon.png
-historyMenuIcon=resources/images/plugin/extendedcallhistorysearch/history16x16.png
-incomingCall=resources/images/plugin/extendedcallhistorysearch/incomingCall.png
-outgoingCall=resources/images/plugin/extendedcallhistorysearch/outgoingCall.png
-calendarIcon=resources/images/plugin/extendedcallhistorysearch/calendarIcon.png
-
-# gibberish accregwiz
-protocolIconGibberish=resources/images/protocol/gibberish/gibberish-online.png
-pageImageGibberish=resources/images/protocol/gibberish/gibberish64x64.png
-
-# whiteboard
-circleIcon=resources/images/plugin/whiteboard/circle.png
-circle2Icon=resources/images/plugin/whiteboard/circle2.png
-circleFIcon=resources/images/plugin/whiteboard/circleF.png
-colorIcon=resources/images/plugin/whiteboard/color.png
-editCopyIcon=resources/images/plugin/whiteboard/editcopy.png
-editPasteIcon=resources/images/plugin/whiteboard/editpaste.png
-fileImportIcon=resources/images/plugin/whiteboard/fileimport.png
-fileNewIcon=resources/images/plugin/whiteboard/filenew.png
-fileSaveIcon=resources/images/plugin/whiteboard/filesave.png
-imgIcon=resources/images/plugin/whiteboard/img.png
-lineIcon=resources/images/plugin/whiteboard/line.png
-line2Icon=resources/images/plugin/whiteboard/line2.png
-modifIcon=resources/images/plugin/whiteboard/modif.png
-penIcon=resources/images/plugin/whiteboard/pen.png
-mpenIcon=resources/images/plugin/whiteboard/m_pen.png
-polyIcon=resources/images/plugin/whiteboard/poly.png
-polyFIcon=resources/images/plugin/whiteboard/polyF.png
-polyLineIcon=resources/images/plugin/whiteboard/polyLine.png
-rectIcon=resources/images/plugin/whiteboard/rect.png
-rectFIcon=resources/images/plugin/whiteboard/rectF.png
-sc_logo16x16=resources/images/plugin/whiteboard/sc_logo16x16.png
-selectIcon=resources/images/plugin/whiteboard/select.png
-squareIcon=resources/images/plugin/whiteboard/square.png
-straightLineIcon=resources/images/plugin/whiteboard/straight_line.png
-textIcon=resources/images/plugin/whiteboard/text.png
-text2Icon=resources/images/plugin/whiteboard/text2.png
-inviteIcon=resources/images/plugin/whiteboard/inviteDialogIcon.png
-
-# dict status enum
-dictProtocolIcon=resources/images/protocol/dict/dict-16x16.png
-dictOfflineIcon=resources/images/protocol/dict/dict-16x16-offline.png
-dict64x64Icon=resources/images/protocol/dict/dict-64x64.png
-
-# gibberish status enum
-gibberish64x64Icon=resources/images/protocol/gibberish/gibberish64x64.png
-gibberishOfflineIcon=resources/images/protocol/gibberish/gibberish-offline.png
-gibberishOccupiedIcon=resources/images/protocol/gibberish/gibberish-occupied.png
-gibberishDndIcon=resources/images/protocol/gibberish/gibberish-dnd.png
-gibberishNaIcon=resources/images/protocol/gibberish/gibberish-na.png
-gibberishAwayIcon=resources/images/protocol/gibberish/gibberish-away.png
-gibberishInvisibleIcon=resources/images/protocol/gibberish/gibberish-invisible.png
-gibberishOnlineIcon=resources/images/protocol/gibberish/gibberish-online.png
-gibberishFfcIcon=resources/images/protocol/gibberish/gibberish-ffc.png
+service.protocol.msn.PROTOCOL_ICON=resources/images/protocol/msn/msn16x16.png
+service.protocol.msn.PROTOCOL_LARGE_ICON=resources/images/protocol/msn/msn64x64.png
+
+# ssh protocol icons
+service.protocol.ssh.PROTOCOL_ICON=resources/images/protocol/ssh/ssh-online.png
+service.protocol.ssh.PROTOCOL_LARGE_ICON=resources/images/protocol/ssh/ssh64x64.png
+service.protocol.ssh.OFFLINE_STATUS_ICON=resources/images/protocol/ssh/ssh-offline.png
+service.protocol.ssh.NA_STATUS_ICON=resources/images/protocol/ssh/ssh-na.png
+service.protocol.ssh.CONNECTING_ICON=resources/images/protocol/ssh/ssh-connecting.png
+service.protocol.ssh.CONNECTED_ICON=resources/images/protocol/ssh/ssh-connected.png
+service.protocol.ssh.FILE_TRANSFER_ICON=resources/images/protocol/ssh/ssh-filetransfer.png
 
 # rss accregwizz
-protocolIconRss=resources/images/protocol/rss/rss-online.png
-pageImageRss=resources/images/protocol/rss/rss64x64.png
-rssOfflineIcon=resources/images/protocol/rss/rss-offline.png
-
-# aim accregwizz
-protocolIconAim=resources/images/protocol/aim/aim16x16-online.png
-aimInvisibleIcon=resources/images/protocol/aim/aim16x16-invisible.png
-aimAwayIcon=resources/images/protocol/aim/aim16x16-away.png
-aimOfflineIcon=resources/images/protocol/aim/aim16x16-offline.png
-pageImageAim=resources/images/protocol/aim/aim64x64.png
-aimConnectingIcon=resources/images/protocol/aim/cr16-action-aim_connecting.gif
+service.protocol.rss.PROTOCOL_ICON=resources/images/protocol/rss/rss-online.png
+service.protocol.rss.PROTOCOL_LARGE_ICON=resources/images/protocol/rss/rss64x64.png
+service.protocol.rss.OFFLINE_STATUS_ICON=resources/images/protocol/rss/rss-offline.png
+
+# sip protocol icons
+service.protocol.sip.PROTOCOL_ICON=resources/images/protocol/sip/sip16x16.png
+service.protocol.sip.PROTOCOL_LARGE_ICON=resources/images/protocol/sip/sip64x64.png
+
+# gibberish protocol icons
+service.protocol.gibberish.PROTOCOL_ICON=resources/images/protocol/gibberish/gibberish-online.png
+service.protocol.gibberish.PROTOCOL_LARGE_ICON=resources/images/protocol/gibberish/gibberish64x64.png
+service.protocol.gibberish.OFFLINE_STATUS_ICON=resources/images/protocol/gibberish/gibberish-offline.png
+service.protocol.gibberish.OCCUPIED_STATUS_ICON=resources/images/protocol/gibberish/gibberish-occupied.png
+service.protocol.gibberish.DND_STATUS_ICON=resources/images/protocol/gibberish/gibberish-dnd.png
+service.protocol.gibberish.NA_STATUS_ICON=resources/images/protocol/gibberish/gibberish-na.png
+service.protocol.gibberish.AWAY_STATUS_ICON=resources/images/protocol/gibberish/gibberish-away.png
+service.protocol.gibberish.INVISIBLE_STATUS_ICON=resources/images/protocol/gibberish/gibberish-invisible.png
+service.protocol.gibberish.ONLINE_STATUS_ICON=resources/images/protocol/gibberish/gibberish-online.png
+service.protocol.gibberish.FFC_STATUS_ICON=resources/images/protocol/gibberish/gibberish-ffc.png
+
+# aim protocol icons
+service.protocol.aim.PROTOCOL_ICON=resources/images/protocol/aim/aim16x16-online.png
+service.protocol.aim.PROTOCOL_LARGE_ICON=resources/images/protocol/aim/aim64x64.png
+service.protocol.aim.INVISIBLE_STATUS_ICON=resources/images/protocol/aim/aim16x16-invisible.png
+service.protocol.aim.AWAY_STATUS_ICON=resources/images/protocol/aim/aim16x16-away.png
+service.protocol.aim.OFFLINE_STATUS_ICON=resources/images/protocol/aim/aim16x16-offline.png
+service.protocol.aim.CONNECTING_ICON=resources/images/protocol/aim/cr16-action-aim_connecting.gif
+
+# irc protocol icons
+service.protocol.irc.PROTOCOL_ICON=resources/images/protocol/irc/cr16-action-irc_online.png
+service.protocol.irc.PROTOCOL_LARGE_ICON=resources/images/protocol/irc/cr64-app-irc_protocol.png
+service.protocol.irc.OFFLINE_STATUS_ICON=resources/images/protocol/irc/cr16-action-irc_offline.png
+service.protocol.irc.AWAY_STATUS_ICON=resources/images/protocol/gibberish/gibberish-away.png
+service.protocol.irc.CONNECTING_ICON=resources/images/protocol/irc/cr16-action-irc_connecting-1.gif
+
+# jabber protocol icons
+service.protocol.jabber.PROTOCOL_ICON=resources/images/protocol/jabber/status16x16-online.png
+service.protocol.jabber.PROTOCOL_LARGE_ICON=resources/images/protocol/jabber/logo48x48.png
 
-# contactinfo
-contactInfoIcon=resources/images/plugin/contactinfo/userInfo16x16.png
-contactInfoDefaultPersonIcon=resources/images/plugin/contactinfo/personPhoto.png
-
-# irc accregwizz
-protocolIconIrc=resources/images/protocol/irc/cr16-action-irc_online.png
-pageImageIrc=resources/images/protocol/irc/cr64-app-irc_protocol.png
-ircOfflineIcon=resources/images/protocol/irc/cr16-action-irc_offline.png
-ircAwayIcon=resources/images/protocol/gibberish/gibberish-away.png
-ircConnectingIcon=resources/images/protocol/irc/cr16-action-irc_connecting-1.gif
-irc64x64Icon=resources/images/protocol/irc/cr32-app-irc_protocol.png
+# googletalk accregwizz
+service.protocolgoogletalk.PROTOCOL_ICON=resources/images/protocol/googletalk/status16x16-online.png
+service.protocolgoogletalk.PROTOCOL_LARGE_ICON=resources/images/protocol/googletalk/logo48x48.png
 
-# jabber accregwizz
-protocolIconJabber=resources/images/protocol/jabber/status16x16-online.png
-pageImageJabber=resources/images/protocol/jabber/logo48x48.png
-jabberConnectingIcon=resources/images/protocol/jabber/status16x16-connecting.gif
-jabberOfflineIcon=resources/images/protocol/jabber/status16x16-offline.png
-jabberDndIcon=resources/images/protocol/jabber/status16x16-dnd.png
-jabberAwayIcon=resources/images/protocol/jabber/status16x16-away.png
-jabberFfcIcon=resources/images/protocol/jabber/status16x16-ffc.png
-jabberXaIcon=resources/images/protocol/jabber/status16x16-xa.png
+# branding plugin images
+plugin.branding.ABOUT_WINDOW_BACKGROUND=resources/images/plugin/branding/aboutWindowBackground.png
+plugin.branding.SPLASH_SCREEN_BACKGROUND=resources/images/plugin/branding/splashScreenBackground.png
 
-# googletalk accregwizz
-googletalkProtocolIcon=resources/images/protocol/googletalk/status16x16-online.png
-googletalkPageImage=resources/images/protocol/googletalk/logo48x48.png
-googletalkConnectingIcon=resources/images/protocol/googletalk/status16x16-connecting.gif
-googletalkOfflineIcon=resources/images/protocol/googletalk/status16x16-offline.png
-googletalkDndIcon=resources/images/protocol/googletalk/status16x16-dnd.png
-googletalkAwayIcon=resources/images/protocol/googletalk/status16x16-away.png
-googletalkFfcIcon=resources/images/protocol/googletalk/status16x16-ffc.png
-googletalkXaIcon=resources/images/protocol/googletalk/status16x16-xa.png
+# accountinfo
+plugin.accountinfo.PLUGIN_ICON=resources/images/plugin/accountinfo/userInfo16x16.png
+
+# general config plugin icons
+plugin.generalconfig.PLUGIN_ICON=resources/images/plugin/generalconfig/configureIcon.png
+
+# mailbox plugin icons
+plugin.mailbox.PLUGIN_ICON=resources/images/tape.png
+
+# pluginmanager plugin icons
+plugin.pluginmanager.INSTALLED_STATE=resources/images/plugin/pluginmanager/installed.png
+plugin.pluginmanager.DEACTIVATED_STATE=resources/images/plugin/pluginmanager/deactivated.png
+plugin.pluginmanager.STARTING_STATE=resources/images/plugin/pluginmanager/starting.png
+plugin.pluginmanager.STOPPING_STATE=resources/images/plugin/pluginmanager/stopping.png
+plugin.pluginmanager.ACTIVATE_STATE=resources/images/plugin/pluginmanager/active.png
+plugin.pluginmanager.PLUGIN_ICON=resources/images/plugin/pluginmanager/pluginIcon.png
+
+# extended callhistorysearch plugin icons
+plugin.callhistorysearch.SEARCH_ICON=resources/images/plugin/extendedcallhistorysearch/searchIcon.png
+plugin.callhistorysearch.HISTORY_MENU_ICON=resources/images/plugin/extendedcallhistorysearch/history16x16.png
+plugin.callhistorysearch.HISTORY_BUTTON=resources/images/plugin/extendedcallhistorysearch/callHistory.png
+plugin.callhistorysearch.INCOMING_CALL=resources/images/plugin/extendedcallhistorysearch/incomingCall.png
+plugin.callhistorysearch.OUTGOING_CALL=resources/images/plugin/extendedcallhistorysearch/outgoingCall.png
+plugin.callhistorysearch.CALENDAR_ICON=resources/images/plugin/extendedcallhistorysearch/calendarIcon.png
+
+# whiteboard plugin icons
+plugin.whiteboard.SELECT_ICON=resources/images/plugin/whiteboard/select.png
+plugin.whiteboard.PEN_ICON=resources/images/plugin/whiteboard/pen.png
+plugin.whiteboard.LINE2_ICON=resources/images/plugin/whiteboard/line2.png
+plugin.whiteboard.RECT_ICON=resources/images/plugin/whiteboard/rect.png
+plugin.whiteboard.RECTF_ICON=resources/images/plugin/whiteboard/rectF.png
+plugin.whiteboard.CIRCLE_ICON=resources/images/plugin/whiteboard/circle.png
+plugin.whiteboard.CIRCLE2_ICON=resources/images/plugin/whiteboard/circle2.png
+plugin.whiteboard.CIRCLEF_ICON=resources/images/plugin/whiteboard/circleF.png
+plugin.whiteboard.COLOR_ICON=resources/images/plugin/whiteboard/color.png
+plugin.whiteboard.EDIT_COPY_ICON=resources/images/plugin/whiteboard/editcopy.png
+plugin.whiteboard.EDIT_PASTE_ICON=resources/images/plugin/whiteboard/editpaste.png
+plugin.whiteboard.FILE_IMPORT_ICON=resources/images/plugin/whiteboard/fileimport.png
+plugin.whiteboard.FILE_NEW_ICON=resources/images/plugin/whiteboard/filenew.png
+plugin.whiteboard.FILE_SAVE_ICON=resources/images/plugin/whiteboard/filesave.png
+plugin.whiteboard.IMAGE_ICON=resources/images/plugin/whiteboard/img.png
+plugin.whiteboard.LINE_ICON=resources/images/plugin/whiteboard/line.png
+plugin.whiteboard.MODIF_ICON=resources/images/plugin/whiteboard/modif.png
+plugin.whiteboard.MPEN_ICON=resources/images/plugin/whiteboard/m_pen.png
+plugin.whiteboard.POLY_ICON=resources/images/plugin/whiteboard/poly.png
+plugin.whiteboard.POLYF_ICON=resources/images/plugin/whiteboard/polyF.png
+plugin.whiteboard.POLY_LINE_ICON=resources/images/plugin/whiteboard/polyLine.png
+plugin.whiteboard.SQUARE_ICON=resources/images/plugin/whiteboard/square.png
+plugin.whiteboard.STRAIGHT_LINE_ICON=resources/images/plugin/whiteboard/straight_line.png
+plugin.whiteboard.TEXT_ICON=resources/images/plugin/whiteboard/text.png
+plugin.whiteboard.TEXT2_ICON=resources/images/plugin/whiteboard/text2.png
+plugin.whiteboard.INVITE_ICON=resources/images/plugin/whiteboard/inviteDialogIcon.png
+
+# contactinfo plugin icons
+plugin.contactinfo.CONTACT_INFO_ICON=resources/images/plugin/contactinfo/userInfo16x16.png
 
 # keybinding
-keybindingPluginIcon=resources/images/plugin/keybindingchooser/pluginIcon.png
+plugin.keybinding.PLUGIN_ICON=resources/images/plugin/keybindingchooser/pluginIcon.png
 
 # auto away (statusupdate)
-autoAwayConfigIcon=resources/images/plugin/autoaway/aa-config.png
-
-# Notification configuration form
-notificationIcon=resources/images/plugin/notificationconfiguration/notificationIcon.png
-playIcon=resources/images/plugin/notificationconfiguration/playIcon.png
-progIcon=resources/images/plugin/notificationconfiguration/progIcon.png
-popupIcon=resources/images/plugin/notificationconfiguration/popupIcon.png
-soundIcon=resources/images/plugin/notificationconfiguration/soundIcon.png
-activatedIcon=resources/images/plugin/notificationconfiguration/activeIcon.png
-desactivatedIcon=resources/images/plugin/notificationconfiguration/desactivatedIcon.png
-foldericon=resources/images/plugin/notificationconfiguration/folder.png
-
-MediaConfigurationForm_icon=resources/images/impl/media/media.png
+plugin.autoaway.PLUGIN_ICON=resources/images/plugin/autoaway/aa-config.png
+
+# notifications configuration form
+plugin.notificationconfig.PLUGIN_ICON=resources/images/plugin/notificationconfiguration/notificationIcon.png
+plugin.notificationconfig.PLAY_ICON=resources/images/plugin/notificationconfiguration/playIcon.png
+plugin.notificationconfig.PROG_ICON=resources/images/plugin/notificationconfiguration/progIcon.png
+plugin.notificationconfig.POPUP_ICON=resources/images/plugin/notificationconfiguration/popupIcon.png
+plugin.notificationconfig.SOUND_ICON=resources/images/plugin/notificationconfiguration/soundIcon.png
+plugin.notificationconfig.ACTIVATED_ICON=resources/images/plugin/notificationconfiguration/activeIcon.png
+plugin.notificationconfig.DEACTIVATED_ICON=resources/images/plugin/notificationconfiguration/desactivatedIcon.png
+plugin.notificationconfig.FOLDER_ICON=resources/images/plugin/notificationconfiguration/folder.png
+
+# media configuration form
+plugin.mediaconfig.PLUGIN_ICON=resources/images/impl/media/media.png
diff --git a/resources/images/plugin/extendedcallhistorysearch/callHistory.png b/resources/images/plugin/extendedcallhistorysearch/callHistory.png
new file mode 100644
index 0000000..483db0a
--- /dev/null
+++ b/resources/images/plugin/extendedcallhistorysearch/callHistory.png
diff --git a/resources/languages/resourcesnew.properties b/resources/languages/resourcesnew.properties
new file mode 100644
index 0000000..a060d05
--- /dev/null
+++ b/resources/languages/resourcesnew.properties
@@ -0,0 +1,682 @@
+# SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+#
+# Distributable under LGPL license.
+# See terms of license at gnu.org.
+
+# Note to translators:
+# To translate SIP Communicator to your language
+# - copy messages.properties to messages_xx.properties
+#   (where xx is the ISO 639-1 language code of your language)
+# - the file must use UTF-8 encoding
+# - all entries are of the form key=translation, where only the
+#   translation part has to be changed
+# - {0}, {1}... are parameters which will be replaced by the
+#   actual text at runtime, place them as you wish
+# - you don't have to translate all entries, if an entry is not
+#   found in your translation, the text in messages.properties will
+#   be used
+# - \ at the end of a line means that the translation is continued
+#   in the next line
+#
+# To start SIP Communicator with a language that is different
+# from your system's language, pass the language code to ant:
+# ant -Duser.language=xx run
+#
+# The same rules apply to the properties files found in the other
+# directories.
+
+service.gui.ABOUT=&About
+service.gui.ACCEPT=&Accept
+service.gui.ACCOUNT=Account
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Account Registration Wizard
+service.gui.ACCOUNTS=Accounts
+service.gui.ACTIVATE_ONLY_WHEN_MINIMIZED=Activate only when minimized
+service.gui.ADD=&Add
+service.gui.ADD_ACCOUNT=Add account
+service.gui.ADD_CONTACT=&Add contact
+service.gui.ADD_CONTACT_ERROR=Failed to add contact with id: {0}
+service.gui.ADD_CONTACT_ERROR_TITLE=Add contact Error
+service.gui.ADD_CONTACT_EXIST_ERROR=The contact {0} already exists in your contact list.
+service.gui.ADD_CONTACT_ID=In the field below enter the identifier of the contact you would like to add.
+service.gui.ADD_CONTACT_WIZARD=Add contact wizard
+service.gui.ADD_GROUP_LOCAL_ERROR=Failed to add group with name: {0}. The problem occured during a local IO operation.
+service.gui.ADD_GROUP_NET_ERROR=Failed to add group with name: {0}. The problem occured due to a network failure. Please check your network connection and try again.
+service.gui.ADD_GROUP_ERROR=Failed to add group with name: {0}.
+service.gui.ADD_GROUP_ERROR_TITLE=Add group Error
+service.gui.ADD_GROUP_EXIST_ERROR=The group {0} already exists in your contact list.
+service.gui.ADD_GROUP=Create group
+service.gui.ADD_SUBCONTACT=&Add subcontact
+service.gui.ADVANCED=Advanced
+service.gui.ALL=&All
+service.gui.ALL_CONTACTSs=&All contacts
+service.gui.ALWAYS_ON_TOP=Always on top
+service.gui.APPEARANCE=Appearance
+service.gui.APPLICATION=Application
+service.gui.APPLY=&Apply
+service.gui.AT=at
+service.gui.AUTHORIZATION_ACCEPTED=contact has accepted your authorization request.
+service.gui.AUTHENTICATION_WINDOW_TITLE=Authentication requested
+service.gui.AUTHORIZATION_REJECTED=contact has rejected your authorization request.
+service.gui.AUTHORIZATION_REQUESTED=Authorization requested
+service.gui.AUTHORIZATION_REQUESTED_INFO=The {0} contact requests your authorization.
+service.gui.AUTHENTICATION_FAILED=Authentication failed. The password you entered is not valid.
+service.gui.AUTHORIZATION_RESPONSE=Authorization response
+service.gui.AUTO_POPUP=Bring window to front
+service.gui.AWAY_STATUS=Away
+service.gui.BACK=&Back
+service.gui.BAN=&Ban
+service.gui.BAN_FAILED=Ban failed
+service.gui.BAN_FAILED_GENERAL_ERROR=Failed to ban {0}. A general server error occured.
+service.gui.BAN_FAILED_NOT_ALLOWED=Failed to ban {0}. The owner and the administratior of the room could not be banned.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Failed to ban {0}. You don't have enough privileges to do that.
+service.gui.BRB_MESSAGE=I'm gone right now, but I'll be back.
+service.gui.BUSY_MESSAGE=Sorry, I'm busy right now.
+service.gui.CALL=Call
+service.gui.CALL_VIA=Call via:
+service.gui.CALL_LIST=Call list
+service.gui.CANCEL=&Cancel
+service.gui.CHAT_ROOM_ALREADY_JOINED=The {0} chat room is already joined.
+service.gui.CHAT_ROOM_CONFIGURATION={0} chat room configuration
+service.gui.CHAT_ROOM_OPEN_CONFIG_FAILED=Failed to obtain the {0} chat room configuration form.
+service.gui.CHAT_ROOM_OPEN_CONFIG_FORBIDDEN=Could not obtain the {0} chat room configuration form. Only administrators of the chat room could see and change the configuration form.
+service.gui.CHAT_ROOM_CONFIG_FORM_SUBMIT_FAILED=An error occured while trying to submit the configuration form for chat room {0}.
+service.gui.CHAT_ROOM_USER_JOINED=has joined {0}
+service.gui.CHAT_ROOM_USER_LEFT=has left {0}
+service.gui.CHAT_ROOM_USER_KICKED=has been kicked from {0}
+service.gui.CHAT_ROOM_USER_QUIT=has quit {0}
+service.gui.CHAT_ROOM_NAME=Chat room name
+service.gui.CHAT_ROOM_NAME_INFO=In the field below enter the name of the chat room that you would like to create.
+service.gui.CHAT_ROOM_NOT_EXIST=The {0} room was not found in the {1} server. Please verify if the name you typed is correct.
+service.gui.CHAT_ROOM_NOT_CONNECTED=You need to be logged in in order to join the {0} chat room.
+service.gui.CHAT_ROOM_NOT_JOINED=You need to be joined to the chat room in order to do further operations with it.
+service.gui.CHAT_ROOM_OPTIONS=Chat room options
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=The {0} chat room requires registration to be joined.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=The {0} chat room has requested a password.
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} has changed the subject to {1}
+service.gui.CHAT_ROOMS=Chat rooms
+service.gui.CLOSE=Cl&ose
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=You have received a new message less than 2 seconds ago. Are you sure you want to close this chat?
+service.gui.CONFERENCE=Conference
+service.gui.CONFIGURE=&Configure
+service.gui.CONFIGURATION=Configuration
+service.gui.CONNECTION_FAILED=Connection failed
+service.gui.CONNECTION_FAILED_MESSAGE=<DIV>Connection failed for the following account: <BR> \
+User name: {0} <BR>\
+Server name: {1}. <BR>\
+Please check your network connection or contact <BR>\
+your network administrator for more information.</DIV>
+service.gui.CONNECTION_EXPIRED=You are currently disconnected from the {0} server.
+service.gui.CONTACT_ADDRESS=Contact address
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen  {0} contact doesn't support telephony.
+service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message
+service.gui.CONTACT_TYPING={0} is typing a message
+service.gui.CONTACT_TYPEING_STATE_STALE=typing state not updated
+service.gui.CONTACT_INFO=&Contact info
+service.gui.CONTACTS=Contacts
+service.gui.CONTINUE=&Continue
+service.gui.COPY=&Copy
+service.gui.COPY_LINK=Copy &link
+service.gui.CREATE=C&reate
+service.gui.CREATE_CHAT_ROOM=&Create chat room...
+service.gui.CREATE_CHAT_ROOM_NOT_SUPPORTED=Failed to create chat room with name: {0}. The server you have choosen: {1} doesn't support this operation.
+service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create chat room with name: {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard
+service.gui.CREATE_GROUP=&Create group
+service.gui.CREATE_GROUP_NAME=In the field below enter the name of the group you would like to create.
+service.gui.CREATE_FIRST_GROUP_WIZARD=Your contact list doesn't contain any groups. Please create a group first (File/Create group).
+service.gui.CUT=C&ut
+service.gui.DATE=Date
+service.gui.DESCRIPTION=Description
+service.gui.DIAL=&Dial
+service.gui.DIALPAD=Dialpad
+service.gui.DND_STATUS=Do not disturb
+service.gui.DO_NOT_ASK_AGAIN=Don't ask again
+service.gui.DO_NOT_SHOW_AGAIN=Don't show this message again
+service.gui.DOES_NOT_SUPPORT_WEB_INFO=This contact doesn't support web contact info
+service.gui.DURATION=Duration
+service.gui.EDIT=&Edit
+service.gui.EMPTY_HISTORY=&Empty history
+service.gui.ENABLE_NOTIFICATIONS=Enable notifications
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Enable &typing notifications
+service.gui.ENTER_PHONE_NUMBER=Enter phone number
+service.gui.ERROR=Error
+service.gui.EXIT=E&xit
+service.gui.EXTENDED_CRITERIA=Extended criteria
+service.gui.GENERAL=General
+service.gui.GENERAL_ERROR=General error
+service.gui.GROUP=Group
+service.gui.GROUP_NAME=Group name
+service.gui.FAILED_TO_CREATE_CHAT_ROOM=Failed to create chat room with name: {0}.
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Failed to join chat room with name: {0}.
+service.gui.FREE_FOR_CHAT_STATUS=Free for chat
+service.gui.FILE=&File
+service.gui.FIND_CHAT_ROOM_ERROR=Failed to find the "{0}" chat room.
+service.gui.FINISH=&Finish
+service.gui.FIRST=First
+service.gui.FONT=Font
+service.gui.HANG_UP=Hang up
+service.gui.HAVE_TO_BE_CONNECTED_TO_JOIN=You have to be connected in order to join a chat room. Please connect and then try again.
+service.gui.HAVE_TO_BE_CONNECTED_TO_LEAVE=You have to be connected in order to leave a chat room.
+service.gui.HELP=&Help
+service.gui.HIDE_OFFLINE=Hide
+service.gui.HIDE_OfflineContacts=Hide inactive contacts
+service.gui.HIDE_CallPanel=&Hide call panel
+service.gui.HIDE_MAIN_WINDOW=<DIV>Clicking the X window button will not exit the application, \
+but only <BR> hide it. If you wish to exit the application choose File/Quit.</DIV>
+service.gui.HISTORY=&History
+service.gui.HISTORY_CONTACT=History - {0}
+service.gui.HOUR=Hour
+service.gui.IDENTIFIER=Identifier
+service.gui.IGNORE=&Ignore
+service.gui.INFO=Info
+service.gui.INSERT_SMILEY=Insert smiley
+service.gui.INVALID_CALL=Invalid call
+service.gui.INVITATION=Invitation text
+service.gui.INVITATION_RECEIVED=Invitation received
+service.gui.INVITATION_RECEIVED_FORM_INFO={0} has invited you to join {1} chat room. You could accept, reject or ignore this invitation.
+service.gui.INVITE=&Invite
+service.gui.INVITE_CONTACT_FORM_INFO=Please write the name of the user you would like to invite. If you wish you could also precise the reason for this invitation.
+service.gui.INVITE_CONTACT_TO_CHAT=Invite contact to chat
+service.gui.JOIN=&Join
+service.gui.JOIN_AS=J&oin as
+service.gui.JOIN_CHAT_ROOM=&Join chat room...
+service.gui.JOIN_CHAT_ROOM_TITLE=Join chat room
+service.gui.JOIN_CHAT_ROOM_NAME=Please enter the name of the chat room you would like to join.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Join chat room wizard
+service.gui.KICK=&Kick
+service.gui.KICK_FAILED=Kick failed
+service.gui.KICK_FAILED_GENERAL_ERROR=Failed to kick {0}. A general server error occured.
+service.gui.KICK_FAILED_NOT_ALLOWED=Failed to kick {0}. The owner and the administratior of the room could not be kicked.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Failed to kick {0}. You don't have enough privileges to do that.
+service.gui.LAST=Last
+service.gui.LAUNCH_BROWSER_ERROR=Error attempting to launch web browser.
+service.gui.LAUNCE_ON_STARTUP=Launch on start up
+service.gui.LEAVE=&Leave
+service.gui.LIMIT_REACHED_FOR_IP=You have too many existing registrations from the local IP address and the {0} server doesn't allow to open any more of them.
+service.gui.LOGIN=&Login
+service.gui.LOGIN_NETWORK_ERROR=<DIV>Unable to log in with account:<BR>\
+User name: {0}<BR>\
+Server name: {1}<BR>\
+due to a network failure. Please check your network connection.</DIV>
+service.gui.LOGIN_GENERAL_ERROR=An error occured while logging in with account: User name: {0}, Server name: {1}.
+service.gui.LOGIN_INTERNAL_ERROR=An error occured while logging in with account: User name: {0}, Server name: {1}. This is most probably an internal application error. You could report your problem to issues@sip-communicator.dev.java.net.
+service.gui.LOGIN_INVALID_PROPERTIES_ERROR=Unable to log in with account: User name: {0}, Server name: {1}, due to an account configuration problem. Please check your account configuration.
+service.gui.LOGIN_WINDOW_TITLE=Login {0}
+service.gui.LOG_OFF_ERROR=An error occured while logging off with the following account: User name: {0}, Server name: {1}.
+service.gui.ME=me
+service.gui.MODIFY=&Modify
+service.gui.MOVE=Move
+service.gui.MOVE_SUBCONTACT=M&ove contact
+service.gui.MOVE_SUBCONTACT_MESSAGE=Select the contact, where you would like to move.
+service.gui.MOVE_SUBCONTACT_IN_SAME_CONTACT=The contact you have choosen is the same as \n the source one. Please choose another contact!
+service.gui.MOVE_SUBCONTACT_QUESTION=<DIV>Are you sure you want to move <B> {0} </B> to <B> {1} </B> ?</DIV>
+service.gui.MOVE_TO_GROUP=&Move to group
+service.gui.MOVE_CONTACT_ERROR=&Contact cannot be moved
+service.gui.MSG_DELIVERY_FAILURE=The above message could not be delivered
+service.gui.MSG_DELIVERY_OFFLINE_NOT_SUPPORTED=The protocol you are using doesn't support offline messages. You could try to reach this contact through another protocol or wait until he/she becomes online.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=An internal error occured. This is most probably a bug. Please report it here: http://www.sip-communicator.org/index.php/Development/BugsAndIssues. Server returned error: {0}
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Your message could not be delivered due to the following problem: {0}.
+service.gui.MSG_NOT_DELIVERED=A network problem occured. Please check your network configuration and try again. Server returned error: {0}.
+service.gui.MSG_RECEIVED={0} has sent you a message
+service.gui.MSG_SEND_CONNECTION_PROBLEM=You should be connected to be able to send messages.
+service.gui.MULTIPLE_LOGINS=You have logged in more than once with the same account. The following account: User name: {0}, Server name: {1} is currently disconnected.
+service.gui.NAME=Name
+service.gui.NETWORK=Network
+service.gui.NETWORK_FAILURE=Network failure
+service.gui.NEXT=&Next
+service.gui.NEW=&New
+service.gui.NEW_ACCOUNT=Add &new account
+service.gui.NEW_MESSAGE=New message...
+service.gui.NEW_NAME=New name:
+service.gui.NEW_STATUS_MESSAGE=New status message
+service.gui.NO=No
+service.gui.NO_AVAILABLE_ROOMS=The list of rooms for this server is currently not available.
+service.gui.NO_MESSAGE=No message
+service.gui.NO_MULTI_CHAT_ACCOUNT_AVAILABLE=No accounts, supporting multi user chat found. Check sip-communicator.org for more information on which protocols support multi user chat.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=You're trying to close a chat with a non-sent message. Are you sure you want to close this chat?
+service.gui.NON_EXISTING_USERNAME=The {0} server does not recognize specified user id.
+service.gui.NOTIFICATIONS=Notifications
+service.gui.OK=&Ok
+service.gui.OFFLINE=Offline
+service.gui.OLDER_CALLS=Older calls
+service.gui.ONLINE=Online
+service.gui.OPEN_IN_BROWSER=Open in &browser
+service.gui.OPTIONS=Options
+service.gui.PASSWORD=Password
+service.gui.PASTE=&Paste
+service.gui.PREVIOUS=Previous
+service.gui.PRINT=&Print
+service.gui.PROTOCOL=Protocol
+service.gui.PROVIDER_NOT_CONNECTED=You must be connected to be able to communicate.
+service.gui.QUIT=&Quit
+service.gui.READY=Ready
+service.gui.REASON=Reason
+service.gui.RECONNECTION_LIMIT_EXCEEDED=You have have been disconnecting and reconnecting to the server too fast. The following account: User name: {0}, Server name: {1} is temporarily banned and would have to wait a bit before trying to login again.
+service.gui.REFRESH=Refresh
+service.gui.REGISTRATION_TIMEOUT=Registration timeout:
+service.gui.REJECT=&Reject
+service.gui.REMEMBER_PASSWORD=Remember password
+service.gui.REMOVE=&Remove
+service.gui.REMOVE_ACCOUNT=&Remove account
+service.gui.REMOVE_ACCOUNT_CONFIRM=Are you sure you want to remove this account?
+service.gui.REMOVE_CONTACT=&Remove subcontact
+service.gui.REMOVE_CONTACT_TEXT=<DIV>Are you sure you want to remove <B> {0} </B><BR>from your contact list?</DIV>
+service.gui.REMOVE_GROUP=&Remove group
+service.gui.RENAME=&Rename
+service.gui.RENAME_CONTACT=Re&name contact
+service.gui.RENAME_CONTACT_WIZARD=In the field below you can specify the name you would like to use for the given contact.
+service.gui.RENAME_GROUP=Re&name group
+service.gui.RENAME_GROUP_INFO=In the field below you can specify the name you would like to use for the given group.
+service.gui.REQUEST=&Request
+service.gui.REQUEST_AUTHORIZATION=&Request authorization
+service.gui.REQUEST_AUTHORIZATION_INFO=Can't add {0} to your Contact List. {0} must authorize your request to add him/her. Please enter your request below.
+service.gui.REQUEST_AUTHORIZATION_REASON=Request reason
+service.gui.REQUEST_AUTHORIZATION_REASON_ENTER=Enter request reason
+service.gui.RESPONSE_AUTHORIZATION_REASON_ENTER=Enter response reason
+service.gui.RETRY=Retry
+service.gui.ROOT_GROUP=Root group
+service.gui.SAVE=&Save
+service.gui.SEARCH=&Search
+service.gui.SEARCH_FOR_CHAT_ROOMS=&Search for chat rooms
+service.gui.SEARCH_FOR_CHAT_ROOMS_TEXT=Click the below button to show all chat rooms existing in the selected server. Then select the one you would like to join and click the join button.
+service.gui.SECURITY_AUTHORITY_REALM=The {0} server has requested your authentication.
+service.gui.SELECT_ACCOUNT=Select account
+service.gui.SELECT_ACCOUNT_REGISTRATION=From the list below select the account registration wizard to use for creating a new account.
+service.gui.SELECT_ACCOUNT_REGISTRATION_WIZARD_TITLE=Select account registration
+service.gui.SELECT_GROUP=Select group
+service.gui.SELECT_GROUP_WIZARD=The list below contains all groups in your Contact List. Select the one, where you would like to add the new contact.
+service.gui.SELECT_GROUP_WIZARD_TITLE=Specify group
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=The list below contains all accounts that support the multi user chat feature. Select the one you would like to use to create your chat room.
+service.gui.SELECT_PROVIDERS_WIZARD=The list below contains all registered accounts. Select the one you would like to use to communicate with the new contact.
+service.gui.SELECT_PROVIDERS_WIZARD_TITLE=Select account
+service.gui.SEND=&Send
+service.gui.SEND_FILE=Send &file
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=There is no info for this contact.
+service.gui.SEND_MESSAGE=&Send a message
+service.gui.SEND_AS_SMS=Send as SMS
+service.gui.SEND_SMS=S&end SMS
+service.gui.SEND_SMS_DETAILS=Remember that you need to enter the number in international \
+format e.g. starting with +44 for the UK for example, +447777000000
+service.gui.SEND_SMS_NOT_SUPPORTED=The protocol you have selected doesn't support SMS messages.
+service.gui.SEND_VIA=Send via
+service.gui.SET_STATUS_MESSAGE=Set status message
+service.gui.SETTINGS=&Settings
+service.gui.SHOW_CALL_PANEL=Show call panel
+service.gui.SHOW_CHANNELS_LIST=Show channels list
+service.gui.SHOW_OFFLINE=Show
+service.gui.SHOW_OFFLINE_CONTACTS=Show inactive contacts
+service.gui.SIGN_IN=Sign in
+service.gui.SMILEY=Smiley
+service.gui.SMS_SUCCESSFULLY_SENT=SMS message successfully sent!
+service.gui.SMS_SEND_CONNECTION_PROBLEM=You need to be connected before being able to send SMS messages. Please connect your SMS provider account.
+service.gui.SPECIFY_REASON=In the field below you could specify the reason of this operation.
+service.gui.SOUND=Sound
+service.gui.SOUND_ON_OFF=Turn sound on/off
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=has become {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Failed to change status for account: User name: {0}, Server name: {1}, due to a general error.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Failed to change status for account: User name: {0}, Server name: {1}, due to a network problem.
+service.gui.STATUS_MESSAGE_INFO=In the field below you can specify the new message you would like to use.
+service.gui.SUBJECT=Subject
+service.gui.SUMMARY=Summary
+service.gui.TODAY=Today
+service.gui.TOOLS=&Tools
+service.gui.TYPE_YOUR_REQUEST=Type your request here
+service.gui.USERNAME=User identifier:
+service.gui.UNKNOWN=Unknown user
+service.gui.USE_CTRL_ENTER_TO_SEND=Use Ctrl-&Enter to send
+service.gui.USERNAME=Username
+service.gui.MESSAGE_DELIVERY_FAILED_UNKNOWN_ERROR=Unknown error has occured while delivering your message. Server returned error: {0}
+service.gui.UNREGISTERED_MESSAGE=Unable to connect the following account: User name: {0}, Server name: {1}. You are currently offline.
+service.gui.UPDATE_AUTOMATICALLY=Automatically install new updates
+service.gui.UPDATES=Updates
+service.gui.VIEW=&View
+service.gui.VIEW_HISTORY=View &history
+service.gui.WARNING=Warning
+service.gui.YES=Yes
+service.gui.YESTERDAY=Yesterday
+
+service.gui.JANUARY=Jan
+service.gui.FEBRUARY=Feb
+service.gui.MARCH=Mar
+service.gui.APRIL=Apr
+service.gui.MAY=May
+service.gui.JUNE=Jun
+service.gui.JULY=Jul
+service.gui.AUGUST=Aug
+service.gui.SEPTEMBER=Sep
+service.gui.OCTOBER=Oct
+service.gui.NOVEMBER=Nov
+service.gui.DECEMBER=Dec
+
+# impl.protocol.ssh
+#Contact Details Seperator(must not be part of contact data stored as persistent
+# data)
+impl.protocol.ssh.DETAILS_SEPARATOR=~
+
+# impl.systray
+impl.systray.SET_STATUS=Set Status
+impl.systray.ONLINE_STATUS=Online
+impl.systray.OFFLINE_STATUS=Offline
+impl.systray.MESSAGE_RECEIVED=Message received from
+impl.systray.ADD_CONTACT_DIALOG_ERROR=Failed to load the "Add contact" wizard dialog.
+
+# plugin.accountinfo
+plugin.accountinfo.ACCOUNT_INFO=Account info for 
+plugin.accountinfo.TITLE=Account Info
+plugin.accountinfo.BROWSE=Browse
+plugin.accountinfo.SUMMARY_DESCRIPTION=Summary of account info for
+plugin.accountinfo.EXTENDED=Extended
+plugin.accountinfo.EXTENDED_DESCRIPTION=Extended account info for
+plugin.accountinfo.NOT_SUPPORTED=Account info not available.
+plugin.accountinfo.CLICK_WEB=Click for Web Info
+plugin.accountinfo.WEB_INFO=Web Info
+plugin.accountinfo.FIRST_NAME=First Name:
+plugin.accountinfo.MIDDLE_NAME=Middle Name:
+plugin.accountinfo.LAST_NAME=Last Name:
+plugin.accountinfo.AGE=Age:
+plugin.accountinfo.BDAY=Birth Date:
+plugin.accountinfo.GENDER=Gender:
+plugin.accountinfo.EMAIL=E-mail:
+plugin.accountinfo.PHONE=Phone:
+plugin.accountinfo.USER_PICTURES=User Pictures
+plugin.accountinfo.CHANGE=Change
+plugin.accountinfo.ONLY_MESSAGE=Only messages
+
+# plugin.aimaccregwizz
+plugin.aimaccregwizz.PROTOCOL_NAME=AIM
+plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=The AIM service protocol
+plugin.aimaccregwizz.USERNAME=AIM Screenname:
+plugin.aimaccregwizz.PASSWORD=Password:
+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=UIN and Password
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Register new account
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have an AIM account, click on this button to create a new one.
+plugin.aimaccregwizz.EXISTING_ACCOUNT_ERROR=* The account you entered is already installed.
+plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
+plugin.aimaccregwizz.ADVANCED_OPTIONS=Advanced Options
+plugin.aimaccregwizz.PROXY=Proxy
+plugin.aimaccregwizz.PROXY_PORT=Proxy port
+plugin.aimaccregwizz.PROXY_TYPE=Proxy type
+plugin.aimaccregwizz.PROXY_USERNAME=Proxy username
+plugin.aimaccregwizz.PROXY_PASSWORD=Proxy password
+
+# plugin.autoaway
+plugin.autoaway.AUTO_STATUS=Auto Away
+plugin.autoaway.ENABLE_CHANGE_STATUS=Change status while away
+plugin.autoaway.AWAY_MINUTES=Minutes before switching to away :
+plugin.autoaway.INFO_TEXT=Set "Idle", when your computer is not used for X minutes. The status is reset to the status before, when activity is detected.
+
+# plugin.branding
+plugin.branding.ABOUT_WINDOW_TITLE=About {0}
+plugin.branding.LOAD_MESSAGE=Open Source VoIP & Instant Messaging
+plugin.branding.LOADING=Loading
+plugin.branding.ABOUT_MENU_ENTRY=About
+plugin.branding.BASED_ON=based on
+plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1} is currently under active development. \
+               The version you are running is only experimental and MAY NOT \
+               work as expected. Please refer to {2} for more information.</DIV>
+plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2007 Copyright \
+          <b>sip-communicator.org</b>. All rights reserved. Visit \
+          <a href="http://sip-communicator.org">http://sip-communicator.org</a>.\
+          </font></DIV>
+plugin.branding.LICENSE=<DIV color={0}>The <b>SIP Communicator</b> is distributed under \
+        the terms of the LGPL (<a href=\"http://www.gnu.org\">\
+        http://www.gnu.org</a>).</DIV>
+
+# plugin.contactinfo
+plugin.contactinfo.CONTACT_DETAILS=Contact details
+plugin.contactinfo.SELECT_USER=Select a user
+plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=Summary of contact info for
+plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=Extended contact info for
+plugin.contactinfo.CONTACT_INFO_NOT_SUPPORTED=This protocol doesn't support server stored details for now. Try one of the other protocols.
+plugin.contactinfo.NOT_SPECIFIED=[Not specified]
+
+# plugin.dictaccregwizz
+plugin.dictaccregwizz.PROTOCOL_NAME=Dict
+plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=The Dict service protocol
+plugin.dictaccregwizz.STRATEGY_LIST=List of strategies:
+plugin.dictaccregwizz.STRATEGY_ACTUAL=Search strategies
+plugin.dictaccregwizz.STRATEGY_DESCRPTION=Strategy is use to search similar words,if a translation was not found, thanks to different approaches. For example the Prefix strategies will search words which begin like the word you would translate.
+plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict Account Information
+plugin.dictaccregwizz.FIRST_ACCOUNT_TEXT=This wizard will create your first Dict Account for you on dict.org.\n\n\
+You can add new dictionary by going on Account Registration Wizard. Fill the host Field with dictionnary you would like to add.
+
+# plugin.extendedcallsearchhistory
+plugin.extendedcallsearchhistory.ADVANCED_CALL_HISTORY_SEARCH=&Advanced call history search
+plugin.extendedcallsearchhistory.SEARCH=Search
+plugin.extendedcallsearchhistory.CONTACT_NAME=Contact Name
+plugin.extendedcallsearchhistory.SINCE=Since
+plugin.extendedcallsearchhistory.UNTIL=Until
+plugin.extendedcallsearchhistory.CALLTYPE=Call Type
+plugin.extendedcallsearchhistory.INCOMING=Incoming
+plugin.extendedcallsearchhistory.OUTGOING=Outgoing
+plugin.extendedcallsearchhistory.OLDER_CALLS=Older Calls
+plugin.extendedcallsearchhistory.ALL=all
+
+# plugin.generalconfig
+plugin.generalconfig.AUTO_START=Auto - start MotoGP Impact when computer restarts or reboots.
+plugin.generalconfig.GROUP_CHAT_MESSAGES=Group chat messages in one window.
+plugin.generalconfig.LOG_HISTORY=Log chat history
+plugin.generalconfig.SHOW_HISTORY=Show history
+plugin.generalconfig.HISTORY_SIZE=recent messages in new chats
+plugin.generalconfig.SEND_MESSAGES_WITH=Send messages with:
+plugin.generalconfig.ENABLE_TYPING_NOTIFICATIONS=Enable typing notifications
+plugin.generalconfig.BRING_WINDOW_TO_FRONT=Bring chat window to front
+plugin.generalconfig.ERROR_PERMISSION=You don't have enough privileges to remove autostart
+
+# plugin.gibberishaccregwizz
+plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
+plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=A SIP Communicator test protocol.
+plugin.gibberishaccregwizz.USERNAME=User ID:
+plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=Identification
+
+# plugin.googletalkaccregwizz
+plugin.googletalkaccregwizz.PROTOCOL_NAME=GOOGLE TALK
+plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=The Google Talk protocol
+plugin.googletalkaccregwizz.USERNAME=Google Talk username
+plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Google Talk account, click on this button to create a new one.
+
+# plugin.icqaccregwizz
+plugin.icqaccregwizz.PROTOCOL_NAME=ICQ
+plugin.icqaccregwizz.PROTOCOL_DESCRIPTION=The AOL ICQ service protocol
+plugin.icqaccregwizz.USERNAME=ICQ Number:
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have an ICQ account, click on this button to create a new one.
+
+# plugin.ircaccregwizz
+plugin.ircaccregwizz.PROTOCOL_NAME=IRC
+plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC protocol.
+plugin.ircaccregwizz.USERNAME=Nickname:
+plugin.ircaccregwizz.INFO_PASSWORD=Most IRC servers do not require password.
+plugin.ircaccregwizz.AUTO_NICK_CHANGE=Automatically change nick when it's already used
+plugin.ircaccregwizz.USE_DEFAULT_PORT=Use default port
+plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=My nickname doesn't require identification
+plugin.ircaccregwizz.HOST=Hostname:
+plugin.ircaccregwizz.PORT=Port:
+plugin.ircaccregwizz.IRC_SERVER=Server
+
+# plugin.jabberaccregwizz
+plugin.jabberaccregwizz.PROTOCOL_NAME=JABBER
+plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=The Jabber protocol
+plugin.jabberaccregwizz.USERNAME=Jabber username
+plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirm password
+plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID and Password
+plugin.jabberaccregwizz.CSERVER=Server
+plugin.jabberaccregwizz.SERVER=Connect Server
+plugin.jabberaccregwizz.PORT=Port
+plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Enable keep alive
+plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=Jabber new account registration
+plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Jabber account, click on this button to create a new one.
+plugin.jabberaccregwizz.CHOOSE_SERVER_TITLE=Jabber new account server chooser
+plugin.jabberaccregwizz.CHOOSE_SERVER_TEXT=Choose the server for your new account in the list below.
+plugin.jabberaccregwizz.OK=&Ok
+plugin.jabberaccregwizz.CANCEL=C&ancel
+plugin.jabberaccregwizz.CHOSE=&Choose
+plugin.jabberaccregwizz.SERVER_COLUMN=Server
+plugin.jabberaccregwizz.COMMENT_COLUMN=Comment
+plugin.jabberaccregwizz.RESOURCE=Resource
+plugin.jabberaccregwizz.PRIORITY=Priority
+plugin.jabberaccregwizz.XMPP_ERROR=XMPP Error
+plugin.jabberaccregwizz.USER_EXISTS_ERROR=This user already exist on this server. Choose another user or server.
+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unknown XMPP error. Verify that the server name is correct.
+plugin.jabberaccregwizz.NOT_SAME_PASSWORD=The two entered password aren't the same.
+
+# plugin.keybindingchooser
+plugin.keybindingchooser.KEYBINDINGS=Keybindings
+plugin.keybindingchooser.CHAT_NEXT_TAB=Next Chat Tab
+plugin.keybindingchooser.CHAT_PREVIOUS_TAB=Previous Chat Tab
+plugin.keybindingchooser.CHAT_COPY=Copy
+plugin.keybindingchooser.CHAT_PASTE=Paste
+plugin.keybindingchooser.CHAT_OPEN_SMILIES=Show Smilies
+plugin.keybindingchooser.CHAT_OPEN_HISTORY=Show History
+plugin.keybindingchooser.CHAT_CLOSE=Close Chat Window
+plugin.keybindingchooser.CHAT_CUT=Cut
+plugin.keybindingchooser.MAIN_RENAME=Rename
+plugin.keybindingchooser.MAIN_NEXT_TAB=Next Contact List Tab
+plugin.keybindingchooser.MAIN_PREVIOUS_TAB=Previous Contact List Tab
+
+# plugin.mailbox
+plugin.mailbox.OUTGOING=Outgoing Message:
+plugin.mailbox.INCOMING=Incoming Messages:
+plugin.mailbox.WAIT_TIME=Delay Until Call Sent to Voicemail
+plugin.mailbox.MAX_MESSAGE_TIME=Maximum Incoming Message Duration
+plugin.mailbox.CONFIRM=Confirm
+plugin.mailbox.DEFAULTS=Defaults
+plugin.mailbox.MAILBOX=Mailbox
+
+# plugin.msnaccregwizz 
+plugin.msnaccregwizz.PROTOCOL_NAME=MSN
+plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=A protocol to connect and chat on the  MSN Service.
+plugin.msnaccregwizz.USERNAME=Email:
+plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID and Password
+plugin.msnaccregwizz.NEW_MAIL=<b>You have one new Mail!</b><br/><b>From:</b> {0} {1} <br/><b>Subject:</b> {2} <br/>{3};
+
+# plugin.notificationconfiguration
+plugin.notificationconfiguration.PLAY=Play
+plugin.notificationconfiguration.TURN_ON_ALL=Turn On All
+plugin.notificationconfiguration.TURN_OFF_ALL=Turn Off All
+plugin.notificationconfiguration.ACTIONS=Actions
+plugin.notificationconfiguration.QUICK_CONTROLS=Quick Controls
+plugin.notificationconfiguration.RESTORE=Restore Defaults
+plugin.notificationconfiguration.PLAY_SOUND=Play a sound:
+plugin.notificationconfiguration.EXECUTE_PROGRAM=Execute a program:
+plugin.notificationconfiguration.DISPLAY_POPUP=Show a message in a pop-up window
+
+# plugin.pluginmanager
+plugin.pluginmanager.ACTIVATE=Activate
+plugin.pluginmanager.DEACTIVATE=Deactivate
+plugin.pluginmanager.INSTALL=Install
+plugin.pluginmanager.UNINSTALL=Uninstall
+plugin.pluginmanager.UPDATE=Update
+plugin.pluginmanager.NEW=New
+plugin.pluginmanager.PLUGINS=Plug-ins
+plugin.pluginmanager.CANCEL=Cancel
+plugin.pluginmanager.URL=Url
+plugin.pluginmanager.CHOOSE_FILE=Select File
+plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=Show system bundles
+plugin.pluginmanager.SYSTEM=System
+
+# plugin.rssaccregwizz
+plugin.rssaccregwizz.PROTOCOL_NAME=RSS
+plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into SIP Communicator !
+plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=RSS account already exists!
+plugin.rssaccregwizz.ACCOUNT_INFO=This wizard will create an RSS account for you.\n\n\
+Note that you could have only one RSS account!\n\n\
+You can add RSS feeds to your contact list using the "Add contact" wizard. Fill in the contact address field with the URI of the RSS feed you would like to add.
+plugin.rssaccregwizz.ACCOUNT_INFO_TITLE=RSS Account Information
+plugin.rssaccregwizz.ACCOUNT_ATTENTION=Please read attentively the information provided below!
+plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL=The folloing RSS flow seems to be no longer accessible. Would you like to remove it?\n\n Address: {0}
+plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL_TITLE=Remove missing contactems to be no longer accessible. Would you like to remove it?\n\n 
+
+# plugin.simpleaccregwizz
+plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION=Configure all your favorite protocols in one click.
+plugin.simpleaccregwizz.SIGNUP=Not registered yet?
+plugin.simpleaccregwizz.SPECIAL_SIGNUP=Not registered yet ? - click here to get a new username
+plugin.simpleaccregwizz.CANCEL=Cancel
+
+# plugin.sipaccregwizz
+plugin.sipaccregwizz.PROTOCOL_NAME=SIP
+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=The SIP protocol
+plugin.sipaccregwizz.USERNAME=SIP id
+plugin.sipaccregwizz.USERNAME_AND_PASSWORD=User name and password
+plugin.sipaccregwizz.REGISTRAR=Registrar
+plugin.sipaccregwizz.SERVER_PORT=Server port
+plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport
+plugin.sipaccregwizz.ENABLE_PRESENCE=Enable presence (SIMPLE)
+plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Force peer-to-peer presence mode
+plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Offline contacts polling period (in s.)
+plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION=Default subscription duration (in s.)
+plugin.sipaccregwizz.PRESENCE_OPTIONS=Presence Options
+plugin.sipaccregwizz.KEEP_ALIVE=Keep alive
+plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Keep alive method
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Keep alive interval
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Between 1 and 3600 seconds
+plugin.sipaccregwizz.REGISTER=REGISTER
+
+# plugin.sshaccregwizz
+plugin.sshaccregwizz.PROTOCOL_NAME=SSH
+plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=A Protocol to connect to remote machines over SSH.
+plugin.sshaccregwizz.USERNAME=Account ID:
+plugin.sshaccregwizz.IDENTITY_FILE=Identitity File:
+plugin.sshaccregwizz.KNOWN_HOSTS=Known Hosts:
+plugin.sshaccregwizz.ACCOUNT_INFO_TITLE=SSH Account Details
+
+# plugin.updatechecker
+plugin.updatechecker.DIALOG_TITLE=New version available
+plugin.updatechecker.DIALOG_MESSAGE=<html>A new version of {0} is available for download.
+plugin.updatechecker.DIALOG_MESSAGE_2=<br>{0} ({1}): <br>
+plugin.updatechecker.DIALOG_MESSAGE_DEBIAN=
+plugin.updatechecker.BUTTON_DOWNLOAD=Download
+plugin.updatechecker.BUTTON_CLOSE=Close
+
+# plugin.whiteboard
+plugin.whiteboard.INVITATION_RECEIVED_FORM_INFO={0} has invited you to join {1} whiteboard. You could accept, reject or ignore this invitation.
+plugin.whiteboard.WHITEBOARD_TITLE=Whiteboard [Beta]
+plugin.whiteboard.WHITEBOARD_MENU_ITEM_TEXT=Whiteboard
+plugin.whiteboard.WHITEBOARD_NOT_SUPPORTED_TEXT=This contact does not support whiteboarding
+plugin.whiteboard.CANCEL=Cancel
+plugin.whiteboard.DO_NOT_ASK_AGAIN=Do not ask me again.
+plugin.whiteboard.CLOSE_SESSION_QUESTION=Would you like to end current session ? If you choose "yes" the current session will be ended, otherwise only your whiteboard window will be closed.
+plugin.whiteboard.FILE=File
+plugin.whiteboard.DRAW=Draw
+plugin.whiteboard.NEW=New
+plugin.whiteboard.SAVE=Save
+plugin.whiteboard.OPEN=Open
+plugin.whiteboard.COPY=Copy
+plugin.whiteboard.PASTE=Paste
+plugin.whiteboard.PEN=Pen
+plugin.whiteboard.SELECT=Select
+plugin.whiteboard.LINE=Line
+plugin.whiteboard.RECTANGLE=Rectangle
+plugin.whiteboard.FILLED_RECTANGLE=Filled rectangle
+plugin.whiteboard.TEXT=Text
+plugin.whiteboard.IMAGE=Image
+plugin.whiteboard.POLYGON=Polygon
+plugin.whiteboard.FILLEDPOLYGON=Filled polygon
+plugin.whiteboard.POLYLINE=Polyline
+plugin.whiteboard.CIRCLE=Circle
+plugin.whiteboard.FILLED_CIRCLE=Filled circle
+plugin.whiteboard.COLOR=Color
+plugin.whiteboard.MODIFICATION=Modification
+plugin.whiteboard.THICKNESS=Thickness:
+plugin.whiteboard.SEND=Send
+plugin.whiteboard.PRINT=Print
+plugin.whiteboard.EXIT=Exit
+plugin.whiteboard.EDIT=Edit
+plugin.whiteboard.GRID=Grid
+plugin.whiteboard.DESELECT=Deselect
+plugin.whiteboard.DELETE=Delete
+plugin.whiteboard.PROPERTIES=Properties
+plugin.whiteboard.HELP=Help
+plugin.whiteboard.ABOUT=About
+
+# plugin.yahooaccregwizz
+plugin.yahooaccregwizz.PROTOCOL_NAME=YAHOO
+plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=A protocol to connect and chat on the  Yahoo Service.
+plugin.yahooaccregwizz.USERNAME=Username:
+plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID and Password
+plugin.yahooaccregwizz.NEW_MAIL=New mail, subject
+plugin.yahooaccregwizz.FROM=From
+
+# plugin.zeroaccregwizz
+plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
+plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=The Zeroconf (Bonjour) service protocol.
+plugin.zeroaccregwizz.FIRSTNAME=Firstname:
diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index 0fcf204..4b6f3b7 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -739,7 +739,7 @@ public class UIServiceImpl
         ToolTipManager toolTipManager = ToolTipManager.sharedInstance();
         UIManager.put("ToolTip.background",
             new Color(GuiActivator.getResources()
-                    .getColor("tooltipBackground")));
+                    .getColor("service.gui.TOOLTIP_BACKGROUND")));
         toolTipManager.setInitialDelay(500);
         toolTipManager.setDismissDelay(60000);
         toolTipManager.setEnabled(true);
@@ -808,7 +808,7 @@ public class UIServiceImpl
                 // default decoration.
                 boolean isDecorated =
                     new Boolean(GuiActivator.getResources()
-                        .getSettingsString("isLookAndFeelDecorated"))
+                        .getSettingsString("impl.gui.IS_LOOK_AND_FEEL_DECORATED"))
                         .booleanValue();
 
                 if (isDecorated)
@@ -824,6 +824,8 @@ public class UIServiceImpl
                 logger.error("The provided Look & Feel is not supported.",
                     e);
             }
+
+            this.initCustomFonts();
         }
     }
 
@@ -904,7 +906,7 @@ public class UIServiceImpl
     public void propertyChange(PropertyChangeEvent evt)
     {
         if (evt.getPropertyName().equals(
-            "net.java.sip.communicator.impl.gui.isTransparentWindowEnabled"))
+            "impl.gui.IS_TRANSPARENT_WINDOW_ENABLED"))
         {
             String isTransparentString = (String) evt.getNewValue();
 
@@ -932,9 +934,35 @@ public class UIServiceImpl
             }
         }
         else if (evt.getPropertyName().equals(
-            "net.java.sip.communicator.impl.gui.windowTransparency"))
+            "impl.gui.WINDOW_TRANSPARENCY"))
         {
             mainFrame.repaint();
         }
     }
+    
+
+    /**
+     * Initialize main window font.
+     */
+    private void initCustomFonts()
+    {
+        JComponent layeredPane = mainFrame.getLayeredPane();
+
+        String fontName
+            = GuiActivator.getResources().getSettingsString(
+                "service.gui.FONT_NAME");
+
+        String titleFontSize
+            = GuiActivator.getResources().getSettingsString(
+                "service.gui.FONT_SIZE");
+
+        Font font = new Font(   fontName,
+                                Font.BOLD,
+                                new Integer(titleFontSize).intValue());
+
+        for (int i = 0; i < layeredPane.getComponentCount(); i++)
+        {
+            layeredPane.getComponent(i).setFont(font);
+        }
+    }
 }
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 dd55d00..64f4661 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
@@ -38,7 +38,7 @@ public class SCScrollPane
         this.getVerticalScrollBar().setUnitIncrement(30);
 
         String windowImageBackgroundProperty
-            = "net.java.sip.communicator.impl.gui.isWindowImageBackgroundEnabled";
+            = "impl.gui.IS_WINDOW_BACKGROUND_ENABLED";
 
         isWindowImageBgEnabled = new Boolean(GuiActivator.getResources()
             .getSettingsString(windowImageBackgroundProperty)).booleanValue();
@@ -50,7 +50,7 @@ public class SCScrollPane
     private void initBackgroundImage()
     {
         isTextureBackground = new Boolean(GuiActivator.getResources()
-            .getSettingsString("isTextureBackground")).booleanValue();
+            .getSettingsString("impl.gui.IS_TEXTURE_BACKGROUND")).booleanValue();
 
         bgImage = ImageLoader.getImage(ImageLoader.MAIN_WINDOW_BACKGROUND);
 
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
index 7ba1266..c5c910a 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
@@ -375,17 +375,17 @@ public abstract class SIPCommDialog extends JDialog
     private class MainContentPane extends JPanel
     {
         String isColorBgEnabledProp
-            = "net.java.sip.communicator.impl.gui.isWindowColorBackgroundEnabled";
+            = "impl.gui.IS_WINDOW_COLOR_BACKGROUND_ENABLED";
 
         boolean isColorBgEnabled = new Boolean(
             GuiActivator.getResources().getSettingsString(isColorBgEnabledProp))
                 .booleanValue();
 
         Color bgStartColor = new Color(GuiActivator.getResources()
-            .getColor("mainBackgroundStartColor"));
+            .getColor("service.gui.MAIN_BACKGROUND"));
 
         Color bgEndColor = new Color(GuiActivator.getResources()
-            .getColor("mainBackgroundEndColor"));
+            .getColor("service.gui.MAIN_BACKGROUND_GRADIENT"));
 
         GeneralPath headerBackground = new GeneralPath();
 
@@ -393,12 +393,8 @@ public abstract class SIPCommDialog extends JDialog
         {
             super(new BorderLayout());
 
-            this.setBackground(new Color(
-                GuiActivator.getResources()
-                .getColor("mainBackground")));
-
             int borderSize = GuiActivator.getResources()
-                .getSettingsInt("mainWindowBorderSize");
+                .getSettingsInt("impl.gui.MAIN_WINDOW_BORDER_SIZE");
 
             if (isColorBgEnabled)
             {
@@ -430,25 +426,13 @@ public abstract class SIPCommDialog extends JDialog
                 80,
                 bgEndColor);
 
-            GradientPaint borderShadow = new GradientPaint(0, 0,
-                new Color(255, 255, 255, 200),
-                this.getWidth(),
-                this.getHeight(),
-                new Color(0, 0, 0, 150));
-
-            g2.setPaint(borderShadow);
-            g2.fillRoundRect(3, 3,
-                this.getWidth() - 6,
-                this.getHeight() - 6,
-                10, 10);
-
             g2.setPaint(bgGradientColor);
-            g2.fillRoundRect(5, 5, this.getWidth() - 10, 80, 10, 10);
+            g2.fillRect(0, 0, this.getWidth(), 80);
 
             g2.setColor(bgEndColor);
-            g2.fillRoundRect(5, 80,
-                    this.getWidth() - 10,
-                    this.getHeight() - 85, 10, 10);
+            g2.fillRect(0, 78,
+                    this.getWidth(),
+                    this.getHeight());
 
             GradientPaint curveShadow = new GradientPaint(0, 0,
                 new Color(255, 255, 255, 150),
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
index dc171fa..aa9a30b 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
@@ -405,17 +405,17 @@ public abstract class SIPCommFrame
     private class MainContentPane extends JPanel
     {
         String isColorBgEnabledProp
-            = "net.java.sip.communicator.impl.gui.isWindowColorBackgroundEnabled";
+            = "impl.gui.IS_WINDOW_COLOR_BACKGROUND_ENABLED";
 
         boolean isColorBgEnabled = new Boolean(
             GuiActivator.getResources().getSettingsString(isColorBgEnabledProp))
                 .booleanValue();
 
         Color bgStartColor = new Color(GuiActivator.getResources()
-            .getColor("mainBackgroundStartColor"));
+            .getColor("service.gui.MAIN_BACKGROUND"));
 
         Color bgEndColor = new Color(GuiActivator.getResources()
-            .getColor("mainBackgroundEndColor"));
+            .getColor("service.gui.MAIN_BACKGROUND_GRADIENT"));
 
         GeneralPath headerBackground = new GeneralPath();
 
@@ -423,12 +423,8 @@ public abstract class SIPCommFrame
         {
             super(new BorderLayout());
 
-            this.setBackground(new Color(
-                GuiActivator.getResources()
-                .getColor("mainBackground")));
-
             int borderSize = GuiActivator.getResources()
-                .getSettingsInt("mainWindowBorderSize");
+                .getSettingsInt("impl.gui.MAIN_WINDOW_BORDER_SIZE");
 
             if (isColorBgEnabled)
             {
@@ -460,25 +456,13 @@ public abstract class SIPCommFrame
                 80,
                 bgEndColor);
 
-            GradientPaint borderShadow = new GradientPaint(0, 0,
-                new Color(255, 255, 255, 200),
-                this.getWidth(),
-                this.getHeight(),
-                new Color(0, 0, 0, 150));
-
-            g2.setPaint(borderShadow);
-            g2.fillRoundRect(3, 3,
-                this.getWidth() - 6,
-                this.getHeight() - 6,
-                10, 10);
-
             g2.setPaint(bgGradientColor);
-            g2.fillRoundRect(5, 5, this.getWidth() - 10, 80, 10, 10);
+            g2.fillRect(0, 0, this.getWidth(), 80);
 
             g2.setColor(bgEndColor);
-            g2.fillRoundRect(5, 80,
-                    this.getWidth() - 10,
-                    this.getHeight() - 85, 10, 10);
+            g2.fillRect(0, 78,
+                    this.getWidth(),
+                    this.getHeight());
 
             GradientPaint curveShadow = new GradientPaint(0, 0,
                 new Color(255, 255, 255, 150),
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 a7cd049..729dc9e 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
@@ -59,7 +59,8 @@ public class SIPCommChatSelectorMenuUI
 
         boolean isToolBarExtended
             = new Boolean(GuiActivator.getResources().
-                getSettingsString("isToolBarExteneded")).booleanValue();
+                getSettingsString("impl.gui.IS_TOOLBAR_EXTENDED"))
+                    .booleanValue();
 
         if (!isToolBarExtended)
         {
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 651d04a..9cbec29 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
@@ -32,7 +32,7 @@ public class SIPCommDefaultTheme
      */
     private static final ColorUIResource PRIMARY_CONTROL_DARK_SHADOW =
         new ColorUIResource(GuiActivator.getResources().
-            getColor("primaryControlDarkShadow"));
+            getColor("service.gui.PRIMARY_CONTROL_DARK_SHADOW"));
 
     /**
      * Used for desktop color, menu selected background, focus color, slider
@@ -41,7 +41,7 @@ public class SIPCommDefaultTheme
      */
     private static final ColorUIResource PRIMARY_CONTROL_SHADOW =
         new ColorUIResource(GuiActivator.getResources().
-            getColor("primaryControlShadow"));
+            getColor("service.gui.PRIMARY_CONTROL_SHADOW"));
 
     /**
      * Used for progress bar border, tooltip border inactive, tooltip foreground
@@ -49,11 +49,11 @@ public class SIPCommDefaultTheme
      */
     private static final ColorUIResource CONTROL_DARK_SHADOW =
         new ColorUIResource(GuiActivator.getResources().
-            getColor("controlDarkShadow"));
+            getColor("service.gui.CONTROL_DARK_SHADOW"));
 
     private static final ColorUIResource CONTROL_SHADOW =
         new ColorUIResource(GuiActivator.getResources().
-            getColor("controlShadow"));
+            getColor("service.gui.CONTROL_SHADOW"));
 
     /**
      * Used for window title inactive background, menu background, tooltip
@@ -62,7 +62,7 @@ public class SIPCommDefaultTheme
      */
     private static final ColorUIResource CONTROL_COLOR =
         new ColorUIResource(GuiActivator.getResources().
-            getColor("controlColor"));
+            getColor("service.gui.colors.CONTROL"));
 
     /**
      * Used for text hightlight color, window title background, scroll bar thumb
@@ -71,76 +71,76 @@ public class SIPCommDefaultTheme
      */
     private static final ColorUIResource PRIMARY_CONTROL_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("primaryControlColor"));
+            getColor("service.gui.PRIMARY_COLOR_CONTROL"));
 
     // Used to paint a gradient for a check box or a radio button.
     private static final ColorUIResource BUTTON_GRADIENT_DARK_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("buttonGradientDark"));
+            getColor("service.gui.BUTTON_GRADIENT_DARK"));
 
     private static final ColorUIResource BUTTON_GRADIENT_LIGHT_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("buttonGradientLight"));
+            getColor("service.gui.BUTTON_GRADIENT_LIGHT"));
 
     private static final ColorUIResource SLIDER_GRADIENT_DARK_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("sliderGradientDark"));
+            getColor("service.gui.SLIDER_GRADIENT_DARK"));
 
     private static final ColorUIResource SLIDER_GRADIENT_LIGHT_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("sliderGradientLight"));
+            getColor("service.gui.SLIDER_GRADIENT_LIGHT"));
 
     private static final ColorUIResource SELECTION_FOREGROUND
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("selectionForeground"));
+            getColor("service.gui.SELECTION_FOREGROUND"));
 
     private static final ColorUIResource SELECTION_BACKGROUND
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("selectionBackground"));
+            getColor("service.gui.SELECTION_BACKGROUND"));
 
     private static final ColorUIResource SPLIT_PANE_DEVIDER_FOCUS_COLOR
         = new ColorUIResource(GuiActivator.getResources()
-            .getColor("splitPaneDeviderFocused"));
+            .getColor("service.gui.SPLIT_PANE_DIVIDER_FOCUSED"));
 
     private static final ColorUIResource TABBED_PANE_HIGHLIGHT_COLOR
         = new ColorUIResource(GuiActivator.getResources()
-            .getColor("tabbedPaneBorderHighlight"));
+            .getColor("service.gui.TABBED_PANE_BORDER_HIGHLIGHT"));
 
     private static final ColorUIResource TABLE_GRID_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("tableGrid"));
+            getColor("service.gui.TABLE_GRID"));
 
     private static final ColorUIResource SCROLL_BAR_TRACK_HIGHLIGHT
         = new ColorUIResource(GuiActivator.getResources()
-            .getColor("scrollBarTrackHighlight"));
+            .getColor("service.gui.SCROLLBAR_TRACK_LIGHT"));
 
     private static final ColorUIResource SCROLL_BAR_DARK_SHADOW
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("scrollBarDarkShadow"));
+            getColor("service.gui.SCROLLBAR_DARK_SHADOW"));
 
     private static final ColorUIResource DESKTOP_BACKGROUND_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("desktopBackgroundColor"));
+            getColor("service.gui.DESKTOP_BACKGROUND"));
 
     private static final ColorUIResource CONTROL_TEXT_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("textColor"));
+            getColor("service.gui.TEXT"));
 
     private static final ColorUIResource INACTIVE_CONTROL_TEXT_COLOR
         = new ColorUIResource(GuiActivator.getResources().
-            getColor("inactiveTextColor"));
+            getColor("service.gui.INACTIVE_TEXT"));
 
     private static final ColorUIResource MENU_DISABLED_FOREGROUND
         = new ColorUIResource(GuiActivator.getResources()
-            .getColor("menuDisabledForeground"));
+            .getColor("service.gui.MENU_DISABLED_FOREGROUND"));
 
     private static final ColorUIResource TAB_TITLE_HIGHLIGHT
         = new ColorUIResource(GuiActivator.getResources()
-            .getColor("tabTitleHighlight"));
+            .getColor("service.gui.TAB_TITLE_HIGHLIGHT"));
 
     private static final ColorUIResource TAB_TITLE
         = new ColorUIResource(GuiActivator.getResources()
-            .getColor("tabTitle"));
+            .getColor("service.gui.TAB_TITLE"));
 
     private static final FontUIResource BASIC_FONT
         = new FontUIResource(Constants.FONT);
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java
index 47bcf55..8c0acc0 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java
@@ -35,7 +35,7 @@ public class SIPCommTabbedPaneEnhancedUI extends SIPCommTabbedPaneUI {
 
     private static final int TAB_OVERLAP
         = new Integer(GuiActivator.getResources().
-            getSettingsString("tabOverlap")).intValue();
+            getSettingsString("impl.gui.TAB_OVERLAP")).intValue();
 
     private static final int PREFERRED_WIDTH = 150;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index 2d84a62..c29f816 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -139,8 +139,9 @@ public class MainFrame
 
         this.setTitle(applicationName);
 
-        this.mainPanel.setBackground(new Color(resources
-            .getColor("mainWindowBackground")));
+        this.mainPanel.setBackground(new Color(
+                GuiActivator.getResources()
+                    .getColor("service.gui.MAIN_WINDOW_BACKGROUND")));
 
         this.init();
 
@@ -167,7 +168,7 @@ public class MainFrame
 
         String isToolbarExtendedString
             = GuiActivator.getResources().
-                getSettingsString("isToolBarExteneded");
+                getSettingsString("impl.gui.IS_TOOLBAR_EXTENDED");
 
         boolean isToolBarExtended
             = new Boolean(isToolbarExtendedString).booleanValue();
@@ -215,18 +216,19 @@ public class MainFrame
      */
     public void initBounds()
     {
-        ResourceManagementService resources = GuiActivator.getResources();
-        int width
-            = resources.getSettingsInt("mainWindowWidth");
-        int height
-            = resources.getSettingsInt("mainWindowHeight");
+        int width = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_WINDOW_WIDTH");
+
+        int height = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_WINDOW_HEIGHT");
 
-        int minWidth
-            = resources.getSettingsInt("minMainWindowWidth");
-        int minHeight
-            = resources.getSettingsInt("minMainWindowHeight");
+        int minWidth = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_WINDOW_MIN_WIDTH");
 
-        this.setMinimumSize(new Dimension(minWidth, minHeight));
+        int minHeight = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_WINDOW_MIN_HEIGHT");
+
+        this.getContentPane().setMinimumSize(new Dimension(minWidth, minHeight));
 
         this.setSize(width, height);
 
@@ -242,8 +244,11 @@ public class MainFrame
         JComponent layeredPane = this.getLayeredPane();
 
         ResourceManagementService resources = GuiActivator.getResources();
-        String fontName = resources.getSettingsString("fontName");
-        String titleFontSize = resources.getSettingsString("titleFontSize");
+        String fontName
+            = resources.getSettingsString("service.gui.FONT_NAME");
+
+        String titleFontSize
+            = resources.getSettingsString("service.gui.FONT_SIZE");
 
         Font font = new Font(   fontName,
                                 Font.BOLD,
@@ -1155,9 +1160,10 @@ public class MainFrame
          */
         public LogoBar()
         {
-            ResourceManagementService resources = GuiActivator.getResources();
-            int width = resources.getSettingsInt("logoBarWidth");
-            int height = resources.getSettingsInt("logoBarHeight");
+            int width = GuiActivator.getResources()
+                .getSettingsInt("impl.gui.LOGO_BAR_WIDTH");
+            int height = GuiActivator.getResources()
+                .getSettingsInt("impl.gui.LOGO_BAR_HEIGHT");
             Dimension size = new Dimension(width, height);
 
             this.setMinimumSize(size);
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 5fbadcf..280f2a6 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
@@ -111,7 +111,7 @@ public class NewAccountDialog
     {
         // check for preferred wizard
         String prefWName = GuiActivator.getResources().
-            getSettingsString("preferredAccountWizard");
+            getSettingsString("impl.gui.PREFERRED_ACCOUNT_WIZARD");
         if(prefWName != null && prefWName.length() > 0)
             preferredWizardName = prefWName;
 
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 0a95bcf..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
@@ -43,9 +43,11 @@ public class DialPanel
     private boolean isTypedPlus = false;
 
     private final JPanel dialPadPanel =
-        new JPanel(new GridLayout(4, 3, GuiActivator.getResources()
-            .getSettingsInt("dialPadHorizontalGap"), GuiActivator
-            .getResources().getSettingsInt("dialPadVerticalGap")));
+        new JPanel(new GridLayout(4, 3,
+            GuiActivator.getResources()
+                .getSettingsInt("impl.gui.DIAL_PAD_HORIZONTAL_GAP"),
+            GuiActivator.getResources()
+                .getSettingsInt("impl.gui.DIAL_PAD_VERTICAL_GAP")));
 
     private final java.util.List<CallParticipant> callParticipantsList =
         new LinkedList<CallParticipant>();
@@ -94,8 +96,11 @@ public class DialPanel
 
         this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 
-        int width = GuiActivator.getResources().getSettingsInt("dialPadWidth");
-        int height = GuiActivator.getResources().getSettingsInt("dialPadHeight");
+        int width = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.DIAL_PAD_WIDTH");
+
+        int height = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.DIAL_PAD_HEIGHT");
 
         this.dialPadPanel.setPreferredSize(new Dimension(width, height));
 
@@ -336,7 +341,7 @@ public class DialPanel
         Graphics2D g2 = (Graphics2D) g;
 
         boolean isTextureBackground = new Boolean(GuiActivator.getResources()
-            .getSettingsString("isTextureBackground")).booleanValue();
+            .getSettingsString("impl.gui.IS_TEXTURE_BACKGROUND")).booleanValue();
 
         BufferedImage bgImage
             = ImageLoader.getImage(ImageLoader.MAIN_WINDOW_BACKGROUND);
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java
index b45dba5..3e20e15 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java
@@ -8,8 +8,8 @@ package net.java.sip.communicator.impl.gui.main.call;
 
 import java.util.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.callhistory.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * The <tt>GuiCallParticipantRecord</tt> is meant to be used in the call history
@@ -45,25 +45,25 @@ public class GuiCallParticipantRecord
         
         this.callDuration = callDuration;
     }
-    
+
     public GuiCallParticipantRecord(CallParticipantRecord participantRecord,
             String direction)
-    {   
+    {
         this.direction = direction;
-        
+
         this.participantName = participantRecord.getParticipantAddress();
-        
+
         this.startTime = participantRecord.getStartTime();
-        
+
         this.callDuration = GuiUtils.substractDates(
                 participantRecord.getEndTime(), startTime);
     }
-    
+
     public String getDirection()
     {
         return direction;
     }
-    
+
     /**
      * Returns the duration of the contained participant call.
      * 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 1db3e25..7e440ff 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -756,7 +756,7 @@ public class ChatPanel
 
         String greyHistoryProperty
             = GuiActivator.getResources()
-                .getSettingsString("hiddenProtocolGreyHistoryDisabled");
+                .getSettingsString("impl.gui.GREY_HISTORY_ENABLED");
 
         if (greyHistoryProperty != null)
             isGreyHistoryDisabled
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
index f0b45b3..e306082 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
@@ -14,6 +14,7 @@ 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.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * The <tt>ChatSendPanel</tt> is the panel in the bottom of the chat. It
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index 49eb3f5..e8c278e 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -115,7 +115,8 @@ public class ChatWindow
 
         boolean isToolBarExtended
             = new Boolean(GuiActivator.getResources().
-                getSettingsString("isToolBarExteneded")).booleanValue();
+                getSettingsString("impl.gui.IS_TOOLBAR_EXTENDED"))
+                    .booleanValue();
 
         if (isToolBarExtended)
             mainToolBar = new ExtendedMainToolBar(this);
@@ -144,10 +145,10 @@ public class ChatWindow
 
         this.addWindowListener(new ChatWindowAdapter());
 
-        int width
-            = GuiActivator.getResources().getSettingsInt("chatWindowWidth");
-        int height
-            = GuiActivator.getResources().getSettingsInt("chatWindowHeight");
+        int width = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.CHAT_WINDOW_WIDTH");
+        int height = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.CHAT_WINDOW_HEIGHT");
 
         this.setSize(width, height);
     }
@@ -858,10 +859,11 @@ public class ChatWindow
          */
         public LogoBar()
         {
-            int width
-                = GuiActivator.getResources().getSettingsInt("logoBarWidth");
-            int height
-                = GuiActivator.getResources().getSettingsInt("logoBarHeight");
+            int width = GuiActivator.getResources()
+                .getSettingsInt("impl.gui.LOGO_BAR_WIDTH");
+
+            int height = GuiActivator.getResources()
+                .getSettingsInt("impl.gui.LOGO_BAR_HEIGHT");
 
             this.setMinimumSize(new Dimension(width, height));
             this.setPreferredSize(new Dimension(width, height));
@@ -990,7 +992,8 @@ public class ChatWindow
                                                                 10,
                                                                 10);
 
-            this.setIconImage(contactPhotoIcon.getImage());
+            if (contactPhotoIcon != null)
+                this.setIconImage(contactPhotoIcon.getImage());
         }
         else
         {
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
index a5f0650..9dbece0 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
@@ -18,7 +18,6 @@ import javax.swing.undo.*;
 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.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.main.chat.toolBars.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -100,9 +99,9 @@ public class ChatWritePanel
             GuiActivator.getConfigurationService();
 
         String messageCommandProperty = 
-            "net.java.sip.communicator.impl.gui.sendMessageCommand";
+            "service.gui.SEND_MESSAGE_COMMAND";
         String messageCommand = configService.getString(messageCommandProperty);
-        
+
         if(messageCommand == null)
             messageCommand = 
                 GuiActivator.getResources().
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 22af814..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
@@ -160,7 +160,7 @@ public class SmiliesSelectorBox
         this.selectorBox.setVerticalTextPosition(SwingConstants.BOTTOM);
         this.selectorBox.setHorizontalTextPosition(SwingConstants.CENTER);
         this.selectorBox.setForeground(new Color(GuiActivator.getResources()
-            .getColor("chatMenuForeground")));
+            .getColor("service.gui.CHAT_MENU_FOREGROUND")));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
index 68f95ef..1486415 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
@@ -12,6 +12,7 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * The <tt>DatesListRenderer</tt> is a <tt>ListCellRenderer</tt>, specialized
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 bee6d28..d3f1845 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
@@ -60,7 +60,8 @@ public class EditMenu extends SIPCommMenu
         this.chatWindow = chatWindow;
 
         this.setForeground(new Color(
-            GuiActivator.getResources().getColor("chatMenuForeground")));
+            GuiActivator.getResources()
+                .getColor("service.gui.CHAT_MENU_FOREGROUND")));
 
         this.cutMenuItem.setName("cut");
         this.copyMenuItem.setName("copy");
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 d196976..dbaed5f 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
@@ -55,7 +55,8 @@ public class FileMenu extends SIPCommMenu
         this.parentWindow = parentWindow;
 
         this.setForeground(new Color(
-            GuiActivator.getResources().getColor("chatMenuForeground")));
+            GuiActivator.getResources()
+                .getColor("service.gui.CHAT_MENU_FOREGROUND")));
 
         this.setMnemonic(Messages.getI18NString("file").getMnemonic());
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java
index dd1f29f..64143ae 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java
@@ -44,7 +44,8 @@ public class HelpMenu
         this.setOpaque(false);
 
         this.setForeground(new Color(
-            GuiActivator.getResources().getColor("chatMenuForeground")));
+            GuiActivator.getResources()
+                .getColor("service.gui.CHAT_MENU_FOREGROUND")));
 
         this.setMnemonic(Messages.getI18NString("help").getMnemonic());
 
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 f2245b3..c7e3b90 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
@@ -54,7 +54,7 @@ public class MessageWindowMenuBar
 
         this.setForeground(
             new Color(GuiActivator.getResources()
-                    .getColor("mainMenuForeground")));
+                    .getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         fileMenu = new FileMenu(this.parentWindow);
 
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 d02ea60..9408e12 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
@@ -92,13 +92,15 @@ public class ExtendedMainToolBar
         ImageLoader.getImage(ImageLoader.QUICK_MENU_CONFIGURE_ICON));
 
     private static int DEFAULT_BUTTON_HEIGHT
-        = GuiActivator.getResources().getSettingsInt("mainToolbarButtonHeight");
+        = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_TOOLBAR_BUTTON_HEIGHT");
 
     private static int DEFAULT_BUTTON_WIDTH
-        = GuiActivator.getResources().getSettingsInt("mainToolbarButtonWidth");
+        = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_TOOLBAR_BUTTON_WIDTH");
 
     private ChatWindow messageWindow;
-    
+
     private Contact currentChatContact = null;
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java
index 00c8541..4d40342 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ActionMenuPanel.java
@@ -30,10 +30,12 @@ public class ActionMenuPanel
     private Logger logger = Logger.getLogger(ActionMenuPanel.class);
 
     private Color baseStartColor = new Color(
-        GuiActivator.getResources().getColor("actionPanelBgStartColor"));
+        GuiActivator.getResources().getColor(
+            "service.gui.FAVORITES_PANEL_BACKGROUND"));
 
     private Color baseEndColor = new Color(
-        GuiActivator.getResources().getColor("actionPanelBgEndColor"));
+        GuiActivator.getResources().getColor(
+            "service.gui.FAVORITES_PANEL_BACKGROUND_GRADIENT"));
 
     private Color startBgColor = new Color( baseStartColor.getRed(),
                                             baseStartColor.getGreen(),
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
index 38a47a6..b26e27d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
@@ -48,7 +48,7 @@ public class ContactListCellRenderer
 
     private final int rowTransparency =
         GuiActivator.getResources()
-            .getSettingsInt("contactListRowTransparency");
+            .getSettingsInt("impl.gui.CONTACT_LIST_TRANSPARENCY");
 
     private final Image msgReceivedImage =
         ImageLoader.getImage(ImageLoader.MESSAGE_RECEIVED_ICON);
@@ -69,13 +69,13 @@ public class ContactListCellRenderer
         super(new BorderLayout());
 
         int groupForegroundProperty = GuiActivator.getResources()
-            .getColor("contactListGroupForeground");
+            .getColor("service.gui.CONTACT_LIST_GROUP_FOREGROUND");
 
         if (groupForegroundProperty > -1)
             groupForegroundColor = new Color (groupForegroundProperty);
 
         int contactForegroundProperty = GuiActivator.getResources()
-                .getColor("contactListContactForeground");
+                .getColor("service.gui.CONTACT_LIST_CONTACT_FOREGROUND");
 
         if (contactForegroundProperty > -1)
             contactForegroundColor = new Color(contactForegroundProperty);
@@ -228,7 +228,7 @@ public class ContactListCellRenderer
         else if (index%2 > 0)
         {
             Color bgColor = new Color(GuiActivator.getResources()
-                    .getColor("contactListRowColor"), true);
+                    .getColor("service.gui.CONTACT_LIST_ROW"), true);
 
             g2.setColor(new Color(  bgColor.getRed(),
                                     bgColor.getGreen(),
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java
index 92fa4a7..c12158a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactTooltip.java
@@ -12,6 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.metal.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * The tooltip shown over a contact in the contact list.
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 8f71124..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
@@ -40,7 +40,8 @@ public class AboutWindow
 

         this.versionLabel.setFont(Constants.FONT.deriveFont(12));

         this.versionLabel.setForeground(new Color(

-            GuiActivator.getResources().getColor("splashScreenTitleColor")));

+            GuiActivator.getResources()

+                .getColor("service.gui.SPLASH_SCREEN_TITLE_COLOR")));

         this.versionLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);

 

         this.mainPanel.add(versionLabel);

diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
index 4b10598..6104a95 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
@@ -84,10 +84,12 @@ public class ExtendedQuickMenu
         ImageLoader.getImage(ImageLoader.QUICK_MENU_CREATE_GROUP_ICON));
 
     private static int DEFAULT_BUTTON_HEIGHT
-        = GuiActivator.getResources().getSettingsInt("mainToolbarButtonHeight");
+        = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_TOOLBAR_BUTTON_HEIGHT");
 
     private static int DEFAULT_BUTTON_WIDTH
-        = GuiActivator.getResources().getSettingsInt("mainToolbarButtonWidth");
+        = GuiActivator.getResources()
+            .getSettingsInt("impl.gui.MAIN_TOOLBAR_BUTTON_WIDTH");
 
     private MoreButton moreButton = new MoreButton();
 
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 e659932..d845bcd 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
@@ -82,7 +82,7 @@ public class FileMenu
         this.setOpaque(false);
 
         this.setForeground(
-            new Color(GuiActivator.getResources().getColor("mainMenuForeground")));
+            new Color(GuiActivator.getResources().getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         this.parentWindow = parentWindow;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
index 33f423b..c17f61e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
@@ -55,7 +55,7 @@ public class HelpMenu
 
         this.setForeground(
             new Color(GuiActivator.getResources().
-                getColor("mainMenuForeground")));
+                getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         this.initPluginComponents();
     }
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 0e12b16..f9a37b7 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
@@ -48,7 +48,7 @@ public class MainMenu
     {
         this.setForeground(
             new Color(GuiActivator.getResources()
-                    .getColor("mainMenuForeground")));
+                    .getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         this.fileMenu = new FileMenu(mainFrame);
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
index 9387b14..75892f9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
@@ -56,7 +56,7 @@ public class ToolsMenu
 
         this.setForeground(
             new Color(GuiActivator.getResources().
-                getColor("mainMenuForeground")));
+                getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         this.parentWindow = parentWindow;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java
index aba7642..2c0c667 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java
@@ -39,7 +39,7 @@ public class ViewMenu
 
         this.setForeground(
             new Color(GuiActivator.getResources().
-                getColor("mainMenuForeground")));
+                getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         this.mainFrame = mainFrame;
 
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java
index 30c303f..457677e 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java
@@ -67,7 +67,7 @@ public class ConfigurationManager
 
         // Load the "auPopupNewMessage" property.
         String autoPopupProperty = 
-            "net.java.sip.communicator.impl.gui.autoPopupNewMessage";
+            "service.gui.AUTO_POPUP_NEW_MESSAGE";
 
         String autoPopup = configService.getString(autoPopupProperty);
         
@@ -80,7 +80,7 @@ public class ConfigurationManager
 
         // Load the "sendMessageCommand" property.
         String messageCommandProperty = 
-            "net.java.sip.communicator.impl.gui.sendMessageCommand";
+            "service.gui.SEND_MESSAGE_COMMAND";
         String messageCommand = configService.getString(messageCommandProperty);
         
         if(messageCommand == null)
@@ -129,7 +129,7 @@ public class ConfigurationManager
 
         // Load the "sendTypingNotifications" property.
         String isSendTypingNotifProperty = 
-            "net.java.sip.communicator.impl.gui.sendTypingNotifications";
+            "service.gui.SEND_TYPING_NOTIFICATIONS_ENABLED";
         String isSendTypingNotif = 
             configService.getString(isSendTypingNotifProperty);
         
@@ -159,7 +159,7 @@ public class ConfigurationManager
 
         // Load the "isMultiChatWindowEnabled" property.
         String isMultiChatWindowEnabledStringProperty
-            = "net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled";
+            = "service.gui.IS_MULTI_CHAT_WINDOW_ENABLED";
         
         String isMultiChatWindowEnabledString
             = configService.getString(isMultiChatWindowEnabledStringProperty);
@@ -192,7 +192,7 @@ public class ConfigurationManager
         
         // Load the "isHistoryShown" property.
         String isHistoryShownStringProperty = 
-            "net.java.sip.communicator.impl.gui.isMessageHistoryShown";
+            "service.gui.IS_MESSAGE_HISTORY_SHOWN";
         
         String isHistoryShownString
             = configService.getString(isHistoryShownStringProperty);
@@ -212,7 +212,7 @@ public class ConfigurationManager
         
         // Load the "chatHistorySize" property.
         String chatHistorySizeStringProperty =
-            "net.java.sip.communicator.impl.gui.messageHistorySize";
+            "service.gui.MESSAGE_HISTORY_SIZE";
         String chatHistorySizeString
             = configService.getString(chatHistorySizeStringProperty);
         
@@ -231,7 +231,7 @@ public class ConfigurationManager
 
         // Load the "isTransparentWindowEnabled" property.
         String isTransparentWindowEnabledProperty =
-            "net.java.sip.communicator.impl.gui.isTransparentWindowEnabled";
+            "impl.gui.IS_TRANSPARENT_WINDOW_ENABLED";
 
         String isTransparentWindowEnabledString
             = configService.getString(isTransparentWindowEnabledProperty);
@@ -250,7 +250,7 @@ public class ConfigurationManager
 
         // Load the "windowTransparency" property.
         String windowTransparencyProperty =
-            "net.java.sip.communicator.impl.gui.windowTransparency";
+            "impl.gui.WINDOW_TRANSPARENCY";
 
         String windowTransparencyString
             = configService.getString(windowTransparencyProperty);
@@ -269,7 +269,7 @@ public class ConfigurationManager
 
         // Load the "isWindowDecorated" property.
         String isWindowDecoratedProperty
-            = "net.java.sip.communicator.impl.gui.isWindowDecorated";
+            = "impl.gui.IS_WINDOW_DECORATED";
 
         String isWindowDecoratedString
             = configService.getString(isWindowDecoratedProperty);
@@ -598,7 +598,7 @@ public class ConfigurationManager
         isTransparentWindowEnabled = isTransparent;
 
         configService.setProperty(
-                "net.java.sip.communicator.impl.gui.isTransparentWindowEnabled",
+                "impl.gui.IS_TRANSPARENT_WINDOW_ENABLED",
                 Boolean.toString(isTransparentWindowEnabled));
     }
 
@@ -881,7 +881,7 @@ public class ConfigurationManager
                 "net.java.sip.communicator.impl.gui.addcontact.lastContactParent"))
                 lastContactParent = (String)evt.getNewValue();
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.autoPopupNewMessage"))
+                "service.gui.AUTO_POPUP_NEW_MESSAGE"))
             {
                 String autoPopupString = (String) evt.getNewValue();
                 
@@ -889,7 +889,7 @@ public class ConfigurationManager
                     = new Boolean(autoPopupString).booleanValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.sendMessageCommand"))
+                "service.gui.SEND_MESSAGE_COMMAND"))
             {
                 sendMessageCommand
                     = (String) evt.getNewValue();
@@ -927,7 +927,7 @@ public class ConfigurationManager
                     = new Boolean(showQuitWarningString).booleanValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.sendTypingNotifications"))
+                "service.gui.SEND_TYPING_NOTIFICATIONS_ENABLED"))
             {
                 String sendTypingNorifString = (String) evt.getNewValue();
                 
@@ -943,7 +943,7 @@ public class ConfigurationManager
                     = new Boolean(moveContactConfirmString).booleanValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled"))
+                "service.gui.IS_MULTI_CHAT_WINDOW_ENABLED"))
             {
                 String multiChatWindowString = (String) evt.getNewValue();
                 
@@ -959,7 +959,7 @@ public class ConfigurationManager
                     = new Boolean(historyLoggingString).booleanValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.isMessageHistoryShown"))
+                "service.gui.IS_MESSAGE_HISTORY_SHOWN"))
             {
                 String historyShownString = (String) evt.getNewValue();
                 
@@ -967,7 +967,7 @@ public class ConfigurationManager
                     = new Boolean(historyShownString).booleanValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.messageHistorySize"))
+                "service.gui.MESSAGE_HISTORY_SIZE"))
             {
                 String chatHistorySizeString = (String) evt.getNewValue();
                 
@@ -975,7 +975,7 @@ public class ConfigurationManager
                     = new Integer(chatHistorySizeString).intValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.isTransparentWindowEnabled"))
+                "impl.gui.IS_TRANSPARENT_WINDOW_ENABLED"))
             {
                 String isTransparentString = (String) evt.getNewValue();
 
@@ -983,7 +983,7 @@ public class ConfigurationManager
                     = new Boolean(isTransparentString).booleanValue();
             }
             else if (evt.getPropertyName().equals(
-                "net.java.sip.communicator.impl.gui.windowTransparency"))
+                "impl.gui.WINDOW_TRANSPARENCY"))
             {
                 String windowTransparencyString = (String) evt.getNewValue();
 
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 0fde341..ad318f6 100755
--- a/src/net/java/sip/communicator/impl/gui/utils/Constants.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/Constants.java
@@ -140,7 +140,7 @@ public class Constants
      */
     public static final Color HISTORY_IN_CALL_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("historyIncomingCallBackground"));
+            getColor("service.gui.HISTORY_INCOMING_CALL_BACKGROUND"));
 
     /**
      * The color used to paint the background of an outgoing call history
@@ -148,7 +148,7 @@ public class Constants
      */
     public static final Color HISTORY_OUT_CALL_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("historyOutgoingCallBackground"));
+            getColor("service.gui.HISTORY_OUTGOING_CALL_BACKGROUND"));
 
     /**
      * The end color used to paint a gradient selected background of some
@@ -156,7 +156,7 @@ public class Constants
      */
     public static final Color SELECTED_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("listSelectionColor"));
+            getColor("service.gui.LIST_SELECTION_COLOR"));
 
     /**
      * The start color used to paint a gradient mouse over background of some
@@ -164,7 +164,7 @@ public class Constants
      */
     public static final Color GRADIENT_DARK_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("gradientDarkColor"));
+            getColor("service.gui.GRADIENT_DARK_COLOR"));
 
     /**
      * The end color used to paint a gradient mouse over background of some
@@ -172,14 +172,14 @@ public class Constants
      */
     public static final Color GRADIENT_LIGHT_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("gradientLightColor"));
+            getColor("service.gui.GRADIENT_LIGHT_COLOR"));
 
     /**
      * A color between blue and gray used to paint some borders.
      */
     public static final Color BORDER_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("borderColor"));
+            getColor("service.gui.BORDER_COLOR"));
 
     /**
      * A color between blue and gray (darker than the other one), used to paint
@@ -187,14 +187,14 @@ public class Constants
      */
     public static final Color LIST_SELECTION_BORDER_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("listSelectionBorderColor"));
+            getColor("service.gui.LIST_SELECTION_BORDER_COLOR"));
 
     /**
      * The color used to paint the background of contact list groups.
      */
     public static final Color CONTACT_LIST_GROUP_BG_COLOR
         = new Color(GuiActivator.getResources()
-                .getColor("contactListGroupRowColor"));
+                .getColor("service.gui.CONTACT_LIST_GROUP_ROW"));
 
     /**
      * The end color used to paint a gradient mouse over background of some
@@ -202,7 +202,7 @@ public class Constants
      */
     public static final Color CONTACT_LIST_GROUP_BG_GRADIENT_COLOR
         = new Color(GuiActivator.getResources().
-            getColor("contactListGroupGradientColor"));
+            getColor("service.gui.CONTACT_LIST_GROUP_GRADIENT"));
 
     /*
      * ======================================================================
@@ -397,8 +397,8 @@ public class Constants
      */
     public static void loadSimpleStyle(StyleSheet style) {
 
-        InputStream is = 
-            GuiActivator.getResources().getSettingsInputStream("textStyle");
+        InputStream is = GuiActivator.getResources()
+            .getSettingsInputStream("service.gui.HTML_TEXT_STYLE");
 
         Reader r = new BufferedReader(new InputStreamReader(is));
         try {
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
index 535e8ce..f8d67f6 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
@@ -39,7 +39,7 @@ public class ImageLoader {
      * The SIP Communicator logo 16x16 icon.
      */
     public static final ImageID SIP_COMMUNICATOR_LOGO
-        = new ImageID("SIP_COMMUNICATOR_LOGO");
+        = new ImageID("service.gui.SIP_COMMUNICATOR_LOGO");
 
     /*------------------------------------------------------------------------
      * =========================LOOK AND FEEL IMAGES==========================
@@ -48,177 +48,146 @@ public class ImageLoader {
     /**
      * The background image of a button.
      */
-    public static final ImageID BUTTON = new ImageID("BUTTON");
+    public static final ImageID BUTTON
+        = new ImageID("service.gui.lookandfeel.BUTTON");
 
     /**
      * The rollover image of a button.
      */
     public static final ImageID BUTTON_ROLLOVER
-        = new ImageID("BUTTON_ROLLOVER");
-
-    /**
-     * The background image of a button.
-     */
-    public static final ImageID BUTTON_BG_LEFT
-        = new ImageID("BUTTON_BG_LEFT");
-
-    /**
-     * The background image of a button.
-     */
-    public static final ImageID BUTTON_BG_RIGHT
-        = new ImageID("BUTTON_BG_RIGHT");
-
-    /**
-     * The background image of a button.
-     */
-    public static final ImageID BUTTON_BG_MIDDLE
-        = new ImageID("BUTTON_BG_MIDDLE");
-
-    /**
-     * The background image of a button.
-     */
-    public static final ImageID BUTTON_ROLLOVER_BG_LEFT
-        = new ImageID("BUTTON_ROLLOVER_BG_LEFT");
-
-    /**
-     * The background image of a button.
-     */
-    public static final ImageID BUTTON_ROLLOVER_BG_RIGHT
-        = new ImageID("BUTTON_ROLLOVER_BG_RIGHT");
-
-    /**
-     * The background image of a button.
-     */
-    public static final ImageID BUTTON_ROLLOVER_BG_MIDDLE
-        = new ImageID("BUTTON_ROLLOVER_BG_MIDDLE");
+        = new ImageID("service.gui.lookandfeel.BUTTON_ROLLOVER");
 
     /**
      * The pressed toggle button background image.
      */
     public static final ImageID TOGGLE_BUTTON_PRESSED
-        = new ImageID("TOGGLE_BUTTON_PRESSED");
+        = new ImageID("service.gui.lookandfeel.TOGGLE_BUTTON_PRESSED");
 
     /**
      * The toggle button background image.
      */
     public static final ImageID TOGGLE_BUTTON
-        = new ImageID("TOGGLE_BUTTON");
+        = new ImageID("service.gui.lookandfeel.TOGGLE_BUTTON");
 
     /**
      * The image used for a horizontal split.
      */
     public static final ImageID SPLITPANE_HORIZONTAL
-        = new ImageID("SPLITPANE_HORIZONTAL");
+        = new ImageID("service.gui.lookandfeel.SPLITPANE_HORIZONTAL");
 
     /**
      * The image used for a vertical split.
      */
     public static final ImageID SPLITPANE_VERTICAL
-        = new ImageID("SPLITPANE_VERTICAL");
+        = new ImageID("service.gui.lookandfeel.SPLITPANE_VERTICAL");
 
     /**
      * The image used for the "thumb" of a vertical scrollbar.
      */
     public static final ImageID SCROLLBAR_THUMB_VERTICAL
-        = new ImageID("SCROLLBAR_VERTICAL");
+        = new ImageID("service.gui.lookandfeel.SCROLLBAR_VERTICAL");
 
     /**
      * The image used for the "thumb" of a horizontal scrollbar.
      */
     public static final ImageID SCROLLBAR_THUMB_HORIZONTAL
-        = new ImageID("SCROLLBAR_HORIZONTAL");
+        = new ImageID("service.gui.lookandfeel.SCROLLBAR_HORIZONTAL");
 
     /**
      * The image used for the "thumb handle" of a horizontal scrollbar.
      */
     public static final ImageID SCROLLBAR_THUMB_HANDLE_HORIZONTAL
-        = new ImageID("SCROLLBAR_THUMB_HORIZONTAL");
+        = new ImageID("service.gui.lookandfeel.SCROLLBAR_THUMB_HORIZONTAL");
 
     /**
      * The image used for the "thumb handle" of a vertical scrollbar.
      */
     public static final ImageID SCROLLBAR_THUMB_HANDLE_VERTICAL
-        = new ImageID("SCROLLBAR_THUMB_VERTICAL");
+        = new ImageID("service.gui.lookandfeel.SCROLLBAR_THUMB_VERTICAL");
 
     /**
      * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
      * of a tab.
      */
-    public static final ImageID TAB_LEFT_BG = new ImageID("TAB_LEFT_BG");
+    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("TAB_MIDDLE_BG");
+    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("TAB_RIGHT_BG");
+    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("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("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("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
-        = new ImageID("CLOSABLE_TAB_BG");
+        = new ImageID("service.gui.lookandfeel.CLOSABLE_TAB_BG");
 
     /**
      * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the background
      * of a closable selected tab.
      */
     public static final ImageID SELECTED_CLOSABLE_TAB_BG
-        = new ImageID("SELECTED_CLOSABLE_TAB_BG");
+        = 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("CLOSE_TAB_ICON");
+    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("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.
      */
     public static final ImageID DELETE_TEXT_ICON
-        = new ImageID("DELETE_TEXT_ICON");
+        = new ImageID("service.gui.lookandfeel.DELETE_TEXT_ICON");
 
     /**
      * The image used in the <tt>SIPCommLookAndFeel</tt> to paint the rollover
      * icon used to delete text in text fields and editable combo boxes.
      */
     public static final ImageID DELETE_TEXT_ROLLOVER_ICON
-        = new ImageID("DELETE_TEXT_ROLLOVER_ICON");
+        = new ImageID("service.gui.lookandfeel.DELETE_TEXT_ROLLOVER_ICON");
 
     /////////////////////// OptionPane icons /////////////////////////////
 
@@ -226,19 +195,22 @@ public class ImageLoader {
      * The icon used in the <tt>SIPCommLookAndFeel</tt> to paint the icon
      * of an option pane warning message.
      */
-    public static final ImageID WARNING_ICON = new ImageID("WARNING_ICON");
+    public static final ImageID WARNING_ICON
+        = new ImageID("service.gui.icons.WARNING_ICON");
 
     /**
      * The icon used in the <tt>SIPCommLookAndFeel</tt> to paint the icon
      * of an option pane error message.
      */
-    public static final ImageID ERROR_ICON = new ImageID("ERROR_ICON");
+    public static final ImageID ERROR_ICON
+        = new ImageID("service.gui.icons.ERROR_ICON");
 
     /**
      * The icon used in the <tt>SIPCommLookAndFeel</tt> to paint the icon
      * of an option pane info message.
      */
-    public static final ImageID INFO_ICON = new ImageID("INFO_ICON");
+    public static final ImageID INFO_ICON
+        = new ImageID("service.gui.icons.INFO_ICON");
 
     /*------------------------------------------------------------------------
      * ============================APPLICATION ICONS =========================
@@ -249,324 +221,313 @@ public class ImageLoader {
      * The background of the main window and chat window.
      */
     public static final ImageID MAIN_WINDOW_BACKGROUND
-        = new ImageID("MAIN_WINDOW_BACKGROUND");
+        = new ImageID("service.gui.MAIN_WINDOW_BACKGROUND");
 
     /**
      * The add icon used in some forms.
      */
     public static final ImageID ADD_ICON
-        = new ImageID("ADD_ICON");
+        = new ImageID("service.gui.icons.ADD_ICON");
 
     /**
      * The background of the main window and chat window.
      */
     public static final ImageID MORE_BUTTON
-        = new ImageID("MORE_BUTTON");
+        = new ImageID("service.gui.buttons.MORE_BUTTON");
 
     /**
      * Closed group icon.
      */
     public static final ImageID RIGHT_ARROW_ICON
-        = new ImageID("RIGHT_ARROW_ICON");
+        = new ImageID("service.gui.icons.RIGHT_ARROW_ICON");
 
     /**
      * The background of the main window and chat window.
      */
     public static final ImageID DOWN_ARROW_ICON
-        = new ImageID("DOWN_ARROW_ICON");
+        = new ImageID("service.gui.icons.DOWN_ARROW_ICON");
 
     /**
      * The icon on the "Add contact" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID ACCOUNT_ICON
-        = new ImageID("ACCOUNT_ICON");
+        = new ImageID("service.gui.icons.ACCOUNT_ICON");
 
     /**
      * The icon on the "Add contact" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_ADD_ICON
-        = new ImageID("QUICK_MENU_ADD_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_ADD_ICON");
 
     /**
      * The icon on the "Configure" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_CONFIGURE_ICON
-        = new ImageID("QUICK_MENU_CONFIGURE_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_CONFIGURE_ICON");
 
     /**
      * The icon on the "Hide/Show offline contacts" button in the
      * <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_SHOW_OFFLINE_ICON
-        = new ImageID("QUICK_MENU_SHOW_OFFLINE_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_SHOW_OFFLINE_ICON");
 
     /**
      * The icon on the "Hide/Show offline contacts" button in the
      * <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_HIDE_OFFLINE_ICON
-        = new ImageID("QUICK_MENU_HIDE_OFFLINE_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_HIDE_OFFLINE_ICON");
 
     /**
      * The icon on the "Info" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_INFO_ICON
-        = new ImageID("QUICK_MENU_INFO_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_INFO_ICON");
 
     /**
      * The icon on the "Sound" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_SOUND_ON_ICON
-        = new ImageID("QUICK_MENU_SOUND_ON_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_SOUND_ON_ICON");
 
     /**
      * The icon on the "Sound" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID QUICK_MENU_SOUND_OFF_ICON
-        = new ImageID("QUICK_MENU_SOUND_OFF_ICON");
-
-    /**
-     * The background image of a <tt>QuickMenu</tt> button.
-     */
-    public static final ImageID QUICK_MENU_BUTTON_BG
-        = new ImageID("QUICK_MENU_BUTTON_BG");
-
-    /**
-     * The background rollover image of a <tt>QuickMenu</tt> button.
-     */
-    public static final ImageID QUICK_MENU_BUTTON_ROLLOVER_BG
-        = new ImageID("QUICK_MENU_BUTTON_ROLLOVER_BG");
+        = new ImageID("service.gui.icons.QUICK_MENU_SOUND_OFF_ICON");
 
     /**
      * The background rollover image of a <tt>QuickMenu</tt> button.
      */
     public static final ImageID QUICK_MENU_MY_CHAT_ROOMS_ICON
-        = new ImageID("QUICK_MENU_MY_CHAT_ROOMS_ICON");
+        = new ImageID("service.gui.icons.QUICK_MENU_MY_CHAT_ROOMS_ICON");
 
     /**
      * The call button image.
      */
     public static final ImageID CALL_BUTTON_BG
-        = new ImageID("CALL_BUTTON_BG");
+        = new ImageID("service.gui.buttons.CALL_BUTTON_BG");
 
     /**
      * The hangup button image.
      */
     public static final ImageID HANGUP_BUTTON_BG
-        = new ImageID("HANGUP_BUTTON_BG");
+        = new ImageID("service.gui.buttons.HANGUP_BUTTON_BG");
 
     /**
      * The hangup button mouse over image.
      */
     public static final ImageID HANGUP_ROLLOVER_BUTTON_BG
-        = new ImageID("HANGUP_ROLLOVER_BUTTON_BG");
+        = new ImageID("service.gui.buttons.HANGUP_ROLLOVER_BUTTON_BG");
 
     /**
      * The hangup button pressed image.
      */
     public static final ImageID CALL_BUTTON_PRESSED_BG
-        = new ImageID("CALL_BUTTON_PRESSED_BG");
+        = new ImageID("service.gui.buttons.CALL_BUTTON_PRESSED_BG");
 
     /**
      * The hangup button pressed image.
      */
     public static final ImageID HANGUP_BUTTON_PRESSED_BG
-        = new ImageID("HANGUP_BUTTON_PRESSED_BG");
+        = new ImageID("service.gui.buttons.HANGUP_BUTTON_PRESSED_BG");
 
     /**
      * The background image for the <tt>StatusSelectorBox</tt>.
      */
     public static final ImageID STATUS_SELECTOR_BOX
-        = new ImageID("STATUS_SELECTOR_BOX");
+        = new ImageID("service.gui.buttons.STATUS_SELECTOR_BOX");
 
     /**
      * A dial button icon.
      */
     public static final ImageID ONE_DIAL_BUTTON
-        = new ImageID("ONE_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.ONE_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID TWO_DIAL_BUTTON
-        = new ImageID("TWO_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.TWO_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID THREE_DIAL_BUTTON
-        = new ImageID("THREE_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.THREE_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID FOUR_DIAL_BUTTON
-        = new ImageID("FOUR_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.FOUR_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID FIVE_DIAL_BUTTON
-        = new ImageID("FIVE_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.FIVE_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID SIX_DIAL_BUTTON
-        = new ImageID("SIX_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.SIX_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID SEVEN_DIAL_BUTTON
-        = new ImageID("SEVEN_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.SEVEN_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID EIGHT_DIAL_BUTTON
-        = new ImageID("EIGHT_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.EIGHT_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID NINE_DIAL_BUTTON
-        = new ImageID("NINE_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.NINE_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID STAR_DIAL_BUTTON
-        = new ImageID("STAR_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.STAR_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID ZERO_DIAL_BUTTON
-        = new ImageID("ZERO_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.ZERO_DIAL_BUTTON");
 
     /**
      * A dial button icon.
      */
     public static final ImageID DIEZ_DIAL_BUTTON
-        = new ImageID("DIEZ_DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.DIEZ_DIAL_BUTTON");
 
     /**
      * A dial button icon. The icon shown in the CallParticipant panel.
      */
     public static final ImageID DIAL_BUTTON
-        = new ImageID("DIAL_BUTTON");
+        = new ImageID("service.gui.buttons.DIAL_BUTTON");
 
     /**
      * A put-on/off-hold button icon. The icon shown in the CallParticipant
      * panel.
      */
     public static final ImageID HOLD_BUTTON
-        = new ImageID("HOLD_BUTTON");
+        = new ImageID("service.gui.buttons.HOLD_BUTTON");
 
     /**
      * A mute button icon. The icon shown in the CallParticipant panel.
      */
-    public static final ImageID MUTE_BUTTON = new ImageID("MUTE_BUTTON");
+    public static final ImageID MUTE_BUTTON
+        = new ImageID("service.gui.buttons.MUTE_BUTTON");
 
     /**
      * A call-transfer button icon. The icon shown in the CallParticipant panel.
      */
     public static final ImageID TRANSFER_CALL_BUTTON =
-        new ImageID("TRANSFER_CALL_BUTTON");
+        new ImageID("service.gui.buttons.TRANSFER_CALL_BUTTON");
 
     /**
      * The secure button on icon. The icon shown in the CallParticipant panel.
      */
     public static final ImageID SECURE_BUTTON_ON =
-        new ImageID("SECURE_BUTTON_ON");
+        new ImageID("service.gui.buttons.SECURE_BUTTON_ON");
 
     /**
      * The secure button off icon. The icon shown in the CallParticipant panel.
      */
     public static final ImageID SECURE_BUTTON_OFF =
-        new ImageID("SECURE_BUTTON_OFF");
+        new ImageID("service.gui.buttons.SECURE_BUTTON_OFF");
 
     /**
      * The button icon of the Enter Full Screen command. The icon shown in the
      * CallParticipant panel.
      */
     public static final ImageID ENTER_FULL_SCREEN_BUTTON =
-        new ImageID("ENTER_FULL_SCREEN_BUTTON");
+        new ImageID("service.gui.buttons.ENTER_FULL_SCREEN_BUTTON");
 
     /**
      * The button icon of the Exit Full Screen command. The icon shown in the
      * CallParticipant panel.
      */
     public static final ImageID EXIT_FULL_SCREEN_BUTTON =
-        new ImageID("EXIT_FULL_SCREEN_BUTTON");
+        new ImageID("service.gui.buttons.EXIT_FULL_SCREEN_BUTTON");
 
     /**
      * The image used, when a contact has no photo specified.
      */
     public static final ImageID DEFAULT_USER_PHOTO
-        = new ImageID("DEFAULT_USER_PHOTO");
+        = new ImageID("service.gui.DEFAULT_USER_PHOTO");
 
     /**
      * The image used to draw a frame around the contact photo image.
      */
     public static final ImageID USER_PHOTO_FRAME
-        = new ImageID("USER_PHOTO_FRAME");
+        = new ImageID("service.gui.USER_PHOTO_FRAME");
 
     /**
      * The image used to draw a shadow over the contact photo image.
      */
     public static final ImageID USER_PHOTO_SHADOW
-        = new ImageID("USER_PHOTO_SHADOW");
+        = new ImageID("service.gui.USER_PHOTO_SHADOW");
 
     /**
      * The minimize button icon in the <tt>CallPanel</tt>.
      */
     public static final ImageID CALL_PANEL_MINIMIZE_BUTTON
-        = new ImageID("CALL_PANEL_MINIMIZE_BUTTON");
+        = new ImageID("service.gui.buttons.CALL_PANEL_MINIMIZE_BUTTON");
 
     /**
      * The restore button icon in the <tt>CallPanel</tt>.
      */
     public static final ImageID CALL_PANEL_RESTORE_BUTTON
-        = new ImageID("CALL_PANEL_RESTORE_BUTTON");
+        = new ImageID("service.gui.buttons.CALL_PANEL_RESTORE_BUTTON");
 
     /**
      * The minimize rollover button icon in the <tt>CallPanel</tt>.
      */
     public static final ImageID CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON
-        = new ImageID("CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.CALL_PANEL_MINIMIZE_ROLLOVER_BUTTON");
 
     /**
      * The restore rollover button icon in the <tt>CallPanel</tt>.
      */
     public static final ImageID CALL_PANEL_RESTORE_ROLLOVER_BUTTON
-        = new ImageID("CALL_PANEL_RESTORE_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.CALL_PANEL_RESTORE_ROLLOVER_BUTTON");
 
     /**
      * The icon image of the "Add contact to chat" button in the
      * chat window.
      */
     public static final ImageID ADD_TO_CHAT_ICON
-        = new ImageID("ADD_TO_CHAT_ICON");
+        = new ImageID("service.gui.icons.ADD_TO_CHAT_ICON");
 
     /**
      * The image used for decoration of the "Add contact" window.
      */
     public static final ImageID ADD_CONTACT_WIZARD_ICON
-        = new ImageID("ADD_CONTACT_WIZARD_ICON");
+        = new ImageID("service.gui.icons.ADD_CONTACT_WIZARD_ICON");
 
     /**
      * The image used for decoration of the "Add group" window.
      */
     public static final ImageID ADD_GROUP_ICON
-        = new ImageID("ADD_GROUP_ICON");
+        = new ImageID("service.gui.icons.ADD_GROUP_ICON");
 
     /**
      * The image used for decoration of the "Rename contact" window.
      */
     public static final ImageID RENAME_DIALOG_ICON
-        = new ImageID("RENAME_DIALOG_ICON");
+        = new ImageID("service.gui.icons.RENAME_DIALOG_ICON");
 
     /**
      * The image used for decoration of the "reason" dialog. The "reason" dialog
@@ -574,142 +535,142 @@ public class ImageLoader {
      * trying to do.
      */
     public static final ImageID REASON_DIALOG_ICON
-        = new ImageID("REASON_DIALOG_ICON");
+        = new ImageID("service.gui.icons.REASON_DIALOG_ICON");
 
     /**
      * The image used for decoration of the "Open in browser" item in
      * the right button click menu in chat window.
      */
     public static final ImageID BROWSER_ICON
-        = new ImageID("BROWSER_ICON");
+        = new ImageID("service.gui.icons.BROWSER_ICON");
 
     /**
      * The image used for decoration of all windows concerning the process of
      * authorization.
      */
     public static final ImageID AUTHORIZATION_ICON
-        = new ImageID("AUTHORIZATION_ICON");
+        = new ImageID("service.gui.icons.AUTHORIZATION_ICON");
 
     /**
      * The image used for decoration of incoming calls in the call list panel.
      */
     public static final ImageID INCOMING_CALL_ICON
-        = new ImageID("INCOMING_CALL");
+        = new ImageID("service.gui.icons.INCOMING_CALL");
 
     /**
      * The image used for decoration of outgoing calls in the call list panel.
      */
     public static final ImageID OUTGOING_CALL_ICON
-        = new ImageID("OUTGOING_CALL");
+        = new ImageID("service.gui.icons.OUTGOING_CALL");
 
     /**
      * The image used in the right button menu for the move contact item.
      */
     public static final ImageID MOVE_CONTACT_ICON
-        = new ImageID("MOVE_CONTACT");
+        = new ImageID("service.gui.icons.MOVE_CONTACT");
 
     /**
      * The image used for error messages in the chat window.
      */
     public static final ImageID EXCLAMATION_MARK
-        = new ImageID("EXCLAMATION_MARK");
+        = new ImageID("service.gui.icons.EXCLAMATION_MARK");
 
     /**
      * The image used for about window background.
      */
     public static final ImageID ABOUT_WINDOW_BACKGROUND
-        = new ImageID("ABOUT_WINDOW_BACKGROUND");
+        = new ImageID("service.gui.ABOUT_WINDOW_BACKGROUND");
 
     /**
      * The image used for opened groups.
      */
     public static final ImageID OPENED_GROUP
-        = new ImageID("OPENED_GROUP");
+        = new ImageID("service.gui.icons.OPENED_GROUP");
 
     /**
      * The image used for closed groups.
      */
     public static final ImageID CLOSED_GROUP
-        = new ImageID("CLOSED_GROUP");
+        = new ImageID("service.gui.icons.CLOSED_GROUP");
 
     /**
      * The image used for chat rooms.
      */
     public static final ImageID CHAT_ROOM_16x16_ICON
-        = new ImageID("CHAT_ROOM_16x16_ICON");
+        = new ImageID("service.gui.icons.CHAT_ROOM_16x16_ICON");
 
     /**
      * The image used for multi user chat servers.
      */
     public static final ImageID CHAT_SERVER_16x16_ICON
-        = new ImageID("CHAT_SERVER_16x16_ICON");
+        = new ImageID("service.gui.icons.CHAT_SERVER_16x16_ICON");
 
     /**
      * The image used to indicate in the contact list that a message is received
      * from a certain contact.
      */
     public static final ImageID MESSAGE_RECEIVED_ICON
-        = new ImageID("MESSAGE_RECEIVED_ICON");
+        = new ImageID("service.gui.icons.MESSAGE_RECEIVED_ICON");
 
     /**
      * The image used to set to the chat room "join" right button menu.
      */
     public static final ImageID JOIN_ICON
-        = new ImageID("JOIN_ICON");
+        = new ImageID("service.gui.icons.JOIN_ICON");
 
     /**
      * The image used to set to the chat room "join as" right button menu.
      */
     public static final ImageID JOIN_AS_ICON
-        = new ImageID("JOIN_AS_ICON");
+        = new ImageID("service.gui.icons.JOIN_AS_ICON");
 
     /**
      * The image used to set to the chat room "leave" right button menu.
      */
     public static final ImageID LEAVE_ICON
-        = new ImageID("LEAVE_ICON");
+        = new ImageID("service.gui.icons.LEAVE_ICON");
 
     /**
      * Background image of the dial button.
      */
     public static final ImageID DIAL_BUTTON_BG
-        = new ImageID("DIAL_BUTTON_BG");
+        = new ImageID("service.gui.buttons.DIAL_BUTTON_BG");
 
     /**
      * Background image when rollover on the dial button.
      */
     public static final ImageID DIAL_BUTTON_ROLLOVER_BG
-        = new ImageID("DIAL_BUTTON_ROLLOVER_BG");
+        = new ImageID("service.gui.buttons.DIAL_BUTTON_ROLLOVER_BG");
 
     /**
      * Icon used in the chat window for the "Send as SMS" option.
      */
     public static final ImageID SEND_SMS_ICON
-        = new ImageID("SEND_SMS_ICON");
+        = new ImageID("service.gui.icons.SEND_SMS_ICON");
 
     /**
      * Tool bar background image.
      */
     public static final ImageID TOOL_BAR_BACKGROUND
-        = new ImageID("TOOL_BAR_BACKGROUND");
+        = new ImageID("service.gui.TOOL_BAR_BACKGROUND");
 
     /**
      * Main menu background image.
      */
     public static final ImageID MENU_BACKGROUND
-        = new ImageID("MENU_BACKGROUND");
+        = new ImageID("service.gui.MENU_BACKGROUND");
 
     /**
      * Title bar background image.
      */
     public static final ImageID WINDOW_TITLE_BAR
-        = new ImageID("WINDOW_TITLE_BAR");
+        = new ImageID("service.gui.WINDOW_TITLE_BAR");
 
     /**
      * Title bar background image.
      */
     public static final ImageID WINDOW_TITLE_BAR_BG
-        = new ImageID("WINDOW_TITLE_BAR_BG");
+        = new ImageID("service.gui.WINDOW_TITLE_BAR_BG");
 
     /**
      * Title bar background image.
@@ -727,25 +688,25 @@ public class ImageLoader {
      * More actions button.
      */
     public static final ImageID MORE_ACTIONS_BUTTON
-        = new ImageID("MORE_ACTIONS_BUTTON");
+        = new ImageID("service.gui.buttons.MORE_ACTIONS_BUTTON");
 
     /**
      * More actions button rollover state.
      */
     public static final ImageID MORE_ACTIONS_ROLLOVER_BUTTON
-        = new ImageID("MORE_ACTIONS_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.MORE_ACTIONS_ROLLOVER_BUTTON");
 
     /**
      * More actions button.
      */
     public static final ImageID HIDE_ACTIONS_BUTTON
-        = new ImageID("HIDE_ACTIONS_BUTTON");
+        = new ImageID("service.gui.buttons.HIDE_ACTIONS_BUTTON");
 
     /**
      * More actions button rollover state.
      */
     public static final ImageID HIDE_ACTIONS_ROLLOVER_BUTTON
-        = new ImageID("MORE_ACTIONS_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.HIDE_ACTIONS_ROLLOVER_BUTTON");
 
     // ///////////////////// Edit Text Toolbar icons //////////////////////////
 
@@ -753,100 +714,48 @@ public class ImageLoader {
      * Add not in contact list contact icon.
      */
     public static final ImageID ADD_CONTACT_CHAT_ICON
-        = new ImageID("ADD_CONTACT_CHAT_ICON");
-
-    public static final ImageID DELETE_BUTTON_ICON
-        = new ImageID("DELETE_BUTTON_ICON");
+        = new ImageID("service.gui.icons.ADD_CONTACT_CHAT_ICON");
 
     /////////////////////// Edit Text Toolbar icons /////////////////////////
 
     /**
-     * "Left align" button image in the <tt>EditTextToolBar</tt> in the
-     * <tt>ChatWindow</tt>.
-     */
-    public static final ImageID ALIGN_LEFT_BUTTON
-        = new ImageID("ALIGN_LEFT_BUTTON");
-
-    /**
-     * "Right align" button image in the <tt>EditTextToolBar</tt> in the
-     * <tt>ChatWindow</tt>.
-     */
-    public static final ImageID ALIGN_RIGHT_BUTTON
-        = new ImageID("ALIGN_RIGHT_BUTTON");
-
-    /**
-     * "Center align" button image in the <tt>EditTextToolBar</tt> in the
-     * <tt>ChatWindow</tt>.
-     */
-    public static final ImageID ALIGN_CENTER_BUTTON
-        = new ImageID("ALIGN_RIGHT_BUTTON");
-
-    /**
-     * "Left align" button rollover image in the <tt>EditTextToolBar</tt> in
-     * the <tt>ChatWindow</tt>.
-     */
-    public static final ImageID ALIGN_LEFT_ROLLOVER_BUTTON
-        = new ImageID("ALIGN_LEFT_ROLLOVER_BUTTON");
-
-    /**
-     * "Right align" button rollover image in the <tt>EditTextToolBar</tt> in
-     * the <tt>ChatWindow</tt>.
-     */
-    public static final ImageID ALIGN_RIGHT_ROLLOVER_BUTTON
-        = new ImageID("ALIGN_RIGHT_ROLLOVER_BUTTON");
-
-    /**
-     * "Center align" button rollover image in the <tt>EditTextToolBar</tt> in
-     * the <tt>ChatWindow</tt>.
-     */
-    public static final ImageID ALIGN_CENTER_ROLLOVER_BUTTON
-        = new ImageID("ALIGN_CENTER_ROLLOVER_BUTTON");
-
-    /**
      * "Bold" button image in the <tt>EditTextToolBar</tt> in the
      * <tt>ChatWindow</tt>.
      */
     public static final ImageID TEXT_BOLD_BUTTON
-        = new ImageID("TEXT_BOLD_BUTTON");
+        = new ImageID("service.gui.buttons.TEXT_BOLD_BUTTON");
 
     /**
      * "Italic" button image in the <tt>EditTextToolBar</tt> in the
      * <tt>ChatWindow</tt>.
      */
     public static final ImageID TEXT_ITALIC_BUTTON
-        = new ImageID("TEXT_ITALIC_BUTTON");
+        = new ImageID("service.gui.buttons.TEXT_ITALIC_BUTTON");
 
     /**
      * "Underline" button image in the <tt>EditTextToolBar</tt> in the
      * <tt>ChatWindow</tt>.
      */
     public static final ImageID TEXT_UNDERLINED_BUTTON
-        = new ImageID("TEXT_UNDERLINED_BUTTON");
+        = new ImageID("service.gui.buttons.TEXT_UNDERLINED_BUTTON");
 
     /**
      * Edit toolbar button background icon.
      */
     public static final ImageID EDIT_TOOLBAR_BUTTON
-        = new ImageID("EDIT_TOOLBAR_BUTTON");
+        = new ImageID("service.gui.buttons.EDIT_TOOLBAR_BUTTON");
 
     /**
      * Edit toolbar button background icon for toggled state.
      */
     public static final ImageID EDIT_TOOLBAR_BUTTON_PRESSED
-        = new ImageID("EDIT_TOOLBAR_BUTTON_PRESSED");
+        = new ImageID("service.gui.buttons.EDIT_TOOLBAR_BUTTON_PRESSED");
 
     /**
      * The icon shown in the invite dialog.
      */
     public static final ImageID INVITE_DIALOG_ICON
-        = new ImageID("INVITE_DIALOG_ICON");
-
-    /**
-     * The icon shown between the global status button and other protocol status
-     * buttons.
-     */
-    public static final ImageID STATUS_SEPARATOR_ICON
-        = new ImageID("STATUS_SEPARATOR_ICON");
+        = new ImageID("service.gui.icons.INVITE_DIALOG_ICON");
 
     // ///////////////////////// Main Toolbar icons ////////////////////////////
 
@@ -867,62 +776,74 @@ public class ImageLoader {
     /**
      * Copy icon.
      */
-    public static final ImageID COPY_ICON = new ImageID("COPY_ICON");
+    public static final ImageID COPY_ICON
+        = new ImageID("service.gui.icons.COPY_ICON");
 
     /**
      * Cut icon.
      */
-    public static final ImageID CUT_ICON = new ImageID("CUT_ICON");
+    public static final ImageID CUT_ICON
+        = new ImageID("service.gui.icons.CUT_ICON");
 
     /**
      * Paste icon.
      */
-    public static final ImageID PASTE_ICON = new ImageID("PASTE_ICON");
+    public static final ImageID PASTE_ICON
+        = new ImageID("service.gui.icons.PASTE_ICON");
 
     /**
      * Smiley icon, used for the "Smiley" button in the <tt>MainToolBar</tt>.
      */
-    public static final ImageID SMILIES_ICON = new ImageID("SMILIES_ICON");
+    public static final ImageID SMILIES_ICON
+        = new ImageID("service.gui.icons.SMILIES_ICON");
 
     /**
      * Save icon.
      */
-    public static final ImageID SAVE_ICON = new ImageID("SAVE_ICON");
+    public static final ImageID SAVE_ICON
+        = new ImageID("service.gui.icons.SAVE_ICON");
 
     /**
      * Print icon.
      */
-    public static final ImageID PRINT_ICON = new ImageID("PRINT_ICON");
+    public static final ImageID PRINT_ICON
+        = new ImageID("service.gui.icons.PRINT_ICON");
 
     /**
      * Close icon.
      */
-    public static final ImageID CLOSE_ICON = new ImageID("CLOSE_ICON");
+    public static final ImageID CLOSE_ICON
+        = new ImageID("service.gui.icons.CLOSE_ICON");
 
     /**
      * Left flash icon.
      */
-    public static final ImageID PREVIOUS_ICON = new ImageID("PREVIOUS_ICON");
+    public static final ImageID PREVIOUS_ICON
+        = new ImageID("service.gui.icons.PREVIOUS_ICON");
 
     /**
      * Right flash icon.
      */
-    public static final ImageID NEXT_ICON = new ImageID("NEXT_ICON");
+    public static final ImageID NEXT_ICON
+        = new ImageID("service.gui.icons.NEXT_ICON");
 
     /**
      * Clock icon.
      */
-    public static final ImageID HISTORY_ICON = new ImageID("HISTORY_ICON");
+    public static final ImageID HISTORY_ICON
+        = new ImageID("service.gui.icons.HISTORY_ICON");
 
     /**
      * Send file icon.
      */
-    public static final ImageID SEND_FILE_ICON = new ImageID("SEND_FILE_ICON");
+    public static final ImageID SEND_FILE_ICON
+        = new ImageID("service.gui.icons.SEND_FILE_ICON");
 
     /**
      * Font icon.
      */
-    public static final ImageID FONT_ICON = new ImageID("FONT_ICON");
+    public static final ImageID FONT_ICON
+        = new ImageID("service.gui.icons.FONT_ICON");
 
     // ///////////////////// Chat contact icons ////////////////////////////////
 
@@ -930,123 +851,117 @@ public class ImageLoader {
      * A special "info" icon used in the <tt>ChatContactPanel</tt>.
      */
     public static final ImageID CHAT_CONTACT_INFO_BUTTON
-        = new ImageID("CHAT_CONTACT_INFO_BUTTON");
+        = new ImageID("service.gui.buttons.CHAT_CONTACT_INFO_BUTTON");
 
     /**
      * A special "info" rollover icon used in the <tt>ChatContactPanel</tt>.
      */
     public static final ImageID CHAT_CONTACT_INFO_ROLLOVER_BUTTON
-        = new ImageID("CHAT_CONTACT_INFO_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.CHAT_CONTACT_INFO_ROLLOVER_BUTTON");
 
     /**
      * A special "call" icon used in the <tt>ChatContactPanel</tt>.
      */
     public static final ImageID CHAT_CONTACT_CALL_BUTTON
-        = new ImageID("CHAT_CONTACT_CALL_BUTTON");
+        = new ImageID("service.gui.buttons.CHAT_CONTACT_CALL_BUTTON");
 
     /**
      * A special "call" rollover icon used in the <tt>ChatContactPanel</tt>.
      */
     public static final ImageID CHAT_CONTACT_CALL_ROLLOVER_BUTTON
-        = new ImageID("CHAT_CONTACT_CALL_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.CHAT_CONTACT_CALL_ROLLOVER_BUTTON");
 
     /**
      * A special "send file" icon used in the <tt>ChatContactPanel</tt>.
      */
     public static final ImageID CHAT_CONTACT_SEND_FILE_BUTTON
-        = new ImageID("CHAT_CONTACT_SEND_FILE_BUTTON");
+        = new ImageID("service.gui.buttons.CHAT_CONTACT_SEND_FILE_BUTTON");
 
     /**
      * A special "send file" rollover icon used in the
      * <tt>ChatContactPanel</tt>.
      */
     public static final ImageID CHAT_SEND_FILE_ROLLOVER_BUTTON
-        = new ImageID("CHAT_SEND_FILE_ROLLOVER_BUTTON");
+        = new ImageID("service.gui.buttons.CHAT_SEND_FILE_ROLLOVER_BUTTON");
 
     public static final ImageID CHAT_CONFIGURE_ICON
-        = new ImageID("CHAT_CONFIGURE_ICON");
+        = new ImageID("service.gui.icons.CHAT_CONFIGURE_ICON");
 
     ////////////////////////////// 16x16 icons ////////////////////////////////
     /**
      * Send message 16x16 image.
      */
     public static final ImageID SEND_MESSAGE_16x16_ICON
-        = new ImageID("SEND_MESSAGE_16x16_ICON");
+        = new ImageID("service.gui.icons.SEND_MESSAGE_16x16_ICON");
 
     /**
      * Call 16x16 image.
      * //TODO : change to an appropriate logo
      */
     public static final ImageID CALL_16x16_ICON
-            = new ImageID("CALL_16x16_ICON");
+            = new ImageID("service.gui.icons.CALL_16x16_ICON");
 
     /**
      * Delete 16x16 image.
      */
     public static final ImageID DELETE_16x16_ICON
-        = new ImageID("DELETE_16x16_ICON");
+        = new ImageID("service.gui.icons.DELETE_16x16_ICON");
 
     /**
      * History 16x16 image.
      */
     public static final ImageID HISTORY_16x16_ICON
-        = new ImageID("HISTORY_16x16_ICON");
+        = new ImageID("service.gui.icons.HISTORY_16x16_ICON");
 
     /**
      * Send file 16x16 image.
      */
     public static final ImageID SEND_FILE_16x16_ICON
-        = new ImageID("SEND_FILE_16x16_ICON");
+        = new ImageID("service.gui.icons.SEND_FILE_16x16_ICON");
 
     /**
      * Groups 16x16 image.
      */
     public static final ImageID GROUPS_16x16_ICON
-        = new ImageID("GROUPS_16x16_ICON");
-
+        = new ImageID("service.gui.icons.GROUPS_16x16_ICON");
 
     /**
      * Add contact 16x16 image.
      */
     public static final ImageID ADD_CONTACT_16x16_ICON
-        = new ImageID("ADD_CONTACT_16x16_ICON");
+        = new ImageID("service.gui.icons.ADD_CONTACT_16x16_ICON");
 
     /**
      * Rename 16x16 image.
      */
     public static final ImageID RENAME_16x16_ICON
-        = new ImageID("RENAME_16x16_ICON");
-
+        = new ImageID("service.gui.icons.RENAME_16x16_ICON");
 
     ///////////////////////////////////////////////////////////////////////////
 
     /**
-     * Contact list cell "more info" button.
-     */
-    public static final ImageID MORE_INFO_ICON = new ImageID("MORE_INFO_ICON");
-
-    /**
      * Toolbar drag area icon.
      */
     public static final ImageID TOOLBAR_DRAG_ICON = new ImageID(
-            "TOOLBAR_DRAG_ICON");
+            "service.gui.icons.TOOLBAR_DRAG_ICON");
 
     /**
      * The background image of the <tt>AuthenticationWindow</tt>.
      */
     public static final ImageID AUTH_WINDOW_BACKGROUND = new ImageID(
-            "AUTH_WINDOW_BACKGROUND");
+            "service.gui.AUTH_WINDOW_BACKGROUND");
 
     /**
      * The icon used to indicate a search.
      */
-    public static final ImageID SEARCH_ICON = new ImageID("SEARCH_ICON");
+    public static final ImageID SEARCH_ICON
+        = new ImageID("service.gui.icons.SEARCH_ICON");
 
     /**
      * The icon used to indicate a search.
      */
     public static final ImageID SEARCH_ICON_16x16
-        = new ImageID("SEARCH_ICON_16x16");
+        = new ImageID("service.gui.icons.SEARCH_ICON_16x16");
 
     /*
      * =======================================================================
@@ -1057,40 +972,44 @@ public class ImageLoader {
     /**
      * Contact "online" icon.
      */
-    public static final ImageID USER_ONLINE_ICON = new ImageID(
-            "USER_ONLINE_ICON");
+    public static final ImageID USER_ONLINE_ICON
+        = new ImageID("service.gui.statusicons.USER_ONLINE_ICON");
 
     /**
      * Contact "offline" icon.
      */
-    public static final ImageID USER_OFFLINE_ICON = new ImageID(
-            "USER_OFFLINE_ICON");
+    public static final ImageID USER_OFFLINE_ICON
+        = new ImageID("service.gui.statusicons.USER_OFFLINE_ICON");
 
     /**
      * Contact "away" icon.
      */
-    public static final ImageID USER_AWAY_ICON = new ImageID("USER_AWAY_ICON");
+    public static final ImageID USER_AWAY_ICON
+        = new ImageID("service.gui.statusicons.USER_AWAY_ICON");
 
     /**
      * Contact "not available" icon.
      */
-    public static final ImageID USER_NA_ICON = new ImageID("USER_NA_ICON");
+    public static final ImageID USER_NA_ICON
+        = new ImageID("service.gui.statusicons.USER_NA_ICON");
 
     /**
      * Contact "free for chat" icon.
      */
-    public static final ImageID USER_FFC_ICON = new ImageID("USER_FFC_ICON");
+    public static final ImageID USER_FFC_ICON
+        = new ImageID("service.gui.statusicons.USER_FFC_ICON");
 
     /**
      * Contact "do not disturb" icon.
      */
-    public static final ImageID USER_DND_ICON = new ImageID("USER_DND_ICON");
+    public static final ImageID USER_DND_ICON
+        = new ImageID("service.gui.statusicons.USER_DND_ICON");
 
     /**
      * Contact "occupied" icon.
      */
-    public static final ImageID USER_OCCUPIED_ICON = new ImageID(
-            "USER_OCCUPIED_ICON");
+    public static final ImageID USER_OCCUPIED_ICON
+        = new ImageID("service.gui.statusicons.USER_OCCUPIED_ICON");
 
     /*
      * =====================================================================
@@ -1098,30 +1017,41 @@ public class ImageLoader {
      * =====================================================================
      */
 
-    public static final ImageID SMILEY1 = new ImageID("SMILEY1");
-
-    public static final ImageID SMILEY2 = new ImageID("SMILEY2");
+    public static final ImageID SMILEY1
+        = new ImageID("service.gui.smilies.SMILEY1");
 
-    public static final ImageID SMILEY3 = new ImageID("SMILEY3");
+    public static final ImageID SMILEY2
+        = new ImageID("service.gui.smilies.SMILEY2");
 
-    public static final ImageID SMILEY4 = new ImageID("SMILEY4");
+    public static final ImageID SMILEY3
+        = new ImageID("service.gui.smilies.SMILEY3");
 
-    public static final ImageID SMILEY5 = new ImageID("SMILEY5");
+    public static final ImageID SMILEY4
+        = new ImageID("service.gui.smilies.SMILEY4");
 
-    public static final ImageID SMILEY6 = new ImageID("SMILEY6");
+    public static final ImageID SMILEY5
+        = new ImageID("service.gui.smilies.SMILEY5");
 
-    public static final ImageID SMILEY7 = new ImageID("SMILEY7");
+    public static final ImageID SMILEY6
+        = new ImageID("service.gui.smilies.SMILEY6");
 
-    public static final ImageID SMILEY8 = new ImageID("SMILEY8");
+    public static final ImageID SMILEY7
+        = new ImageID("service.gui.smilies.SMILEY7");
 
-    public static final ImageID SMILEY9 = new ImageID("SMILEY9");
+    public static final ImageID SMILEY8
+        = new ImageID("service.gui.smilies.SMILEY8");
 
-    public static final ImageID SMILEY10 = new ImageID("SMILEY10");
+    public static final ImageID SMILEY9
+        = new ImageID("service.gui.smilies.SMILEY9");
 
-    public static final ImageID SMILEY11 = new ImageID("SMILEY11");
+    public static final ImageID SMILEY10
+        = new ImageID("service.gui.smilies.SMILEY10");
 
-    public static final ImageID SMILEY12 = new ImageID("SMILEY12");
+    public static final ImageID SMILEY11
+        = new ImageID("service.gui.smilies.SMILEY11");
 
+    public static final ImageID SMILEY12
+        = new ImageID("service.gui.smilies.SMILEY12");
 
     /**
      * Load default smilies pack.
diff --git a/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java b/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java
index 7990273..af13ce6 100644
--- a/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java
@@ -22,7 +22,7 @@ public class MediaConfigurationForm
     public byte[] getIcon()

     {

         return MediaActivator.getResources().getImageInBytes(

-            "MediaConfigurationForm_icon");

+            "plugin.mediaconfig.PLUGIN_ICON");

     }

 

     public int getIndex()

diff --git a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
index a0b8281..e4739fd 100644
--- a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
@@ -671,7 +671,8 @@ public class MessageHistoryServiceImpl
         // Check if the message history is enabled in the configuration
         // service, and if not do not register the service.
         String isMessageHistoryEnabledPropertyString =
-            "net.java.sip.communicator.impl.msghistory.isMessageHistoryEnabled";
+            "impl.msghistory.IS_MESSAGE_HISTORY_ENABLED";
+
         String isMessageHistoryEnabledString = configService.getString(
             isMessageHistoryEnabledPropertyString);
 
@@ -697,7 +698,7 @@ public class MessageHistoryServiceImpl
         msgHistoryPropListener = new MessageHistoryPropertyChangeListener();
 
         configService.addPropertyChangeListener(
-            "net.java.sip.communicator.impl.msghistory.isMessageHistoryEnabled",
+            "impl.msghistory.IS_MESSAGE_HISTORY_ENABLED",
             msgHistoryPropListener);
 
         logger.debug("Starting the msg history implementation.");
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/DictStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/dict/DictStatusEnum.java
index 17ba603..04682bf 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/DictStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/DictStatusEnum.java
@@ -10,7 +10,6 @@ import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
-import java.io.*;
 
 /**
  * An implementation of <tt>PresenceStatus</tt> that enumerates all states that
@@ -31,7 +30,8 @@ public class DictStatusEnum
     public static final DictStatusEnum OFFLINE
         = new DictStatusEnum(
             0, "Offline",
-            DictActivator.getResources().getImageInBytes("dictOfflineIcon"));
+            DictActivator.getResources()
+                .getImageInBytes("service.protocol.dict.OFFLINE_STATUS_ICON"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -40,7 +40,8 @@ public class DictStatusEnum
     public static final DictStatusEnum ONLINE
         = new DictStatusEnum(
             65, "Online",
-            DictActivator.getResources().getImageInBytes("dictProtocolIcon"));
+            DictActivator.getResources()
+                .getImageInBytes("service.protocol.dict.PROTOCOL_ICON"));
 
     /**
      * Initialize the list of supported status states.
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/ProtocolIconDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/ProtocolIconDictImpl.java
index 066b95d..70fa69b 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/ProtocolIconDictImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/ProtocolIconDictImpl.java
@@ -23,13 +23,16 @@ public class ProtocolIconDictImpl
     /**
      * A hash table containing the protocol icon in different sizes.
      */
-    private static Hashtable<String,byte[]> iconsTable = new Hashtable<String,byte[]>();
+    private static Hashtable<String,byte[]> iconsTable
+        = new Hashtable<String,byte[]>();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            DictActivator.getResources().getImageInBytes("dictProtocolIcon"));
+            DictActivator.getResources()
+                .getImageInBytes("service.protocol.dict.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-                DictActivator.getResources().getImageInBytes("dict64x64Icon"));
+                DictActivator.getResources()
+                    .getImageInBytes("service.protocol.dict.PROTOCOL_LARGE_ICON"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
index de2dfc0..a985424 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/GibberishStatusEnum.java
@@ -29,9 +29,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum OFFLINE
         = new GibberishStatusEnum(
-            0
-            , "Offline"
-            , getImageInBytes("gibberishOfflineIcon"));
+            0,
+            "Offline",
+            getImageInBytes("service.protocol.gibberish.OFFLINE_STATUS_ICON"));
 
     /**
      * An Occupied status. Indicates that the user has connectivity and
@@ -39,9 +39,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum OCCUPIED
         = new GibberishStatusEnum(
-            20
-            , "Occupied"
-            , getImageInBytes("gibberishOccupiedIcon"));
+            20,
+            "Occupied",
+            getImageInBytes("service.protocol.gibberish.OCCUPIED_STATUS_ICON"));
 
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -51,7 +51,7 @@ public class GibberishStatusEnum
         = new GibberishStatusEnum(
             30,
             "Do Not Disturb",
-            getImageInBytes("gibberishDndIcon"));
+            getImageInBytes("service.protocol.gibberish.DND_STATUS_ICON"));
 
     /**
      * The Not Available status. Indicates that the user has connectivity
@@ -61,9 +61,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum NOT_AVAILABLE
         = new GibberishStatusEnum(
-            35
-            , "Not Available"
-            , getImageInBytes("gibberishNaIcon"));
+            35,
+            "Not Available",
+            getImageInBytes("service.protocol.gibberish.NA_STATUS_ICON"));
 
     /**
      * The Away status. Indicates that the user has connectivity but might
@@ -71,9 +71,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum AWAY
         = new GibberishStatusEnum(
-            40
-            , "Away"
-            , getImageInBytes("gibberishAwayIcon"));
+            40,
+            "Away",
+            getImageInBytes("service.protocol.gibberish.AWAY_STATUS_ICON"));
 
     /**
      * The Invisible status. Indicates that the user has connectivity even
@@ -82,9 +82,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum INVISIBLE
         = new GibberishStatusEnum(
-            45
-            , "Invisible"
-            , getImageInBytes("gibberishInvisibleIcon"));
+            45,
+            "Invisible",
+            getImageInBytes("service.protocol.gibberish.INVISIBLE_STATUS_ICON"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -92,9 +92,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum ONLINE
         = new GibberishStatusEnum(
-            65
-            , "Online"
-            , getImageInBytes("gibberishOnlineIcon"));
+            65,
+            "Online",
+            getImageInBytes("service.protocol.gibberish.ONLINE_STATUS_ICON"));
 
     /**
      * The Free For Chat status. Indicates that the user is eager to
@@ -102,9 +102,9 @@ public class GibberishStatusEnum
      */
     public static final GibberishStatusEnum FREE_FOR_CHAT
         = new GibberishStatusEnum(
-            85
-            , "Free For Chat"
-            , getImageInBytes("gibberishFfcIcon"));
+            85,
+            "Free For Chat",
+            getImageInBytes("service.protocol.gibberish.FFC_STATUS_ICON"));
 
     /**
      * Initialize the list of supported status states.
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java b/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java
index 3448b46..68ae61f 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/ProtocolIconGibberishImpl.java
@@ -34,11 +34,11 @@ public class ProtocolIconGibberishImpl
      */
     private static Hashtable iconsTable = new Hashtable();
     static {
-        iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            getImageInBytes("gibberishOnlineIcon"));
+        iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
+            getImageInBytes("service.protocol.gibberish.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("gibberish64x64Icon"));
+            getImageInBytes("service.protocol.gibberish.PROTOCOL_LARGE_ICON"));
     }
         
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/AimStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/icq/AimStatusEnum.java
index a7081b9..f39f18d 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/AimStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/AimStatusEnum.java
@@ -29,7 +29,7 @@ public class AimStatusEnum
      */
     public static final AimStatusEnum ONLINE
         = new AimStatusEnum(65, "Online",
-                getImageInBytes("protocolIconAim"));
+                getImageInBytes("service.protocol.aim.PROTOCOL_ICON"));
 
     /**
      * The Invisible AIM status. Indicates that the user has connectivity even
@@ -38,7 +38,7 @@ public class AimStatusEnum
      */
     public static final AimStatusEnum INVISIBLE
         = new AimStatusEnum(45, "Invisible",
-                getImageInBytes("aimInvisibleIcon"));
+                getImageInBytes("service.protocol.aim.INVISIBLE_STATUS_ICON"));
 
     /**
      * The Away AIM status. Indicates that the user has connectivity but might
@@ -46,7 +46,7 @@ public class AimStatusEnum
      */
     public static final AimStatusEnum AWAY
         = new AimStatusEnum(40, "Away",
-                getImageInBytes("aimAwayIcon"));
+                getImageInBytes("service.protocol.aim.AWAY_STATUS_ICON"));
 
     /**
      * The Offline AIM status. Indicates the user does not seem to be connected
@@ -54,7 +54,7 @@ public class AimStatusEnum
      */
     public static final AimStatusEnum OFFLINE
         = new AimStatusEnum(0, "Offline",
-                getImageInBytes("aimOfflineIcon"));
+                getImageInBytes("service.protocol.aim.OFFLINE_STATUS_ICON"));
 
     /**
      * The minimal set of states that any AIM implementation must support.
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java
index 9794768..5e2aa42 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconAimImpl.java
@@ -33,10 +33,10 @@ public class ProtocolIconAimImpl
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            getImageInBytes("protocolIconAim"));
+            getImageInBytes("service.protocol.aim.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageAim"));
+            getImageInBytes("service.protocol.aim.PROTOCOL_LARGE_ICON"));
     }
  
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java
index c6f7cd4..247ac2f 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolIconIcqImpl.java
@@ -33,10 +33,10 @@ public class ProtocolIconIcqImpl
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            getImageInBytes("protocolIconIcq"));
+            getImageInBytes("service.protocol.icq.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageIcq"));
+            getImageInBytes("service.protocol.icq.PROTOCOL_LARGE_ICON"));
     }
  
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java
index 202a101..fc2c8e8 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStatusEnum.java
@@ -31,9 +31,9 @@ public class IrcStatusEnum
      */
     public static final IrcStatusEnum OFFLINE
         = new IrcStatusEnum(
-            0
-            , "Offline"
-            , getImageInBytes("ircOfflineIcon"));
+            0,
+            "Offline",
+            getImageInBytes("service.protocol.irc.OFFLINE_STATUS_ICON"));
 
     /**
      * The Away status. Indicates that the user has connectivity but might
@@ -41,9 +41,9 @@ public class IrcStatusEnum
      */
     public static final IrcStatusEnum AWAY
         = new IrcStatusEnum(
-            40
-            , "Away"
-            , getImageInBytes("ircAwayIcon"));
+            40,
+            "Away",
+            getImageInBytes("service.protocol.irc.AWAY_STATUS_ICON"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -51,9 +51,9 @@ public class IrcStatusEnum
      */
     public static final IrcStatusEnum ONLINE
         = new IrcStatusEnum(
-            65
-            , "Online"
-            , getImageInBytes("protocolIconIrc"));
+            65,
+            "Online",
+            getImageInBytes("service.protocol.irc.PROTOCOL_ICON"));
 
     /**
      * Initialize the list of supported status states.
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java
index e59ad12..859d844 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolIconIrcImpl.java
@@ -9,7 +9,6 @@ package net.java.sip.communicator.impl.protocol.irc;
 import java.io.*;
 import java.util.*;
 
-import net.java.sip.communicator.impl.protocol.dict.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -36,10 +35,10 @@ public class ProtocolIconIrcImpl
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            getImageInBytes("protocolIconIrc"));
+            getImageInBytes("service.protocol.irc.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("irc64x64Icon"));
+            getImageInBytes("service.protocol.irc.PROTOCOL_LARGE_ICON"));
     }
  
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java
index 350c13a..867617f 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/ProtocolIconMsnImpl.java
@@ -29,10 +29,10 @@ public class ProtocolIconMsnImpl
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            getImageInBytes("protocolIconMsn"));
+            getImageInBytes("service.protocol.msn.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageMsn"));
+            getImageInBytes("service.protocol.msn.PROTOCOL_LARGE_ICON"));
     }
  
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java
index 217086d..f8a5542 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/ProtocolIconRssImpl.java
@@ -36,10 +36,10 @@ public class ProtocolIconRssImpl
     static 
     {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            getImageInBytes("protocolIconRss"));
+            getImageInBytes("service.protocol.rss.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageRss"));
+            getImageInBytes("service.protocol.rss.PROTOCOL_LARGE_ICON"));
     }
         
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
index c8ca2a7..4f5bb34 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/RssStatusEnum.java
@@ -29,9 +29,9 @@ public class RssStatusEnum
      */
     public static final RssStatusEnum OFFLINE
         = new RssStatusEnum(
-            0
-            , "Offline"
-            , getImageInBytes("rssOfflineIcon"));
+            0,
+            "Offline",
+            getImageInBytes("service.protocol.rss.OFFLINE_STATUS_ICON"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -39,9 +39,9 @@ public class RssStatusEnum
      */
     public static final RssStatusEnum ONLINE
         = new RssStatusEnum(
-            65
-            , "Online"
-            , getImageInBytes("protocolIconRss"));
+            65,
+            "Online",
+            getImageInBytes("service.protocol.rss.PROTOCOL_ICON"));
 
     /**
      * Initialize the list of supported status states.
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java
index 13ffece..669dc93 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java
@@ -6,7 +6,6 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import java.io.*;
 import java.util.*;
 
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java
index 8ca3037..1cd936e 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ProtocolIconSSHImpl.java
@@ -36,10 +36,10 @@ public class ProtocolIconSSHImpl
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,    
-            getImageInBytes("protocolIconSsh"));
+            getImageInBytes("service.protocol.ssh.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageSsh"));
+            getImageInBytes("service.protocol.ssh.PROTOCOL_LARGE_ICON"));
     }
         
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java
index 939d216..0eee3c9 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/SSHStatusEnum.java
@@ -27,15 +27,16 @@ public class SSHStatusEnum
 {
     private static final Logger logger
             = Logger.getLogger(SSHStatusEnum.class);
-    
+
     /**
      * Indicates an Offline status or status with 0 connectivity.
      */
     public static final SSHStatusEnum OFFLINE
             = new SSHStatusEnum(
-            0
-            , "Offline"
-            , ProtocolIconSSHImpl.getImageInBytes("sshOfflineIcon"));
+            0,
+            "Offline",
+            ProtocolIconSSHImpl
+                .getImageInBytes("service.protocol.ssh.OFFLINE_STATUS_ICON"));
     
     /**
      * The Not Available status. Indicates that the user has connectivity
@@ -45,9 +46,10 @@ public class SSHStatusEnum
      */
     public static final SSHStatusEnum NOT_AVAILABLE
             = new SSHStatusEnum(
-            35
-            , "Not Available"
-            , ProtocolIconSSHImpl.getImageInBytes("sshNaIcon"));
+            35,
+            "Not Available",
+            ProtocolIconSSHImpl
+                .getImageInBytes("service.protocol.ssh.NA_STATUS_ICON"));
     
     /**
      * The Connecting status. Indicate that the user is connecting to remote
@@ -55,19 +57,21 @@ public class SSHStatusEnum
      */
     public static final SSHStatusEnum CONNECTING
             = new SSHStatusEnum(
-            55
-            , "Connecting"
-            , ProtocolIconSSHImpl.getImageInBytes("sshConnectingIcon"));
-   
+            55,
+            "Connecting",
+            ProtocolIconSSHImpl
+                .getImageInBytes("service.protocol.ssh.CONNECTING_ICON"));
+    
     /**
      * The Online status. Indicate that the user is able and willing to
      * communicate.
      */
     public static final SSHStatusEnum ONLINE
             = new SSHStatusEnum(
-            65
-            , "Online"
-            , ProtocolIconSSHImpl.getImageInBytes("protocolIconSsh"));
+            65,
+            "Online",
+            ProtocolIconSSHImpl
+                .getImageInBytes("service.protocol.ssh.PROTOCOL_ICON"));
 
 
     /**
@@ -76,9 +80,10 @@ public class SSHStatusEnum
      */
     public static final SSHStatusEnum CONNECTED
             = new SSHStatusEnum(
-            70
-            , "Connecting"
-            , ProtocolIconSSHImpl.getImageInBytes("sshConnectedIcon"));
+            70,
+            "Connecting",
+            ProtocolIconSSHImpl
+                .getImageInBytes("service.protocol.ssh.CONNECTED_ICON"));
     
     /**
      * The File Transfer status. Indicate that the user is transfering a file
@@ -86,9 +91,10 @@ public class SSHStatusEnum
      */
     public static final SSHStatusEnum FILE_TRANSFER
             = new SSHStatusEnum(
-            75
-            , "Transfering File"
-            , ProtocolIconSSHImpl.getImageInBytes("sshFileTransferIcon"));
+            75,
+            "Transfering File",
+            ProtocolIconSSHImpl
+                .getImageInBytes("service.protocol.ssh.FILE_TRANSFER_ICON"));
     
     /**
      * Initialize the list of supported status states.
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java
index bbd7768..f583308 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/ProtocolIconYahooImpl.java
@@ -11,7 +11,6 @@ import java.util.*;
 
 import org.osgi.framework.*;
 
-import net.java.sip.communicator.impl.protocol.rss.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
@@ -35,10 +34,10 @@ public class ProtocolIconYahooImpl
     private static Hashtable iconsTable = new Hashtable();
     static {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            getImageInBytes("protocolIconYahoo"));
+            getImageInBytes("service.protocol.yahoo.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageYahoo"));
+            getImageInBytes("service.protocol.yahoo.PROTOCOL_LARGE_IMAGE"));
     }
  
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java
index 38badd8..028a580 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ProtocolIconZeroconfImpl.java
@@ -37,10 +37,10 @@ public class ProtocolIconZeroconfImpl
     static 
     {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
-            getImageInBytes("zeroconfOnlineIcon"));
+            getImageInBytes("service.protocol.zeroconf.PROTOCOL_ICON"));
 
         iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-            getImageInBytes("pageImageZeroconf"));
+            getImageInBytes("service.protocol.zeroconf.PROTOCOL_LARGE_ICON"));
     }
         
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java
index 6531a49..aeeb6d6 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/ZeroconfStatusEnum.java
@@ -29,9 +29,10 @@ public class ZeroconfStatusEnum
      */
     public static final ZeroconfStatusEnum OFFLINE
         = new ZeroconfStatusEnum(
-            0
-            , "Offline"
-            , ProtocolIconZeroconfImpl.getImageInBytes("zeroconfOfflineIcon"));
+            0,
+            "Offline",
+            ProtocolIconZeroconfImpl.getImageInBytes(
+                "service.protocol.zeroconf.OFFLINE_STATUS_ICON"));
 
     /**
      * The DND status. Indicates that the user has connectivity but prefers
@@ -39,9 +40,10 @@ public class ZeroconfStatusEnum
      */
     public static final ZeroconfStatusEnum DO_NOT_DISTURB
         = new ZeroconfStatusEnum(
-            30
-            ,"Do Not Disturb",//, "Do Not Disturb",
-            ProtocolIconZeroconfImpl.getImageInBytes("zeroconfDndIcon"));
+            30,
+            "Do Not Disturb",//, "Do Not Disturb",
+            ProtocolIconZeroconfImpl.getImageInBytes(
+                "service.protocol.zeroconf.DND_STATUS_ICON"));
 
     /**
      * The Invisible status. Indicates that the user has connectivity even
@@ -50,9 +52,10 @@ public class ZeroconfStatusEnum
      */
     public static final ZeroconfStatusEnum INVISIBLE
         = new ZeroconfStatusEnum(
-            45
-            , "Invisible"
-            , ProtocolIconZeroconfImpl.getImageInBytes("zeroconfInvisibleIcon"));
+            45,
+            "Invisible",
+            ProtocolIconZeroconfImpl.getImageInBytes(
+                "service.protocol.zeroconf.INVISIBLE_STATUS_ICON"));
 
     /**
      * The Online status. Indicate that the user is able and willing to
@@ -60,9 +63,10 @@ public class ZeroconfStatusEnum
      */
     public static final ZeroconfStatusEnum ONLINE
         = new ZeroconfStatusEnum(
-            65
-            ,"Available"//, "Online"
-            , ProtocolIconZeroconfImpl.getImageInBytes("zeroconfOnlineIcon"));
+            65,
+            "Available",//, "Online"
+            ProtocolIconZeroconfImpl.getImageInBytes(
+                "service.protocol.zeroconf.ONLINE_STATUS_ICON"));
 
 
     /**
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
index 71cec0f..1c0ffed 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
@@ -53,7 +53,7 @@ public class StatusSubMenu
         parentSystray = tray;
 
         this.setText(Resources.getString("setStatus"));
-        this.setIcon(Resources.getImage("statusMenuIcon"));
+        this.setIcon(Resources.getImage("service.systray.STATUS_MENU_ICON"));
 
         /* makes the menu look better */
         this.setPreferredSize(new java.awt.Dimension(28, 24));
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java b/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
index a58a571..26216e1 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
@@ -147,28 +147,38 @@ public class SystrayServiceJdicImpl
         // background.
         if (osName.startsWith("Windows"))
         {
-            logoIcon = Resources.getImage("trayIconWindows");
-            logoIconOffline = Resources.getImage("trayIconWindowsOffline");
-            logoIconAway = Resources.getImage("trayIconWindowsAway");
-            logoIconFFC = Resources.getImage("trayIconWindowsFFC");
-            envelopeIcon = Resources.getImage("messageIconWindows");
+            logoIcon
+                = Resources.getImage("service.systray.TRAY_ICON_WINDOWS");
+            logoIconOffline
+                = Resources.getImage("service.systray.TRAY_ICON_WINDOWS_OFFLINE");
+            logoIconAway
+                = Resources.getImage("service.systray.TRAY_ICON_WINDOWS_AWAY");
+            logoIconFFC
+                = Resources.getImage("service.systray.TRAY_ICON_WINDOWS_FFC");
+            envelopeIcon
+                = Resources.getImage("service.systray.MESSAGE_ICON_WINDOWS");
         }
+
         // If we're running under MacOSX, we use a special black and
         // white icons without background.
         else if (osName.startsWith("Mac OS X"))
         {
-            logoIcon = Resources.getImage("trayIconMacOSX");
-            logoIconWhite = Resources.getImage("trayIconMacOSXWhite");
-            envelopeIcon = Resources.getImage("messageIconMacOSX");
-            envelopeIconWhite = Resources.getImage("messageIconMacOSXWhite");
+            logoIcon
+                = Resources.getImage("service.systray.TRAY_ICON_MACOSX");
+            logoIconWhite
+                = Resources.getImage("service.systray.TRAY_ICON_MACOSX_WHITE");
+            envelopeIcon
+                = Resources.getImage("service.systray.MESSAGE_ICON_MACOSX");
+            envelopeIconWhite
+                = Resources.getImage("service.systray.MESSAGE_ICON_MACOSX_WHITE");
         }
         else
         {
-            logoIcon = Resources.getImage("trayIcon");
-            logoIconOffline = Resources.getImage("trayIconOffline");
-            logoIconAway = Resources.getImage("trayIconAway");
-            logoIconFFC = Resources.getImage("trayIconFFC");
-            envelopeIcon = Resources.getImage("messageIcon");
+            logoIcon = Resources.getImage("service.systray.TRAY_ICON");
+            logoIconOffline = Resources.getImage("service.systray.TRAY_ICON_OFFLINE");
+            logoIconAway = Resources.getImage("service.systray.TRAY_ICON_AWAY");
+            logoIconFFC = Resources.getImage("service.systray.TRAY_ICON_FFC");
+            envelopeIcon = Resources.getImage("service.systray.MESSAGE_ICON");
         }
 
         if (!osName.startsWith("Mac OS X"))
@@ -180,18 +190,22 @@ public class SystrayServiceJdicImpl
         else
             currentIcon = logoIcon;
 
-        trayIcon = new TrayIcon(currentIcon,
-                                Resources.getApplicationString("applicationName"),
-                                menu);
+        trayIcon = new TrayIcon(
+            currentIcon,
+            Resources.getApplicationString("service.gui.APPLICATION_NAME"),
+            menu);
 
         trayIcon.setIconAutoSize(true);
 
         if (osName.startsWith("Mac OS X"))
         {
             // init dock Icons
-            dockIconOffline = Resources.getImageURL("dockIconOffline");
-            dockIconAway = Resources.getImageURL("dockIconAway");
-            dockIconFFC = Resources.getImageURL("dockIconFFC");
+            dockIconOffline
+                = Resources.getImageURL("service.systray.DOCK_ICON_OFFLINE");
+            dockIconAway
+                = Resources.getImageURL("service.systray.DOCK_ICON_AWAY");
+            dockIconFFC
+                = Resources.getImageURL("service.systray.DOCK_ICON_FFC");
         }
 
         //Show/hide the contact list when user clicks on the systray.
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java
index 08d316e..22746e9 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java
@@ -39,15 +39,15 @@ public class TrayMenu
         
     private JMenuItem settingsItem = new JMenuItem(
             Resources.getString("settings"),
-            Resources.getImage("settingsMenuIcon"));
+            Resources.getImage("service.gui.icons.QUICK_MENU_CONFIGURE_ICON"));
     
     private JMenuItem closeItem = new JMenuItem(
             Resources.getString("close"),
-            Resources.getImage("closeMenuIcon"));
+            Resources.getImage("service.systray.CLOSE_MENU_ICON"));
     
     private JMenuItem addContactMenuItem = new JMenuItem(
             Resources.getString("addContact"),
-            Resources.getImage("addContactIcon"));
+            Resources.getImage("service.gui.icons.ADD_CONTACT_16x16_ICON"));
     
     private StatusSubMenu statusMenu;
     
diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
index 1f490bb..87d03e4 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
@@ -115,7 +115,7 @@ public class AccountInfoForm
      */

     public byte[] getIcon()

     {

-        return Resources.getImageInBytes("accountInfoIcon");

+        return Resources.getImageInBytes("plugin.accountinfo.PLUGIN_ICON");

     }

 

     /**

diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java
index c3bb9b8..3c40faf 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/Resources.java
@@ -21,12 +21,14 @@ public class Resources
     /**
      * A constant pointing to the Aim protocol logo image.
      */
-    public static ImageID AIM_LOGO = new ImageID("protocolIconAim");
+    public static ImageID AIM_LOGO
+        = new ImageID("service.protocol.aim.PROTOCOL_ICON");
 
     /**
      * A constant pointing to the Aim protocol wizard page image.
      */
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageAim");
+    public static ImageID PAGE_IMAGE 
+        = new ImageID("service.protocol.aim.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayActivator.java b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayActivator.java
index 454047d..0fb670b 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayActivator.java
+++ b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayActivator.java
@@ -11,6 +11,7 @@ import java.util.*;
 import net.java.sip.communicator.service.configuration.ConfigurationService;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.ProtocolProviderService;
+import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.Logger;
 
 import org.osgi.framework.*;
@@ -31,6 +32,8 @@ public class AutoAwayActivator implements BundleActivator
     private static Thread thread = null;
     private static StatusUpdateThread runner = null;
 
+    private static ResourceManagementService resourceService;
+
     /**
      * Starts this bundle
      * 
@@ -176,4 +179,24 @@ public class AutoAwayActivator implements BundleActivator
 
         return (ConfigurationService) bundleContext.getService(confServiceRefs);
     }
+
+    /**
+     * Gets the service giving access to all application resources.
+     * 
+     * @return the service giving access to all application resources.
+     */
+    static ResourceManagementService getResources()
+    {
+        if (resourceService == null)
+        {
+            // retrieve a reference to the resource access service.
+            ServiceReference resourceServiceRefs = bundleContext
+                .getServiceReference(ResourceManagementService.class.getName());
+
+            resourceService = (ResourceManagementService) bundleContext
+                .getService(resourceServiceRefs);
+        }
+
+        return resourceService;
+    }
 }
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
index d671e80..994acfe 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
@@ -54,7 +54,8 @@ public class AutoAwayConfigForm
 
         // Title : automatic status
         JLabel autoStatusLabel 
-            = new JLabel(Resources.getString("automaticStatus"));
+            = new JLabel(AutoAwayActivator.getResources()
+                    .getI18NString("automaticStatus"));
 
 
         Font bold = autoStatusLabel.getFont().deriveFont(Font.BOLD);
@@ -63,7 +64,8 @@ public class AutoAwayConfigForm
         JPanel fieldsPanel = new JPanel(new BorderLayout(5, 5));
         fieldsPanel.setBorder(BorderFactory.createEmptyBorder(10, 30, 0, 0));
 
-        enable = new JCheckBox(Resources.getString("enableChangeStatus"));
+        enable = new JCheckBox(AutoAwayActivator.getResources()
+                .getI18NString("enableChangeStatus"));
         fieldsPanel.add(enable, BorderLayout.NORTH);
         enable.addActionListener(new ActionListener()
         {
@@ -78,7 +80,8 @@ public class AutoAwayConfigForm
 
         JPanel timerPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
         // Texte
-        timerPanel.add(new JLabel(Resources.getString("awayMinutes")));
+        timerPanel.add(new JLabel(
+                AutoAwayActivator.getResources().getI18NString("awayMinutes")));
         // Spinner
         timer = new JSpinner(new SpinnerNumberModel(15, 1, 180, 1));
         timerPanel.add(timer);
@@ -165,7 +168,8 @@ public class AutoAwayConfigForm
      */
     public byte[] getIcon()
     {
-        return Resources.getResources().getImageInBytes("autoAwayConfigIcon");
+        return AutoAwayActivator.getResources()
+            .getImageInBytes("plugin.autoaway.PLUGIN_ICON");
     }
 
     /**
@@ -182,7 +186,8 @@ public class AutoAwayConfigForm
      */
     public String getTitle()
     {
-        return Resources.getString("automaticStatus");
+        return AutoAwayActivator.getResources()
+            .getI18NString("automaticStatus");
     }
 
 }
diff --git a/src/net/java/sip/communicator/plugin/autoaway/Resources.java b/src/net/java/sip/communicator/plugin/autoaway/Resources.java
deleted file mode 100644
index 0370790..0000000
--- a/src/net/java/sip/communicator/plugin/autoaway/Resources.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.

- *

- * Distributable under LGPL license.

- * See terms of license at gnu.org.

- */

-package net.java.sip.communicator.plugin.autoaway;

-

-import net.java.sip.communicator.service.resources.*;

-

-/**

- * The Messages class manages the access to the internationalization properties

- * files.

- * 

- * @author Thomas Hofer;

- */

-public class Resources

-{

-    private static ResourceManagementService resourcesService;

-

-    /**

-     * Returns an internationalized string corresponding to the given key.

-     * 

-     * @param key The key of the string.

-     * 

-     * @return An internationalized string corresponding to the given key.

-     */

-    public static String getString(String key)

-    {

-        return getResources().getI18NString(key);

-    }

-    

-    /**

-     * Returns a reference to the resrouce management service.

-     * 

-     * @return a reference to the resource management service.

-     */

-    public static ResourceManagementService getResources()

-    {

-        if (resourcesService == null)

-            resourcesService =

-                ResourceManagementServiceUtils

-                    .getService(AutoAwayActivator.bundleContext);

-        return resourcesService;

-    }

-}

diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
index 8683fbf..83485be 100644
--- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
+++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
@@ -20,7 +20,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
 {

     private static final int DEFAULT_TEXT_INDENT

         = BrandingActivator.getResources()

-            .getSettingsInt("aboutWindowTextIndent");

+            .getSettingsInt("plugin.branding.ABOUT_TEXT_INDENT");

 

     public AboutWindow(Frame owner)

     {

@@ -28,10 +28,12 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
 

         ResourceManagementService resources = BrandingActivator.getResources();

 

+        String applicationName

+            = resources.getSettingsString("service.gui.APPLICATION_NAME");

+

         this.setTitle(

             resources.getI18NString("aboutWindowTitle",

-                new String[]{resources.

-                    getSettingsString("applicationName")}));

+                new String[]{applicationName}));

 

         setModal(false);

         setDefaultCloseOperation(DISPOSE_ON_CLOSE);

@@ -46,24 +48,24 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
                 .createEmptyBorder(15, 15, 15, 15));

         textPanel.setOpaque(false);

 

-        JLabel titleLabel =

-            new JLabel(resources.getSettingsString("applicationName"));

-        titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 28));

+        JLabel titleLabel = new JLabel(applicationName);

+        titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 28));

         titleLabel.setForeground(Constants.TITLE_COLOR);

         titleLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);

 

         JLabel versionLabel =

             new JLabel(" " + System.getProperty("sip-communicator.version"));

-        versionLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));

+        versionLabel.setFont(versionLabel.getFont().deriveFont(Font.BOLD, 18));

         versionLabel.setForeground(Constants.TITLE_COLOR);

         versionLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);

 

-        int logoAreaFontSize = resources.getSettingsInt("aboutLogoFontSize");

+        int logoAreaFontSize

+            = resources.getSettingsInt("plugin.branding.ABOUT_LOGO_FONT_SIZE");

 

         JTextArea logoArea =

             new JTextArea(resources.getI18NString("logoMessage"));

         logoArea.setFont(

-            Constants.FONT.deriveFont(Font.BOLD, logoAreaFontSize));

+            logoArea.getFont().deriveFont(Font.BOLD, logoAreaFontSize));

         logoArea.setForeground(Constants.TITLE_COLOR);

         logoArea.setOpaque(false);

         logoArea.setLineWrap(true);

@@ -99,7 +101,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
         licenseArea.setPreferredSize(new Dimension(50, 20));

         licenseArea.setBorder(

             BorderFactory.createEmptyBorder(

-                resources.getSettingsInt("paragraphGap"),

+                resources.getSettingsInt("plugin.branding.ABOUT_PARAGRAPH_GAP"),

                 DEFAULT_TEXT_INDENT,

                 0, 0));

         licenseArea.setOpaque(false);

@@ -152,7 +154,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
             try

             {

                 bgImage = ImageIO.read(BrandingActivator.getResources().

-                    getImageURL("aboutWindowBg"));

+                    getImageURL("plugin.branding.ABOUT_WINDOW_BACKGROUND"));

             }

             catch (IOException e)

             {

diff --git a/src/net/java/sip/communicator/plugin/branding/Constants.java b/src/net/java/sip/communicator/plugin/branding/Constants.java
index 861e67e..b31bb09 100644
--- a/src/net/java/sip/communicator/plugin/branding/Constants.java
+++ b/src/net/java/sip/communicator/plugin/branding/Constants.java
@@ -30,14 +30,15 @@ public class Constants
      * Dark blue color used in the about window and the splash screen.

      */

     public static final Color TITLE_COLOR

-        = new Color(

-            BrandingActivator.getResources().getColor("splashScreenTitleColor"));

+        = new Color(BrandingActivator.getResources()

+                .getColor("service.gui.SPLASH_SCREEN_TITLE_COLOR"));

 

     /**

      * Text color used in the about window and the splash screen.

      */

     public static final String TEXT_COLOR

-        = BrandingActivator.getResources().getColorString("splashScreenTextColor");

+        = BrandingActivator.getResources()

+            .getColorString("service.gui.SPLASH_SCREEN_TEXT_COLOR");

 

 

     /*

@@ -47,14 +48,6 @@ public class Constants
      */

 

     /**

-     * The default <tt>Font</tt> object used through this ui implementation.

-     */

-    public static final Font FONT

-        = new Font( BrandingActivator.getResources().getSettingsString("fontName"),

-                Font.PLAIN,

-                BrandingActivator.getResources().getSettingsInt("fontSize"));

-

-    /**

      * Temporary method to load the css style used in the chat window.

      * 

      * @param style

@@ -62,14 +55,15 @@ public class Constants
     public static void loadSimpleStyle(StyleSheet style)

     {

         InputStream is = BrandingActivator.getResources().

-            getSettingsInputStream("textStyle");

+            getSettingsInputStream("service.gui.HTML_TEXT_STYLE");

 

         Reader r = new BufferedReader(new InputStreamReader(is));

         try

         {

             style.loadRules(r, null);

             r.close();

-        } catch (IOException e)

+        }

+        catch (IOException e)

         {

         }

     }

diff --git a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
index 8f24389..5524859 100644
--- a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
+++ b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
@@ -16,15 +16,17 @@ import javax.swing.*;
 
 public class WelcomeWindow extends JDialog
 {
+    private static final String APPLICATION_NAME
+        = BrandingActivator.getResources()
+            .getSettingsString("service.gui.APPLICATION_NAME");
+
     private static final int DEFAULT_TEXT_INDENT
         = BrandingActivator.getResources()
-            .getSettingsInt("splashScreenTextIndent");
+            .getSettingsInt("plugin.branding.SPLASH_SCREEN_TEXT_INDENT");
 
     private WindowBackground mainPanel = new WindowBackground();
 
-    private JLabel titleLabel
-        = new JLabel(BrandingActivator.getResources()
-                .getSettingsString("applicationName"));
+    private JLabel titleLabel = new JLabel(APPLICATION_NAME);
 
     private JLabel versionLabel = new JLabel(" "
             + System.getProperty("sip-communicator.version"));
@@ -47,9 +49,7 @@ public class WelcomeWindow extends JDialog
 
     public WelcomeWindow()
     {
-        this.setTitle(
-            BrandingActivator.getResources()
-                .getSettingsString("applicationName"));
+        this.setTitle(APPLICATION_NAME);
 
         this.setModal(false);
         this.setUndecorated(true);
@@ -62,19 +62,21 @@ public class WelcomeWindow extends JDialog
                 .setBorder(BorderFactory.createEmptyBorder(15, 15, 0, 15));
         this.textPanel.setOpaque(false);
 
-        this.titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 28));
+        this.titleLabel.setFont(
+            titleLabel.getFont().deriveFont(Font.BOLD, 28));
         this.titleLabel.setForeground(Constants.TITLE_COLOR);
         this.titleLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);
 
-        this.versionLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
+        this.versionLabel.setFont(
+            versionLabel.getFont().deriveFont(Font.BOLD, 18));
         this.versionLabel.setForeground(Constants.TITLE_COLOR);
         this.versionLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);
 
         int logoAreaFontSize = BrandingActivator.getResources().
-            getSettingsInt("aboutLogoFontSize");
+            getSettingsInt("plugin.branding.ABOUT_LOGO_FONT_SIZE");
 
         this.logoArea.setFont(
-            Constants.FONT.deriveFont(Font.BOLD, logoAreaFontSize));
+            logoArea.getFont().deriveFont(Font.BOLD, logoAreaFontSize));
         this.logoArea.setForeground(Constants.TITLE_COLOR);
         this.logoArea.setOpaque(false);
         this.logoArea.setLineWrap(true);
@@ -90,8 +92,9 @@ public class WelcomeWindow extends JDialog
             "welcomeMessage",
             new String[]{
                 Constants.TEXT_COLOR,
-                BrandingActivator.getResources().getSettingsString("applicationName"),
-                BrandingActivator.getResources().getSettingsString("applicationWebSite")
+                APPLICATION_NAME,
+                BrandingActivator.getResources()
+                    .getSettingsString("service.gui.APPLICATION_WEB_SITE")
                 }));
 
         this.rightsArea.setPreferredSize(new Dimension(50, 50));
@@ -212,7 +215,7 @@ public class WelcomeWindow extends JDialog
             {
                 image =
                     ImageIO.read(BrandingActivator.getResources().getImageURL(
-                        "splashScreenBg"));
+                        "plugin.branding.SPLASH_SCREEN_BACKGROUND"));
             }
             catch (IOException e)
             {
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index 5368027..b4aa5bf 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -187,7 +187,7 @@ public class ContactInfoDetailsPanel
         }

         else

             scaledImage = ImageUtils.getScaledRoundedImage(

-                Resources.getImage("contactInfoDefaultPersonIcon"),

+                Resources.getImage("service.gui.DEFAULT_USER_PHOTO"),

                 AVATAR_AREA_WIDTH,

                 AVATAR_AREA_HEIGHT

                 );

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
index 68ea5c6..d2f3629 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
@@ -25,7 +25,8 @@ public class ContactInfoMenuItem
 {

     private JMenuItem menuItem

         = new JMenuItem(Resources.getString("contactInfo"),

-                        new ImageIcon(Resources.getImage("contactInfoIcon")));

+            new ImageIcon(Resources.getImage(

+                "plugin.contactinfo.CONTACT_INFO_ICON")));

 

     private MetaContact metaContact;

 

diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
index d761695..923c120 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/Resources.java
@@ -19,9 +19,11 @@ public class Resources
 {
     private static ResourceManagementService resourcesService;
 
-    public static ImageID DICT_LOGO = new ImageID("protocolIconDict");
+    public static ImageID DICT_LOGO
+        = new ImageID("service.protocol.dict.PROTOCOL_ICON");
 
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageDict");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.dict.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java
index 0105e36..79b7579 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java
@@ -19,8 +19,8 @@ import net.java.sip.communicator.service.gui.*;
 public class CallHistoryButton
     implements FavoritesButton
 {
-    byte[] buttonIcon = Resources.getResources()
-        .getImageInBytes("QUICK_MENU_CALL_HISTORY_ICON");
+    byte[] buttonIcon = ExtendedCallHistorySearchActivator.getResources()
+        .getImageInBytes("plugin.callhistorysearch.HISTORY_BUTTON");
 
     public void actionPerformed()
     {
@@ -40,11 +40,13 @@ public class CallHistoryButton
 
     public byte[] getImage()
     {
-        return buttonIcon;
+        return ExtendedCallHistorySearchActivator.getResources()
+        .getImageInBytes("plugin.callhistorysearch.HISTORY_BUTTON");
     }
 
     public String getText()
     {
-        return Resources.getString("history");
+        return ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("history");
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java
index 356405a..39977a5 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java
@@ -11,6 +11,8 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.util.*;
+
 /**
  * The <tt>ContactListCellRenderer</tt> is the custom cell renderer used in
  * the SIP-Communicator's <tt>ContactList</tt>. It extends JPanel instead of
@@ -36,9 +38,13 @@ public class CallListCellRenderer
 
     private JLabel iconLabel = new JLabel();
 
-    private Icon incomingIcon = Resources.getImage("incomingCall");
+    private Icon incomingIcon
+        = ExtendedCallHistorySearchActivator.getResources()
+            .getImage("plugin.callhistorysearch.INCOMING_CALL");
 
-    private Icon outgoingIcon = Resources.getImage("outgoingCall");
+    private Icon outgoingIcon
+        = ExtendedCallHistorySearchActivator.getResources()
+            .getImage("plugin.callhistorysearch.OUTGOING_CALL");
 
     private boolean isSelected = false;
 
@@ -103,11 +109,15 @@ public class CallListCellRenderer
                 iconLabel.setIcon(outgoingIcon);
 
             this.nameLabel.setText(participant.getParticipantName());
-
-            this.timeLabel.setText(Resources.getString("at") + " "
+ 
+            this.timeLabel.setText(
+                ExtendedCallHistorySearchActivator.getResources()
+                    .getI18NString("at") + " "
                 + GuiUtils.formatTime(participant.getStartTime()));
 
-            this.durationLabel.setText(Resources.getString("duration") + " "
+            this.durationLabel.setText(
+                ExtendedCallHistorySearchActivator.getResources()
+                    .getI18NString("duration") + " "
                 + GuiUtils.formatTime(participant.getCallTime()));
 
             // this.nameLabel.setIcon(listModel
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java
index 27b0fc5..1b3f782 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java
@@ -52,48 +52,55 @@ public class Constants {
      * record.
      */
     public static final Color HISTORY_IN_CALL_COLOR
-        = new Color(Resources.getColor("historyIncomingCallBackground"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.HISTORY_INCOMING_CALL_BACKGROUND"));
 
     /**
      * The color used to paint the background of an outgoing call history
      * record.
      */
     public static final Color HISTORY_OUT_CALL_COLOR
-        = new Color(Resources.getColor("historyOutgoingCallBackground"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.HISTORY_OUTGOING_CALL_BACKGROUND"));
 
     /**
      * The end color used to paint a gradient selected background of some
      * components.
      */
     public static final Color SELECTED_COLOR
-        = new Color(Resources.getColor("listSelectionColor"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.LIST_SELECTION_COLOR"));
 
     /**
      * The start color used to paint a gradient mouse over background of some
      * components.
      */
     public static final Color GRADIENT_DARK_COLOR
-        = new Color(Resources.getColor("gradientDarkColor"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.GRADIENT_DARK_COLOR"));
 
     /**
      * The end color used to paint a gradient mouse over background of some
      * components.
      */
     public static final Color GRADIENT_LIGHT_COLOR
-        = new Color(Resources.getColor("gradientLightColor"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.GRADIENT_LIGHT_COLOR"));
 
     /**
      * A color between blue and gray used to paint some borders.
      */
     public static final Color BORDER_COLOR
-        = new Color(Resources.getColor("borderColor"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.BORDER_COLOR"));
 
     /**
      * A color between blue and gray (darker than the other one), used to paint
      * some borders.
      */
     public static final Color LIST_SELECTION_BORDER_COLOR
-        = new Color(Resources.getColor("listSelectionBorderColor"));
+        = new Color(ExtendedCallHistorySearchActivator.getResources()
+                .getColor("service.gui.LIST_SELECTION_BORDER_COLOR"));
 
     /*
      * ======================================================================
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java
index 9abcc13..a7ce2f5 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java
@@ -11,6 +11,7 @@ import java.util.*;
 
 import net.java.sip.communicator.service.callhistory.*;
 import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
@@ -26,6 +27,8 @@ public class ExtendedCallHistorySearchActivator
     private Logger logger
         = Logger.getLogger(ExtendedCallHistorySearchActivator.class);
 
+    private static ResourceManagementService resourceService;
+
     static BundleContext context;
 
     public void start(BundleContext bc) throws Exception
@@ -70,4 +73,12 @@ public class ExtendedCallHistorySearchActivator
         return callHistoryService;
     }
 
+    public static ResourceManagementService getResources()
+    {
+        if (resourceService == null)
+            resourceService =
+                ResourceManagementServiceUtils
+                    .getService(ExtendedCallHistorySearchActivator.context);
+        return resourceService;
+    }
 }
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
index f6ac0f6..decaef3 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
@@ -14,6 +14,7 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.service.callhistory.*;
+import net.java.sip.communicator.util.*;
 
 import com.toedter.calendar.*;
 
@@ -41,31 +42,40 @@ public class ExtendedCallHistorySearchDialog
     private JPanel callListResultPanel = new JPanel(new BorderLayout());
 
     /* BUTTON */
-    private JButton searchButton = new JButton(Resources.getString("search"),
-        Resources.getImage("searchIcon"));
+    private JButton searchButton = new JButton(
+        ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("search"),
+        ExtendedCallHistorySearchActivator.getResources()
+            .getImage("plugin.callhistorysearch.SEARCH_ICON"));
 
     /* TEXT FIELD */
     private JTextField contactNameField = new JTextField();
 
     /* LABEL */
-    private JLabel contactNameLabel = new JLabel(Resources
-        .getString("contactName") + ": ");
+    private JLabel contactNameLabel = new JLabel(
+        ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("contactName") + ": ");
 
     private JLabel sinceDateLabel
-        = new JLabel(Resources.getString("since") + ": ");
+        = new JLabel(ExtendedCallHistorySearchActivator.getResources()
+                .getI18NString("since") + ": ");
 
     private JLabel untilDateLabel
-        = new JLabel(Resources.getString("until") + ": ");
+        = new JLabel(ExtendedCallHistorySearchActivator.getResources()
+                .getI18NString("until") + ": ");
 
     private JLabel callTypeLabel
-        = new JLabel(Resources.getString("callType") + ": ");
+        = new JLabel(ExtendedCallHistorySearchActivator.getResources()
+                .getI18NString("callType") + ": ");
 
     /* CHECKBOX */
-    private JCheckBox inCheckBox = new JCheckBox(Resources
-        .getString("incoming"), true);
+    private JCheckBox inCheckBox = new JCheckBox(
+        ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("incoming"), true);
 
-    private JCheckBox outCheckBox = new JCheckBox(Resources
-        .getString("outgoing"), true);
+    private JCheckBox outCheckBox = new JCheckBox(
+        ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("outgoing"), true);
 
     /* SCROLL PANE */
     private JScrollPane scrollPane = new JScrollPane();
@@ -99,7 +109,8 @@ public class ExtendedCallHistorySearchDialog
     {
         this.mainPanel.setPreferredSize(new Dimension(650, 550));
 
-        this.setTitle(Resources.getString("advancedCallHistorySearch"));
+        this.setTitle(ExtendedCallHistorySearchActivator.getResources()
+                .getI18NString("advancedCallHistorySearch"));
 
         this.initPanels();
 
@@ -327,7 +338,8 @@ public class ExtendedCallHistorySearchDialog
         if (GuiUtils.compareDates(date, new Date(currentDate)) == 0)
         {
 
-            resultString = Resources.getString("today");
+            resultString = ExtendedCallHistorySearchActivator.getResources()
+                .getI18NString("today");
         }
         else
         {
@@ -472,6 +484,7 @@ public class ExtendedCallHistorySearchDialog
         }
 
         if (callList.getModel().getSize() > 0)
-            callList.addItem(Resources.getString("olderCalls") + "...");
+            callList.addItem(ExtendedCallHistorySearchActivator.getResources()
+                    .getI18NString("olderCalls") + "...");
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java
index e4af1d7..7377d4a 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java
@@ -28,7 +28,10 @@ public class ExtendedCallHistorySearchItem
                 PluginComponent
 {
     private JMenuItem historyMenuItem
-        = new JMenuItem(Resources.getString("advancedCallHistorySearch"));
+        = new JMenuItem(ExtendedCallHistorySearchActivator.getResources()
+                .getI18NString("advancedCallHistorySearch"),
+            ExtendedCallHistorySearchActivator.getResources()
+                .getImage("plugin.callhistorysearch.HISTORY_MENU_ICON"));
 
     private ExtendedCallHistorySearchDialog callHistorySearchDialog = null;
 
@@ -38,7 +41,8 @@ public class ExtendedCallHistorySearchItem
     public ExtendedCallHistorySearchItem()
     {
         this.historyMenuItem.setMnemonic(
-            Resources.getMnemonic("advancedCallHistorySearch"));
+            ExtendedCallHistorySearchActivator.getResources()
+                .getI18nMnemonic("advancedCallHistorySearch"));
         this.historyMenuItem.addActionListener(this);
     }
  
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java
index 361ef8c..8f60b4c 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java
+++ b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java
@@ -9,6 +9,7 @@ package net.java.sip.communicator.plugin.extendedcallhistorysearch;
 import java.util.*;
 
 import net.java.sip.communicator.service.callhistory.*;
+import net.java.sip.communicator.util.*;
 
 /**
  * The <tt>GuiCallParticipantRecord</tt> is meant to be used in the call history
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiUtils.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiUtils.java
deleted file mode 100644
index 4b9b90e..0000000
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiUtils.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
-
-import java.awt.*;
-import java.util.*;
-
-import javax.swing.*;
-
-
-/**
- * The <tt>StringUtils</tt> class is used through this ui implementation for
- * some special operations with strings.
- * 
- * @author Yana Stamcheva
- */
-public class GuiUtils {
-
-    private static Calendar c1 = Calendar.getInstance();
-    
-    private static Calendar c2 = Calendar.getInstance();
-    
-    /**
-     * Replaces some chars that are special in a regular expression.
-     * @param text The initial text.
-     * @return the formatted text
-     */
-    public static String replaceSpecialRegExpChars(String text) {
-        return text.replaceAll("([.()^&$*|])", "\\\\$1");
-    }
-
-    /**
-     * Returns the width in pixels of a text.
-     * @param c the component where the text is contained
-     * @param text the text to measure
-     * @return the width in pixels of a text.
-     */
-    public static int getStringWidth(Component c, String text) {
-        return SwingUtilities.computeStringWidth(c
-                .getFontMetrics(Constants.FONT), text);
-    }
-    
-    /**
-     * Compares the two dates. The comparison is based only on the day, month
-     * and year values. Returns 0 if the two dates are equals, a value < 0 if
-     * the first date is before the second one and > 0 if the first date is after
-     * the second one.
-     * @param date1 the first date to compare
-     * @param date2 the second date to compare with 
-     * @return Returns 0 if the two dates are equals, a value < 0 if
-     * the first date is before the second one and > 0 if the first date is after
-     * the second one
-     */
-    public static int compareDates(Date date1, Date date2)
-    {
-        c1.setTime(date1);
-        c2.setTime(date2);
-        
-        int day1 = c1.get(Calendar.DAY_OF_MONTH);
-        int month1 = c1.get(Calendar.MONTH);
-        int year1 = c1.get(Calendar.YEAR);
-        
-        int day2 = c2.get(Calendar.DAY_OF_MONTH);
-        int month2 = c2.get(Calendar.MONTH);
-        int year2 = c2.get(Calendar.YEAR);
-        
-        if((day1 == day2)
-                && (month1 == month2)
-                && (year1 == year2)) {
-            
-            return 0;
-        }
-        else if((day1 < day2)
-                && (month1 <= month2)
-                && (year1 <= year2)) {
-            
-            return -1;
-        }
-        else {
-            return 1;
-        }
-    }
-    
-    /**
-     * Formats the given date. The result format is the following:
-     * [Month] [Day], [Year]. For example: Dec 24, 2000.
-     * @param date the date to format
-     * @return the formatted date string
-     */
-    public static String formatDate(Date date)
-    {
-        c1.setTime(date);
-        
-        return GuiUtils.processMonth(c1.get(Calendar.MONTH) + 1) + " " 
-            + GuiUtils.formatTime(c1.get(Calendar.DAY_OF_MONTH)) + ", "                
-            + GuiUtils.formatTime(c1.get(Calendar.YEAR));
-    }
-    
-    /**
-     * Formats the time for the given date. The result format is the following:
-     * [Hour]:[Minute]:[Second]. For example: 12:25:30. 
-     * @param date the date to format
-     * @return the formatted hour string
-     */
-    public static String formatTime(Date date)
-    {
-        c1.setTime(date);
-        
-        return  GuiUtils.formatTime(c1.get(Calendar.HOUR_OF_DAY)) + ":"
-            + GuiUtils.formatTime(c1.get(Calendar.MINUTE)) + ":"
-            + GuiUtils.formatTime(c1.get(Calendar.SECOND)) ;
-    }
-    
-    /**
-     * Substracts the two dates.
-     * @param date1 the first date argument
-     * @param date2 the second date argument
-     * @return the date resulted from the substracting
-     */
-    public static Date substractDates(Date date1, Date date2)
-    {
-        long d1 = date1.getTime();
-        long d2 = date2.getTime();
-        long difMil = d1-d2;
-        long milPerDay = 1000*60*60*24;
-        long milPerHour = 1000*60*60;
-        long milPerMin = 1000*60;
-        long milPerSec = 1000;
-
-        long days = difMil / milPerDay;
-        int hour = (int)(( difMil - days*milPerDay ) / milPerHour);
-        int min
-            = (int)(( difMil - days*milPerDay - hour*milPerHour ) / milPerMin);
-        int sec
-            = (int)(( difMil - days*milPerDay - hour*milPerHour - min*milPerMin )
-                    / milPerSec);
-        
-        c1.clear();
-        c1.set(Calendar.HOUR, hour);
-        c1.set(Calendar.MINUTE, min);
-        c1.set(Calendar.SECOND, sec);
-        
-        return c1.getTime();
-    }
-    
-    /**
-     * Replaces the month with its abbreviation.
-     * @param month Value from 1 to 12, which indicates the month.
-     * @return the corresponding month abbreviation
-     */
-    private static String processMonth(int month)
-    {
-        String monthString = "";
-        if(month == 1)
-            monthString = Resources.getString("january");
-        else if(month == 2)
-            monthString = Resources.getString("february");
-        else if(month == 3)
-            monthString = Resources.getString("march");
-        else if(month == 4)
-            monthString = Resources.getString("april");
-        else if(month == 5)
-            monthString = Resources.getString("may");
-        else if(month == 6)
-            monthString = Resources.getString("june");
-        else if(month == 7)
-            monthString = Resources.getString("july");
-        else if(month == 8)
-            monthString = Resources.getString("august");
-        else if(month == 9)
-            monthString = Resources.getString("september");
-        else if(month == 10)
-            monthString = Resources.getString("october");
-        else if(month == 11)
-            monthString = Resources.getString("november");
-        else if(month == 12)
-            monthString = Resources.getString("december");
-        
-        return monthString;
-    }
-    
-    /**
-     * Adds a 0 in the beginning of one digit numbers.
-     *
-     * @param time The time parameter could be hours, minutes or seconds.
-     * @return The formatted minutes string.
-     */
-    private static String formatTime(int time)
-    {
-        String timeString = new Integer(time).toString();
-
-        String resultString = "";
-        if (timeString.length() < 2)
-            resultString = resultString.concat("0").concat(timeString);
-        else
-            resultString = timeString;
-
-        return resultString;
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Resources.java b/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Resources.java
deleted file mode 100644
index 2f18f24..0000000
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Resources.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
-
-import javax.swing.*;
-
-import net.java.sip.communicator.service.resources.*;
-
-/**
- * The <tt>Resources</tt> class manages the access to the internationalization
- * properties files, image resources and color resources used in this plugin.
- * 
- * @author Yana Stamcheva
- */
-public class Resources
-{
-    private static ResourceManagementService resourcesService;
-
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static String getString(String key)
-    {
-        return getResources().getI18NString(key);
-    }
-    
-    /**
-     * Loads an image from a given image identifier.
-     * 
-     * @param imageID The identifier of the image.
-     * @return The image for the given identifier.
-     */
-    public static ImageIcon getImage(String imageID)
-    {
-        return getResources().getImage(imageID);
-    }
-    
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     * 
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static char getMnemonic(String key)
-    {
-        return getResources().getI18nMnemonic(key);
-    }
-
-    /**
-     * Returns an int RGB color corresponding to the given key.
-     *
-     * @param key The key of the string.
-     *
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static int getColor(String key)
-    {
-        return getResources().getColor(key);
-    }
-
-    public static ResourceManagementService getResources()
-    {
-        if (resourcesService == null)
-            resourcesService =
-                ResourceManagementServiceUtils
-                    .getService(ExtendedCallHistorySearchActivator.context);
-        return resourcesService;
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java b/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
index 36a3999..8b5e7f0 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/ConfigurationManager.java
@@ -45,7 +45,7 @@ public class ConfigurationManager
     {
         // Load the "auPopupNewMessage" property.
         String autoPopupProperty = 
-            "net.java.sip.communicator.impl.gui.autoPopupNewMessage";
+            "service.gui.AUTO_POPUP_NEW_MESSAGE";
         
         String autoPopup = configService.getString(autoPopupProperty);
 
@@ -57,7 +57,7 @@ public class ConfigurationManager
 
         // Load the "sendMessageCommand" property.
         String messageCommandProperty = 
-            "net.java.sip.communicator.impl.gui.sendMessageCommand";
+            "service.gui.SEND_MESSAGE_COMMAND";
         String messageCommand = configService.getString(messageCommandProperty);
         
         if(messageCommand == null)
@@ -71,7 +71,7 @@ public class ConfigurationManager
 
         // Load the "sendTypingNotifications" property.
         String isSendTypingNotifProperty = 
-            "net.java.sip.communicator.impl.gui.sendTypingNotifications";
+            "service.gui.SEND_TYPING_NOTIFICATIONS_ENABLED";
         String isSendTypingNotif = 
             configService.getString(isSendTypingNotifProperty);
         
@@ -87,7 +87,7 @@ public class ConfigurationManager
 
         // Load the "isMultiChatWindowEnabled" property.
         String isMultiChatWindowEnabledStringProperty
-            = "net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled";
+            = "service.gui.IS_MULTI_CHAT_WINDOW_ENABLED";
         
         String isMultiChatWindowEnabledString
             = configService.getString(isMultiChatWindowEnabledStringProperty);
@@ -107,7 +107,7 @@ public class ConfigurationManager
         
         // Load the "isHistoryLoggingEnabled" property.
         String isHistoryLoggingEnabledPropertyString =
-            "net.java.sip.communicator.impl.msghistory.isMessageHistoryEnabled";
+            "impl.msghistory.IS_MESSAGE_HISTORY_ENABLED";
         
         String isHistoryLoggingEnabledString
             = configService.getString(
@@ -128,7 +128,7 @@ public class ConfigurationManager
         
         // Load the "isHistoryShown" property.
         String isHistoryShownStringProperty = 
-            "net.java.sip.communicator.impl.gui.isMessageHistoryShown";
+            "service.gui.IS_MESSAGE_HISTORY_SHOWN";
         
         String isHistoryShownString
             = configService.getString(isHistoryShownStringProperty);
@@ -147,7 +147,7 @@ public class ConfigurationManager
 
         // Load the "chatHistorySize" property.
         String chatHistorySizeStringProperty =
-            "net.java.sip.communicator.impl.gui.messageHistorySize";
+            "service.gui.MESSAGE_HISTORY_SIZE";
         String chatHistorySizeString
             = configService.getString(chatHistorySizeStringProperty);
 
@@ -165,7 +165,7 @@ public class ConfigurationManager
 
         // Load the "isTransparentWindowEnabled" property.
         String isTransparentWindowEnabledProperty =
-            "net.java.sip.communicator.impl.gui.isTransparentWindowEnabled";
+            "impl.gui.IS_TRANSPARENT_WINDOW_ENABLED";
 
         String isTransparentWindowEnabledString
             = configService.getString(isTransparentWindowEnabledProperty);
@@ -183,7 +183,7 @@ public class ConfigurationManager
 
         // Load the "windowTransparency" property.
         String windowTransparencyProperty =
-            "net.java.sip.communicator.impl.gui.windowTransparency";
+            "impl.gui.WINDOW_TRANSPARENCY";
 
         String windowTransparencyString
             = configService.getString(windowTransparencyProperty);
@@ -302,7 +302,7 @@ public class ConfigurationManager
             isTransparentWindowEnabled;
 
         configService.setProperty(
-            "net.java.sip.communicator.impl.gui.isTransparentWindowEnabled",
+            "impl.gui.IS_TRANSPARENT_WINDOW_ENABLED",
             new Boolean(isTransparentWindowEnabled).toString());
     }
 
@@ -321,7 +321,7 @@ public class ConfigurationManager
         ConfigurationManager.windowTransparency = windowTransparency;
 
         configService.setProperty(
-            "net.java.sip.communicator.impl.gui.windowTransparency",
+            "impl.gui.WINDOW_TRANSPARENCY",
             new Integer(windowTransparency).toString());
     }
 
@@ -337,11 +337,11 @@ public class ConfigurationManager
 
         if(autoPopupNewMessage)
             configService.setProperty(
-                    "net.java.sip.communicator.impl.gui.autoPopupNewMessage",
+                    "service.gui.AUTO_POPUP_NEW_MESSAGE",
                     "yes");
         else
             configService.setProperty(
-                    "net.java.sip.communicator.impl.gui.autoPopupNewMessage",
+                    "service.gui.AUTO_POPUP_NEW_MESSAGE",
                     "no");
     }
 
@@ -357,7 +357,7 @@ public class ConfigurationManager
         isSendTypingNotifications = isSendTypingNotif;
 
         configService.setProperty(
-                "net.java.sip.communicator.impl.gui.sendTypingNotifications",
+                "service.gui.SEND_TYPING_NOTIFICATIONS_ENABLED",
                 Boolean.toString(isSendTypingNotif));
     }
 
@@ -373,7 +373,7 @@ public class ConfigurationManager
         sendMessageCommand = newMessageCommand;
 
         configService.setProperty(
-                "net.java.sip.communicator.impl.gui.sendMessageCommand",
+                "service.gui.SEND_MESSAGE_COMMAND",
                 newMessageCommand);
     }
 
@@ -390,7 +390,7 @@ public class ConfigurationManager
         ConfigurationManager.isHistoryLoggingEnabled = isMultiChatWindowEnabled;
 
         configService.setProperty(
-            "net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled",
+            "service.gui.IS_MULTI_CHAT_WINDOW_ENABLED",
             Boolean.toString(isMultiChatWindowEnabled));
     }
 
@@ -423,7 +423,7 @@ public class ConfigurationManager
         ConfigurationManager.isHistoryShown = isHistoryShown;
         
         configService.setProperty(
-            "net.java.sip.communicator.impl.gui.isMessageHistoryShown",
+            "service.gui.IS_MESSAGE_HISTORY_SHOWN",
             Boolean.toString(isHistoryShown));
     }
     
@@ -439,7 +439,7 @@ public class ConfigurationManager
         ConfigurationManager.chatHistorySize = historySize;
         
         configService.setProperty(
-            "net.java.sip.communicator.impl.gui.messageHistorySize",
+            "service.gui.MESSAGE_HISTORY_SIZE",
             Integer.toString(chatHistorySize));
     }
 }
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
index 8116a0c..0a08edf 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
@@ -316,7 +316,7 @@ public class GeneralConfigurationForm
 
     public byte[] getIcon()
     {
-        return Resources.getImage("pluginIconGeneralConfig");
+        return Resources.getImage("plugin.generalconfig.PLUGIN_ICON");
     }
 
     public String getTitle()
@@ -338,9 +338,10 @@ public class GeneralConfigurationForm
             try 
             {
                 String workingDir = new File(".").getCanonicalPath();
-                
-                String appName = 
-                        Resources.getSettingsString("applicationName");
+
+                String appName
+                    = Resources.getSettingsString("service.gui.APPLICATION_NAME");
+
                 ShellLink shortcut = new ShellLink(ShellLink.STARTUP, appName);
                 shortcut.setUserType(ShellLink.CURRENT_USER);
                 shortcut.setDescription(
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
index c2c8f03..b234235 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
@@ -21,12 +21,14 @@ public class Resources
     /**
      * A constant pointing to the Gibberish protocol logo icon.
      */
-    public static ImageID GIBBERISH_LOGO = new ImageID("protocolIconGibberish");
+    public static ImageID GIBBERISH_LOGO
+        = new ImageID("service.protocol.gibberish.PROTOCOL_ICON");
 
     /**
      * A constant pointing to the Gibberish protocol wizard page image.
      */
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageGibberish");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.gibberish.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java
index 25bf8b9..a521cca 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/Resources.java
@@ -20,12 +20,14 @@ public class Resources
     /**

      * A constant pointing to the Google Talk protocol logo image.

      */

-    public static ImageID PROTOCOL_ICON = new ImageID("googletalkProtocolIcon");

+    public static ImageID PROTOCOL_ICON

+        = new ImageID("service.protocolgoogletalk.PROTOCOL_ICON");

 

     /**

      * A constant pointing to the Aim protocol wizard page image.

      */

-    public static ImageID PAGE_IMAGE = new ImageID("googletalkPageImage");

+    public static ImageID PAGE_IMAGE

+        = new ImageID("service.protocolgoogletalk.PROTOCOL_LARGE_ICON");

 

     /**

      * Returns an internationalized string corresponding to the given key.

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index b4051b4..102aaf3 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -105,8 +105,8 @@ public class IcqAccountRegistrationWizard
         LinkedHashMap summaryTable = new LinkedHashMap();
 
         summaryTable.put(Resources.getString("uin"), registration.getUin());
-        summaryTable.put(Resources.getString("rememberPassword"), new Boolean(registration
-            .isRememberPassword()));
+        summaryTable.put(Resources.getString("rememberPassword"),
+                new Boolean(registration.isRememberPassword()));
 
         if(registration.isAdvancedSettingsEnabled())
         {
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
index e42ac29..a3c10cf 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
@@ -18,9 +18,11 @@ public class Resources
 {
     private static ResourceManagementService resourcesService;
 
-    public static ImageID ICQ_LOGO = new ImageID("protocolIconIcq");
+    public static ImageID ICQ_LOGO
+        = new ImageID("service.protocol.icq.PROTOCOL_ICON");
 
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageIcq");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.icq.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java
index aa04d38..2ae48a3 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/Resources.java
@@ -21,12 +21,14 @@ public class Resources
     /**
      * A constant pointing to the IRC protocol logo image.
      */
-    public static ImageID IRC_LOGO = new ImageID("protocolIconIrc");
+    public static ImageID IRC_LOGO
+        = new ImageID("service.protocol.irc.PROTOCOL_ICON");
 
     /**
      * A constant pointing to the IRC protocol wizard page image.
      */
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageIrc");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.irc.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index 4d7e714..d84bd3f 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -15,8 +15,6 @@ import net.java.sip.communicator.util.Logger;
 
 import org.osgi.framework.*;
 
-import com.jcraft.jsch.*;
-
 /**
  * The <tt>JabberAccountRegistrationWizard</tt> is an implementation of the
  * <tt>AccountRegistrationWizard</tt> for the Jabber protocol. It should allow
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
index ced5ee4..8b62f56 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
@@ -309,7 +309,8 @@ public class JabberServerChooserDialog
                 
                 // Create the builder and parse the file
                 serverComments = factory.newDocumentBuilder()
-                    .parse(Resources.getPropertyInputStream("commentsFile"));
+                    .parse(Resources.getPropertyInputStream(
+                        "plugin.jabberaccregwizz.SERVER_COMMENTS"));
             }
             catch (SAXException e)
             {
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
index 60ebb44..a4d1569 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
@@ -23,12 +23,14 @@ public class Resources
     /**
      * A constant pointing to the Jabber protocol logo image.
      */
-    public static ImageID PROTOCOL_ICON = new ImageID("protocolIconJabber");
+    public static ImageID PROTOCOL_ICON
+        = new ImageID("service.protocol.jabber.PROTOCOL_ICON");
 
     /**
      * A constant pointing to the Aim protocol wizard page image.
      */
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageJabber");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.jabber.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java
index f63a168..155bbef 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java
@@ -32,7 +32,8 @@ public class KeybindingsConfigForm
      */
     public String getTitle()
     {
-        return Resources.getString("keybindings");
+        return KeybindingChooserActivator.getResources()
+            .getI18NString("keybindings");
     }
 
     /**
@@ -41,7 +42,8 @@ public class KeybindingsConfigForm
      */
     public byte[] getIcon()
     {
-        return Resources.getImageInBytes("keybindingPluginIcon");
+        return KeybindingChooserActivator.getResources()
+            .getImageInBytes("plugin.keybinding.PLUGIN_ICON");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
index a8c3019..4af458f 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
@@ -14,6 +14,7 @@ import javax.swing.*;
 
 import chooser.*;
 
+import net.java.sip.communicator.impl.keybindings.*;
 import net.java.sip.communicator.service.keybindings.*;
 
 /**
@@ -142,7 +143,8 @@ public class KeybindingsConfigPanel
         {
             // Converts to I18N strings for UI
             String actionInternal = newEntry.getAction();
-            String actionLabel = Resources.getString(actionInternal);
+            String actionLabel = KeybindingChooserActivator.getResources()
+                .getI18NString(actionInternal);
             this.actionLabels.put(actionLabel, actionInternal);
             newEntry.setAction(actionLabel);
 
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/Resources.java b/src/net/java/sip/communicator/plugin/keybindingchooser/Resources.java
deleted file mode 100644
index 156f31a..0000000
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/Resources.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.plugin.keybindingchooser;
-
-/**
- * The <tt>Resources</tt> class manages the access to the internationalization
- * properties files and the image resources used in this plugin.
- * 
- * @author Yana Stamcheva
- */
-public class Resources
-{
-
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     * 
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static String getString(String key)
-    {
-        return KeybindingChooserActivator.getResources().getI18NString(key);
-    }
-
-    /**
-     * Loads an image from a given image identifier.
-     * 
-     * @param imageID The identifier of the image.
-     * @return The image for the given identifier.
-     */
-    public static byte[] getImageInBytes(String imageID)
-    {
-        return KeybindingChooserActivator.getResources().getImageInBytes(
-            imageID);
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
index f498b8f..da00639 100644
--- a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
@@ -218,7 +218,7 @@ public class MailboxConfigurationForm
      */
     public byte[] getIcon()
     {
-        return Resources.getImageInBytes("mailboxIcon");
+        return Resources.getImageInBytes("plugin.mailbox.PLUGIN_ICON");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
index c94ae66..088ad3f 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
@@ -21,12 +21,14 @@ public class Resources
     /**
      * A constant pointing to the MSN protocol logo image.
      */
-    public static ImageID MSN_LOGO = new ImageID("protocolIconMsn");
+    public static ImageID MSN_LOGO
+        = new ImageID("service.protocol.msn.PROTOCOL_ICON");
 
     /**
      * A constant pointing to the Aim protocol wizard page image.
      */
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageMsn");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.msn.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/ListMulti.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/ListMulti.java
index 55e4f30..57b808b 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/ListMulti.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/ListMulti.java
@@ -105,15 +105,15 @@ class MyTableRenderer extends DefaultTableCellRenderer
         {
             if(((String)value).equals("enable") == true)
             {
-                setIcon(new ImageIcon(
-                        Resources.getImageInBytes("activatedIcon")));
+                setIcon(new ImageIcon(Resources.getImageInBytes(
+                    "plugin.notificationconfig.ACTIVATED_ICON")));
                 setText(null);
                 setHorizontalAlignment(SwingConstants.CENTER);
             }
             else
             {
-                setIcon(new ImageIcon(
-                        Resources.getImageInBytes("desactivatedIcon")));
+                setIcon(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.DEACTIVATED_ICON")));
                 setText(null);
                 setHorizontalAlignment(SwingConstants.CENTER);
             }
@@ -122,7 +122,8 @@ class MyTableRenderer extends DefaultTableCellRenderer
         {
             if(((String)value).equals("Yes") == true)
             {
-                setIcon(new ImageIcon(Resources.getImageInBytes("progIcon")));
+                setIcon(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.PROG_ICON")));
                 setText(null);
                 setHorizontalAlignment(SwingConstants.CENTER);
             }
@@ -136,7 +137,8 @@ class MyTableRenderer extends DefaultTableCellRenderer
         {
             if(((String)value).equals("Yes") == true)
             {
-                setIcon(new ImageIcon(Resources.getImageInBytes("popupIcon")));
+                setIcon(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.POPUP_ICON")));
                 setText(null);
                 setHorizontalAlignment(SwingConstants.CENTER);
             }
@@ -150,7 +152,8 @@ class MyTableRenderer extends DefaultTableCellRenderer
         {
             if(((String)value).equals("Yes") == true)
             {
-                setIcon(new ImageIcon(Resources.getImageInBytes("soundIcon")));
+                setIcon(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.SOUND_ICON")));
                 setText(null);
                 setHorizontalAlignment(SwingConstants.CENTER);
             }
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java
index 8a50faf..a8732de 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java
@@ -38,7 +38,7 @@ public class NotificationConfigurationForm
      */
     public byte[] getIcon()
     {
-        return Resources.getImageInBytes("notificationIcon");
+        return Resources.getImageInBytes("plugin.notificationconfig.PLUGIN_ICON");
     }
 
     public int getIndex()
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
index af029b2..0325a8e 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
@@ -102,11 +102,14 @@ public class NotificationConfigurationPanel
         constraints.fill = GridBagConstraints.BOTH;
 
         JLabel icon1 =
-            new JLabel(new ImageIcon(Resources.getImageInBytes("progIcon")));
+            new JLabel(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.PROG_ICON")));
         JLabel icon2 =
-            new JLabel(new ImageIcon(Resources.getImageInBytes("popupIcon")));
+            new JLabel(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.POPUP_ICON")));
         JLabel icon3 =
-            new JLabel(new ImageIcon(Resources.getImageInBytes("soundIcon")));
+            new JLabel(new ImageIcon(Resources.getImageInBytes(
+                            "plugin.notificationconfig.SOUND_ICON")));
         Object column[] =
             { "Status", icon1, icon2, icon3, "Event" };
         notificationList = new ListMulti(column, columnToolTips);
@@ -140,7 +143,8 @@ public class NotificationConfigurationPanel
         playSoundCheckBox = new JCheckBox(Resources.getString("playsound"));
         playSoundCheckBox.addItemListener(this);
         playSoundButton = new JButton(
-                new ImageIcon(Resources.getImageInBytes("playIcon")));
+                new ImageIcon(Resources.getImageInBytes(
+                    "plugin.notificationconfig.PLAY_ICON")));
         playSoundButton.setMinimumSize(new Dimension(50,30));
         playSoundButton.setPreferredSize(new Dimension(50,30));
         playSoundButton.addActionListener(this);
@@ -149,7 +153,8 @@ public class NotificationConfigurationPanel
         soundFileTextField.setPreferredSize(new Dimension(250,30));
         soundFileTextField.getDocument().addDocumentListener(this);
         soundFileChooser = new JButton(
-                new ImageIcon(Resources.getImageInBytes("foldericon")));
+                new ImageIcon(Resources.getImageInBytes(
+                    "plugin.notificationconfig.FOLDER_ICON")));
         soundFileChooser.setMinimumSize(new Dimension(30,30));
         soundFileChooser.setPreferredSize(new Dimension(30,30));
         soundFileChooser.addActionListener(this);
@@ -160,7 +165,8 @@ public class NotificationConfigurationPanel
         programFileTextField.setPreferredSize(new Dimension(250,30));
         programFileTextField.getDocument().addDocumentListener(this);
         programFileChooser = new JButton(
-                new ImageIcon(Resources.getImageInBytes("foldericon")));
+                new ImageIcon(Resources.getImageInBytes(
+                    "plugin.notificationconfig.FOLDER_ICON")));
         programFileChooser.setMinimumSize(new Dimension(30,30));
         programFileChooser.setPreferredSize(new Dimension(30,30));
         programFileChooser.addActionListener(this);
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
index 1090338..6847767 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/Resources.java
@@ -44,22 +44,6 @@ public class Resources
      * @param imageID The identifier of the image.
      * @return The image for the given identifier.
      */
-    public static ImageIcon getImage(String imageID)
-    {
-        URL imageURL = 
-            getResources().getImageURL(imageID);
-
-        if(imageURL == null)
-            return null;
-
-        return new ImageIcon(imageURL);
-    }
-    
-    /**
-     * Loads an image from a given image identifier.
-     * @param imageID The identifier of the image.
-     * @return The image for the given identifier.
-     */
     public static byte[] getImageInBytes(String imageID)
     {
         return getResources().getImageInBytes(imageID);
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
index 795d8d2..19b4544 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
@@ -29,13 +29,13 @@ public class PluginListCellRenderer extends JPanel
      * The end color used to paint a gradient selected background.
      */
     private static final Color SELECTED_START_COLOR
-        = new Color(Resources.getColor("listSelectionColor"));
+        = new Color(Resources.getColor("service.gui.LIST_SELECTION_COLOR"));
 
     /**
      * The start color used to paint a gradient selected background.
      */
     private static final Color SELECTED_END_COLOR
-        = new Color(Resources.getColor("gradientLightColor"));
+        = new Color(Resources.getColor("service.gui.GRADIENT_LIGHT_COLOR"));
     
     private JPanel mainPanel = new JPanel(new BorderLayout());
     
@@ -144,21 +144,26 @@ public class PluginListCellRenderer extends JPanel
 
         return this;
     }
-    
+
     private ImageIcon getStateIcon(int state)
     {
         switch (state)
         {
             case Bundle.INSTALLED:
-                return Resources.getResources().getImage("installedStateIcon");
+                return Resources.getResources()
+                    .getImage("plugin.pluginmanager.INSTALLED_STATE");
             case Bundle.RESOLVED:
-                return Resources.getResources().getImage("deactivatedStateIcon");
+                return Resources.getResources()
+                    .getImage("plugin.pluginmanager.DEACTIVATED_STATE");
             case Bundle.STARTING:
-                return Resources.getResources().getImage("startingStateIcon");
+                return Resources.getResources()
+                    .getImage("plugin.pluginmanager.STARTING_STATE");
             case Bundle.ACTIVE:
-                return Resources.getResources().getImage("activeStateIcon");
+                return Resources.getResources()
+                    .getImage("plugin.pluginmanager.ACTIVATE_STATE");
             case Bundle.STOPPING:
-                return Resources.getResources().getImage("stoppingStateIcon");
+                return Resources.getResources()
+                    .getImage("plugin.pluginmanager.STOPPING_STATE");
         }
         return null;
     }
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java
index 3c0fb88..7265400 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java
@@ -36,7 +36,7 @@ public class PluginManagerConfigForm
     public byte[] getIcon()
     {
         return Resources.getResources().getImageInBytes(
-            "pluginIconPluginManager");
+            "plugin.pluginmanager.PLUGIN_ICON");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/TitlePanel.java b/src/net/java/sip/communicator/plugin/pluginmanager/TitlePanel.java
index f4f28d0..56d29c7 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/TitlePanel.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/TitlePanel.java
@@ -24,7 +24,7 @@ public class TitlePanel extends JPanel
      * A color between blue and gray used to paint some borders.
      */
     public static final Color BORDER_COLOR
-        = new Color(Resources.getColor("borderColor"));
+        = new Color(Resources.getColor("service.gui.BORDER_COLOR"));
 
     /**
      * The size of the gradient used for painting the background.
@@ -35,13 +35,13 @@ public class TitlePanel extends JPanel
      * The start color used to paint a gradient mouse over background.
      */
     private static final Color GRADIENT_DARK_COLOR
-        = new Color(Resources.getColor("gradientDarkColor"));
+        = new Color(Resources.getColor("service.gui.GRADIENT_DARK_COLOR"));
 
     /**
      * The end color used to paint a gradient mouse over background.
      */
     private static final Color GRADIENT_LIGHT_COLOR
-        = new Color(Resources.getColor("gradientLightColor"));
+        = new Color(Resources.getColor("service.gui.GRADIENT_LIGHT_COLOR"));
 
     private JLabel titleLabel = new JLabel();
 
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java
index 4b809fc..6e18062 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/Resources.java
@@ -21,12 +21,14 @@ public class Resources
     /**
      * A constant pointing to the RSS protocol logo image.
      */
-    public static ImageID RSS_LOGO = new ImageID("protocolIconRss");
+    public static ImageID RSS_LOGO
+        = new ImageID("service.protocol.rss.PROTOCOL_ICON");
 
     /**
      * A constant pointing to the RSS protocol wizard page image.
      */
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageRss");
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.rss.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
index cc76df5..3084289 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
@@ -98,10 +98,11 @@ public class InitialAccountRegistrationFrame
         this.getRootPane().setDefaultButton(signinButton);
 
         this.initAccountWizards();
-        
+
         // Create the default group
-        String groupName = Resources.getApplicationProperty("defaultGroupName");
-        
+        String groupName
+            = Resources.getApplicationProperty("impl.gui.DEFAULT_GROUP_NAME");
+
         if(groupName != null && groupName.length() > 0)
         {
             MetaContactListService contactList =
@@ -126,7 +127,8 @@ public class InitialAccountRegistrationFrame
 
     private void initAccountWizards()
     {
-        String simpleWizards = Resources.getLoginProperty("simpleWizards");
+        String simpleWizards
+            = Resources.getLoginProperty("plugin.simpleaccreg.PROTOCOL_ORDER");
 
         StringTokenizer tokenizer = new StringTokenizer(simpleWizards, "|");
 
@@ -421,7 +423,7 @@ public class InitialAccountRegistrationFrame
             return;
 
         String preferredWizardName
-            = Resources.getLoginProperty("preferredAccountWizard");
+            = Resources.getLoginProperty("impl.gui.PREFERRED_ACCOUNT_WIZARD");
 
         AccountRegistrationPanel accountPanel;
 
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
index 58cf8e1..b36fcfb 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
@@ -18,9 +18,11 @@ public class Resources
 {
     private static ResourceManagementService resourcesService;
 
-    public static ImageID SIP_LOGO = new ImageID("protocolIconSip");
-    
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageSip");
+    public static ImageID SIP_LOGO
+        = new ImageID("service.protocol.sip.PROTOCOL_ICON");
+
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.sip.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java
index 1b7dbcc..bbada60 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/Resources.java
@@ -25,9 +25,11 @@ public class Resources
 {
     private static ResourceManagementService resourcesService;
 
-    public static ImageID SSH_LOGO = new ImageID("protocolIconSsh");
-    
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageSsh");
+    public static ImageID SSH_LOGO
+        = new ImageID("service.protocol.ssh.PROTOCOL_ICON");
+
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.ssh.PROTOCOL_LARGE_ICON");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
index c26b9c0..a5bf8aa 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
@@ -328,26 +328,45 @@ public class WhiteboardFrame
     {
         setIconImage(Resources.getImage("sc_logo16x16").getImage());
 
-        selectionButton.setIcon(Resources.getImage("selectIcon"));
-        penButton.setIcon(Resources.getImage("penIcon"));
-        lineButton.setIcon(Resources.getImage("line2Icon"));
-        rectangleButton.setIcon(Resources.getImage("rectIcon"));
-        fillRectangleButton.setIcon(Resources.getImage("rectFIcon"));
-        circleButton.setIcon(Resources.getImage("circle2Icon"));
-        fillCircleButton.setIcon(Resources.getImage("circleFIcon"));
-        textButton.setIcon(Resources.getImage("text2Icon"));
-        colorChooserButton.setIcon(Resources.getImage("colorIcon"));
-        polylineButton.setIcon(Resources.getImage("polyLineIcon"));
-        polygonButton.setIcon(Resources.getImage("polyIcon"));
-        fillPolygonButton.setIcon(Resources.getImage("polyFIcon"));
-        imageButton.setIcon(Resources.getImage("imgIcon"));
-        modifButton.setIcon(Resources.getImage("modifIcon"));
-
-        jButtonNew.setIcon(Resources.getImage("fileNewIcon"));
-        jButtonCopy.setIcon(Resources.getImage("editCopyIcon"));
-        jButtonPaste.setIcon(Resources.getImage("editPasteIcon"));
-        jButtonOpen.setIcon(Resources.getImage("fileImportIcon"));
-        jButtonSave.setIcon(Resources.getImage("fileSaveIcon"));
+        selectionButton
+            .setIcon(Resources.getImage("plugin.whiteboard.SELECT_ICON"));
+        penButton
+            .setIcon(Resources.getImage("plugin.whiteboard.PEN_ICON"));
+        lineButton
+            .setIcon(Resources.getImage("plugin.whiteboard.LINE2_ICON"));
+        rectangleButton
+            .setIcon(Resources.getImage("plugin.whiteboard.RECT_ICON"));
+        fillRectangleButton
+            .setIcon(Resources.getImage("plugin.whiteboard.RECTF_ICON"));
+        circleButton
+            .setIcon(Resources.getImage("plugin.whiteboard.CIRCLE2_ICON"));
+        fillCircleButton
+            .setIcon(Resources.getImage("plugin.whiteboard.CIRCLEF_ICON"));
+        textButton
+            .setIcon(Resources.getImage("plugin.whiteboard.TEXT2_ICON"));
+        colorChooserButton
+            .setIcon(Resources.getImage("plugin.whiteboard.COLOR_ICON"));
+        polylineButton
+            .setIcon(Resources.getImage("plugin.whiteboard.POLY_LINE_ICON"));
+        polygonButton
+            .setIcon(Resources.getImage("plugin.whiteboard.POLY_ICON"));
+        fillPolygonButton
+            .setIcon(Resources.getImage("plugin.whiteboard.POLYF_ICON"));
+        imageButton
+            .setIcon(Resources.getImage("plugin.whiteboard.IMAGE_ICON"));
+        modifButton
+            .setIcon(Resources.getImage("plugin.whiteboard.MODIF_ICON"));
+
+        jButtonNew
+            .setIcon(Resources.getImage("plugin.whiteboard.FILE_NEW_ICON"));
+        jButtonCopy
+            .setIcon(Resources.getImage("plugin.whiteboard.EDIT_COPY_ICON"));
+        jButtonPaste
+            .setIcon(Resources.getImage("plugin.whiteboard.EDIT_PASTE_ICON"));
+        jButtonOpen
+            .setIcon(Resources.getImage("plugin.whiteboard.FILE_IMPORT_ICON"));
+        jButtonSave
+            .setIcon(Resources.getImage("plugin.whiteboard.FILE_SAVE_ICON"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
index 7da5d09..a01c582 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
@@ -18,9 +18,11 @@ public class Resources
 {
     private static ResourceManagementService resourcesService;
 
-    public static ImageID YAHOO_LOGO = new ImageID("protocolIconYahoo");
-    
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageYahoo");
+    public static ImageID YAHOO_LOGO
+        = new ImageID("service.protocol.yahoo.PROTOCOL_ICON");
+
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.yahoo.PROTOCOL_LARGE_IMAGE");
 
     /**
      * Returns an internationalized string corresponding to the given key.
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java
index 0a5dc27..c279a5a 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/Resources.java
@@ -18,11 +18,13 @@ import net.java.sip.communicator.service.resources.*;
 public class Resources
 {
     private static ResourceManagementService resourcesService;
-    
-    public static ImageID ZEROCONF_LOGO = new ImageID("protocolIconZeroconf");
-    
-    public static ImageID PAGE_IMAGE = new ImageID("pageImageZeroconf");
-    
+
+    public static ImageID ZEROCONF_LOGO
+        = new ImageID("service.protocol.zeroconf.PROTOCOL_ICON");
+
+    public static ImageID PAGE_IMAGE
+        = new ImageID("service.protocol.zeroconf.PROTOCOL_LARGE_ICON");
+
     /**
      * Returns an internationalized string corresponding to the given key.
      * @param key The key of the string.
diff --git a/src/net/java/sip/communicator/impl/gui/utils/GuiUtils.java b/src/net/java/sip/communicator/util/GuiUtils.java
index 5395cbd..b10f535 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/GuiUtils.java
+++ b/src/net/java/sip/communicator/util/GuiUtils.java
@@ -5,14 +5,13 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.impl.gui.utils;
+package net.java.sip.communicator.util;
 
 import java.awt.*;
 import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
 /**
  * The <tt>StringUtils</tt> class is used through this ui implementation for
  * some special operations with strings.
@@ -42,7 +41,7 @@ public class GuiUtils {
      */
     public static int getStringWidth(Component c, String text) {
         return SwingUtilities.computeStringWidth(c
-                .getFontMetrics(Constants.FONT), text);
+                .getFontMetrics(c.getFont()), text);
     }
     
     /**
@@ -182,30 +181,42 @@ public class GuiUtils {
     {
         String monthString = "";
         if(month == 1)
-            monthString = Messages.getI18NString("january").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("january");
         else if(month == 2)
-            monthString = Messages.getI18NString("february").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("february");
         else if(month == 3)
-            monthString = Messages.getI18NString("march").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("march");
         else if(month == 4)
-            monthString = Messages.getI18NString("april").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("april");
         else if(month == 5)
-            monthString = Messages.getI18NString("may").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("may");
         else if(month == 6)
-            monthString = Messages.getI18NString("june").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("june");
         else if(month == 7)
-            monthString = Messages.getI18NString("july").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("july");
         else if(month == 8)
-            monthString = Messages.getI18NString("august").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("august");
         else if(month == 9)
-            monthString = Messages.getI18NString("september").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("september");
         else if(month == 10)
-            monthString = Messages.getI18NString("october").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("october");
         else if(month == 11)
-            monthString = Messages.getI18NString("november").getText();
+            monthString
+                = UtilActivator.getResources().getI18NString("november");
         else if(month == 12)
-            monthString = Messages.getI18NString("december").getText();
-        
+            monthString
+                = UtilActivator.getResources().getI18NString("december");
+
         return monthString;
     }
     
diff --git a/src/net/java/sip/communicator/util/UtilActivator.java b/src/net/java/sip/communicator/util/UtilActivator.java
index 457f18d..9a7c551 100644
--- a/src/net/java/sip/communicator/util/UtilActivator.java
+++ b/src/net/java/sip/communicator/util/UtilActivator.java
@@ -6,8 +6,10 @@
  */
 package net.java.sip.communicator.util;
 
+import net.java.sip.communicator.plugin.extendedcallhistorysearch.*;
+import net.java.sip.communicator.service.resources.*;
+
 import org.osgi.framework.*;
-import java.lang.Thread.*;
 
 /**
  * The only raison d'etre for this Activator is so that it would set a global
@@ -23,6 +25,11 @@ public class UtilActivator
 {
     private static final Logger logger
         = Logger.getLogger(UtilActivator.class);
+
+    private static ResourceManagementService resourceService;
+
+    private static BundleContext bundleContext;
+
     /**
      * Calls <tt>Thread.setUncaughtExceptionHandler()</tt>
      *
@@ -38,6 +45,8 @@ public class UtilActivator
     {
         logger.trace("Setting default uncaught exception handler.");
 
+        bundleContext = context;
+
         Thread.setDefaultUncaughtExceptionHandler(this);
         Thread.currentThread().setDefaultUncaughtExceptionHandler(this);
     }
@@ -76,4 +85,18 @@ public class UtilActivator
     {
 
     }
+
+    /**
+     * Returns the service giving access to all application resources.
+     * 
+     * @return the service giving access to all application resources.
+     */
+    public static ResourceManagementService getResources()
+    {
+        if (resourceService == null)
+            resourceService =
+                ResourceManagementServiceUtils.getService(bundleContext);
+
+        return resourceService;
+    }
 }
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 55b84c8..830540d 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -18,6 +18,7 @@ Import-Package: org.osgi.framework,
  javax.swing.text,
  net.java.sip.communicator.util.xml,
  net.java.sip.communicator.util,
+ net.java.sip.communicator.service.resources,
  javax.imageio
 Export-Package: net.java.sip.communicator.util.xml,
  net.java.sip.communicator.util,