diff --git a/res.qrc b/res.qrc
index 364c0390c..163690ed1 100644
--- a/res.qrc
+++ b/res.qrc
@@ -120,118 +120,6 @@
         <file>smileys/krepa098/tongue.png</file>
         <file>smileys/krepa098/uncertain.png</file>
         <file>smileys/krepa098/wink.png</file>
-        <file>translations/bg.qm</file>
-        <file>translations/de.qm</file>
-        <file>translations/es.qm</file>
-        <file>translations/fi.qm</file>
-        <file>translations/fr.qm</file>
-        <file>translations/it.qm</file>
-        <file>translations/lt.qm</file>
-        <file>translations/mannol.qm</file>
-        <file>translations/pirate.qm</file>
-        <file>translations/pl.qm</file>
-        <file>translations/pt.qm</file>
-        <file>translations/ru.qm</file>
-        <file>translations/sv.qm</file>
-        <file>translations/uk.qm</file>
-        <file>ui/acceptFileButton/default.png</file>
-        <file>ui/acceptFileButton/hover.png</file>
-        <file>ui/acceptFileButton/pressed.png</file>
-        <file>ui/acceptFileButton/style.css</file>
-        <file>ui/callButton/callButton.css</file>
-        <file>ui/callButton/callButton.png</file>
-        <file>ui/callButton/callButtonDisabled.png</file>
-        <file>ui/callButton/callButtonHover.png</file>
-        <file>ui/callButton/callButtonPressed.png</file>
-        <file>ui/callButton/callButtonRed.png</file>
-        <file>ui/callButton/callButtonRedHover.png</file>
-        <file>ui/callButton/callButtonRedPressed.png</file>
-        <file>ui/callButton/callButtonYellow.png</file>
-        <file>ui/callButton/callButtonYellowHover.png</file>
-        <file>ui/callButton/callButtonYellowPressed.png</file>
-        <file>ui/chatArea/chatArea.css</file>
-        <file>ui/chatArea/chatHead.css</file>
-        <file>ui/chatArea/innerStyle.css</file>
-        <file>ui/chatArea/scrollBarDownArrow.png</file>
-        <file>ui/chatArea/scrollBarDownArrowHover.png</file>
-        <file>ui/chatArea/scrollBarDownArrowPressed.png</file>
-        <file>ui/chatArea/scrollBarHandle.png</file>
-        <file>ui/chatArea/scrollBarUpArrow.png</file>
-        <file>ui/chatArea/scrollBarUpArrowHover.png</file>
-        <file>ui/chatArea/scrollBarUpArrowPressed.png</file>
-        <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
-        <file>ui/emoteButton/emoteButton.css</file>
-        <file>ui/emoteButton/emoteButton.png</file>
-        <file>ui/emoteButton/emoteButtonHover.png</file>
-        <file>ui/emoteButton/emoteButtonPressed.png</file>
-        <file>ui/emoticonWidget/dot_page.png</file>
-        <file>ui/emoticonWidget/dot_page_current.png</file>
-        <file>ui/emoticonWidget/dot_page_hover.png</file>
-        <file>ui/emoticonWidget/emoticonWidget.css</file>
-        <file>ui/fileButton/fileButton.css</file>
-        <file>ui/fileButton/fileButton.png</file>
-        <file>ui/fileButton/fileButtonHover.png</file>
-        <file>ui/fileButton/fileButtonPressed.png</file>
-        <file>ui/fileButton/fileButtonDisabled.png</file>
-        <file>ui/fileTransferInstance/acceptFileButton.png</file>
-        <file>ui/fileTransferInstance/emptyLGreenFileButton.png</file>
-        <file>ui/fileTransferInstance/emptyLRedFileButton.png</file>
-        <file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
-        <file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
-        <file>ui/fileTransferInstance/pauseFileButton.png</file>
-        <file>ui/fileTransferInstance/pauseGreyFileButton.png</file>
-        <file>ui/fileTransferInstance/resumeFileButton.png</file>
-        <file>ui/fileTransferInstance/stopFileButton.png</file>
-        <file>ui/fileTransferInstance/sliverRTEdge.png</file>
-        <file>ui/fileTransferWidget/fileTransferWidget.css</file>
-        <file>ui/friendList/friendList.css</file>
-        <file>ui/micButton/micButton.css</file>
-        <file>ui/micButton/micButton.png</file>
-        <file>ui/micButton/micButtonDisabled.png</file>
-        <file>ui/micButton/micButtonHover.png</file>
-        <file>ui/micButton/micButtonPressed.png</file>
-        <file>ui/msgEdit/msgEdit.css</file>
-        <file>ui/pauseFileButton/default.png</file>
-        <file>ui/pauseFileButton/hover.png</file>
-        <file>ui/pauseFileButton/pressed.png</file>
-        <file>ui/pauseFileButton/style.css</file>
-        <file>ui/sendButton/sendButton.css</file>
-        <file>ui/sendButton/sendButton.png</file>
-        <file>ui/sendButton/sendButtonHover.png</file>
-        <file>ui/sendButton/sendButtonPressed.png</file>
-        <file>ui/settings/mainContent.css</file>
-        <file>ui/settings/mainHead.css</file>
-        <file>ui/statusButton/dot_away.png</file>
-        <file>ui/statusButton/dot_busy.png</file>
-        <file>ui/statusButton/dot_idle.png</file>
-        <file>ui/statusButton/dot_online.png</file>
-        <file>ui/statusButton/menu_indicator.png</file>
-        <file>ui/statusButton/statusButton.css</file>
-        <file>ui/stopFileButton/default.png</file>
-        <file>ui/stopFileButton/hover.png</file>
-        <file>ui/stopFileButton/pressed.png</file>
-        <file>ui/stopFileButton/style.css</file>
-        <file>ui/videoButton/videoButton.css</file>
-        <file>ui/videoButton/videoButton.png</file>
-        <file>ui/videoButton/videoButtonDisabled.png</file>
-        <file>ui/videoButton/videoButtonHover.png</file>
-        <file>ui/videoButton/videoButtonPressed.png</file>
-        <file>ui/videoButton/videoButtonRed.png</file>
-        <file>ui/videoButton/videoButtonRedHover.png</file>
-        <file>ui/videoButton/videoButtonRedPressed.png</file>
-        <file>ui/videoButton/videoButtonYellow.png</file>
-        <file>ui/videoButton/videoButtonYellowHover.png</file>
-        <file>ui/videoButton/videoButtonYellowPressed.png</file>
-        <file>ui/volButton/volButton.png</file>
-        <file>ui/volButton/volButtonHover.png</file>
-        <file>ui/volButton/volButtonPressed.png</file>
-        <file>ui/volButton/volButton.css</file>
-        <file>ui/window/applicationIcon.png</file>
-        <file>ui/window/statusPanel.css</file>
-        <file>ui/window/window.css</file>
-        <file>ui/acceptCall/acceptCall.png</file>
-        <file>ui/rejectCall/rejectCall.png</file>
-        <file>ui/volButton/volButtonDisabled.png</file>
         <file>smileys/TwitterEmojiSVG/263a.svg</file>
         <file>smileys/TwitterEmojiSVG/1f600.svg</file>
         <file>smileys/TwitterEmojiSVG/1f601.svg</file>
@@ -1063,5 +951,118 @@
         <file>smileys/TwitterEmojiSVG/1f1f0-1f1f7.svg</file>
         <file>smileys/TwitterEmojiSVG/1f1f7-1f1fa.svg</file>
         <file>smileys/TwitterEmojiSVG/1f1fa-1f1f8.svg</file>
+        <file>smileys/TwitterEmojiSVG/emoticons.xml</file>
+        <file>translations/bg.qm</file>
+        <file>translations/de.qm</file>
+        <file>translations/es.qm</file>
+        <file>translations/fi.qm</file>
+        <file>translations/fr.qm</file>
+        <file>translations/it.qm</file>
+        <file>translations/lt.qm</file>
+        <file>translations/mannol.qm</file>
+        <file>translations/pirate.qm</file>
+        <file>translations/pl.qm</file>
+        <file>translations/pt.qm</file>
+        <file>translations/ru.qm</file>
+        <file>translations/sv.qm</file>
+        <file>translations/uk.qm</file>
+        <file>ui/acceptFileButton/default.png</file>
+        <file>ui/acceptFileButton/hover.png</file>
+        <file>ui/acceptFileButton/pressed.png</file>
+        <file>ui/acceptFileButton/style.css</file>
+        <file>ui/callButton/callButton.css</file>
+        <file>ui/callButton/callButton.png</file>
+        <file>ui/callButton/callButtonDisabled.png</file>
+        <file>ui/callButton/callButtonHover.png</file>
+        <file>ui/callButton/callButtonPressed.png</file>
+        <file>ui/callButton/callButtonRed.png</file>
+        <file>ui/callButton/callButtonRedHover.png</file>
+        <file>ui/callButton/callButtonRedPressed.png</file>
+        <file>ui/callButton/callButtonYellow.png</file>
+        <file>ui/callButton/callButtonYellowHover.png</file>
+        <file>ui/callButton/callButtonYellowPressed.png</file>
+        <file>ui/chatArea/chatArea.css</file>
+        <file>ui/chatArea/chatHead.css</file>
+        <file>ui/chatArea/innerStyle.css</file>
+        <file>ui/chatArea/scrollBarDownArrow.png</file>
+        <file>ui/chatArea/scrollBarDownArrowHover.png</file>
+        <file>ui/chatArea/scrollBarDownArrowPressed.png</file>
+        <file>ui/chatArea/scrollBarHandle.png</file>
+        <file>ui/chatArea/scrollBarUpArrow.png</file>
+        <file>ui/chatArea/scrollBarUpArrowHover.png</file>
+        <file>ui/chatArea/scrollBarUpArrowPressed.png</file>
+        <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
+        <file>ui/emoteButton/emoteButton.css</file>
+        <file>ui/emoteButton/emoteButton.png</file>
+        <file>ui/emoteButton/emoteButtonHover.png</file>
+        <file>ui/emoteButton/emoteButtonPressed.png</file>
+        <file>ui/emoticonWidget/dot_page.png</file>
+        <file>ui/emoticonWidget/dot_page_current.png</file>
+        <file>ui/emoticonWidget/dot_page_hover.png</file>
+        <file>ui/emoticonWidget/emoticonWidget.css</file>
+        <file>ui/fileButton/fileButton.css</file>
+        <file>ui/fileButton/fileButton.png</file>
+        <file>ui/fileButton/fileButtonHover.png</file>
+        <file>ui/fileButton/fileButtonPressed.png</file>
+        <file>ui/fileButton/fileButtonDisabled.png</file>
+        <file>ui/fileTransferInstance/acceptFileButton.png</file>
+        <file>ui/fileTransferInstance/emptyLGreenFileButton.png</file>
+        <file>ui/fileTransferInstance/emptyLRedFileButton.png</file>
+        <file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
+        <file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
+        <file>ui/fileTransferInstance/pauseFileButton.png</file>
+        <file>ui/fileTransferInstance/pauseGreyFileButton.png</file>
+        <file>ui/fileTransferInstance/resumeFileButton.png</file>
+        <file>ui/fileTransferInstance/stopFileButton.png</file>
+        <file>ui/fileTransferInstance/sliverRTEdge.png</file>
+        <file>ui/fileTransferWidget/fileTransferWidget.css</file>
+        <file>ui/friendList/friendList.css</file>
+        <file>ui/micButton/micButton.css</file>
+        <file>ui/micButton/micButton.png</file>
+        <file>ui/micButton/micButtonDisabled.png</file>
+        <file>ui/micButton/micButtonHover.png</file>
+        <file>ui/micButton/micButtonPressed.png</file>
+        <file>ui/msgEdit/msgEdit.css</file>
+        <file>ui/pauseFileButton/default.png</file>
+        <file>ui/pauseFileButton/hover.png</file>
+        <file>ui/pauseFileButton/pressed.png</file>
+        <file>ui/pauseFileButton/style.css</file>
+        <file>ui/sendButton/sendButton.css</file>
+        <file>ui/sendButton/sendButton.png</file>
+        <file>ui/sendButton/sendButtonHover.png</file>
+        <file>ui/sendButton/sendButtonPressed.png</file>
+        <file>ui/settings/mainContent.css</file>
+        <file>ui/settings/mainHead.css</file>
+        <file>ui/statusButton/dot_away.png</file>
+        <file>ui/statusButton/dot_busy.png</file>
+        <file>ui/statusButton/dot_idle.png</file>
+        <file>ui/statusButton/dot_online.png</file>
+        <file>ui/statusButton/menu_indicator.png</file>
+        <file>ui/statusButton/statusButton.css</file>
+        <file>ui/stopFileButton/default.png</file>
+        <file>ui/stopFileButton/hover.png</file>
+        <file>ui/stopFileButton/pressed.png</file>
+        <file>ui/stopFileButton/style.css</file>
+        <file>ui/videoButton/videoButton.css</file>
+        <file>ui/videoButton/videoButton.png</file>
+        <file>ui/videoButton/videoButtonDisabled.png</file>
+        <file>ui/videoButton/videoButtonHover.png</file>
+        <file>ui/videoButton/videoButtonPressed.png</file>
+        <file>ui/videoButton/videoButtonRed.png</file>
+        <file>ui/videoButton/videoButtonRedHover.png</file>
+        <file>ui/videoButton/videoButtonRedPressed.png</file>
+        <file>ui/videoButton/videoButtonYellow.png</file>
+        <file>ui/videoButton/videoButtonYellowHover.png</file>
+        <file>ui/videoButton/videoButtonYellowPressed.png</file>
+        <file>ui/volButton/volButton.png</file>
+        <file>ui/volButton/volButtonHover.png</file>
+        <file>ui/volButton/volButtonPressed.png</file>
+        <file>ui/volButton/volButton.css</file>
+        <file>ui/window/applicationIcon.png</file>
+        <file>ui/window/statusPanel.css</file>
+        <file>ui/window/window.css</file>
+        <file>ui/acceptCall/acceptCall.png</file>
+        <file>ui/rejectCall/rejectCall.png</file>
+        <file>ui/volButton/volButtonDisabled.png</file>
     </qresource>
 </RCC>