fixes #4486 (User notes copy problem)

94 files changed, 382 insertions, 453 deletions

diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 73adafcbaf..d6ae823656 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\TabSRMM_icons\NOVA\ICONS_NOVA_15.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_mRadio", "..\plugins\mRadio\proto_mradio\Proto_mRadio.vcxproj", "{2BCC460C-E7C0-4AA8-B680-B9DE561A8408}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_NewsAggregator", "..\protocols\NewsAggregator\proto_newsaggregator\Proto_NewsAggregator.vcxproj", "{B97882DC-7462-41DB-A390-BDFCE5295265}"

@@ -62,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Telegram", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\TabSRMM_icons\ICONS_NOVA_15.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

diff --git a/bin16/mir_icons.sln b/bin16/mir_icons.sln
index ce80b305ea..7e5dff7212 100644
--- a/bin16/mir_icons.sln
+++ b/bin16/mir_icons.sln
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\TabSRMM_icons\NOVA\ICONS_NOVA_16.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_mRadio", "..\plugins\mRadio\proto_mradio\Proto_mRadio.vcxproj", "{2BCC460C-E7C0-4AA8-B680-B9DE561A8408}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_NewsAggregator", "..\protocols\NewsAggregator\proto_newsaggregator\Proto_NewsAggregator.vcxproj", "{B97882DC-7462-41DB-A390-BDFCE5295265}"

@@ -62,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Telegram", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\TabSRMM_icons\ICONS_NOVA_16.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

diff --git a/bin17/mir_icons.sln b/bin17/mir_icons.sln
index 2c7d86a8a5..d062f1305c 100644
--- a/bin17/mir_icons.sln
+++ b/bin17/mir_icons.sln
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\TabSRMM_icons\NOVA\ICONS_NOVA_17.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_mRadio", "..\plugins\mRadio\proto_mradio\Proto_mRadio.vcxproj", "{2BCC460C-E7C0-4AA8-B680-B9DE561A8408}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_NewsAggregator", "..\protocols\NewsAggregator\proto_newsaggregator\Proto_NewsAggregator.vcxproj", "{B97882DC-7462-41DB-A390-BDFCE5295265}"

@@ -62,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Telegram", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\TabSRMM_icons\ICONS_NOVA_17.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_15.vcxproj b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_15.vcxproj
index ad4a6a4593..3594fcf651 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_15.vcxproj
+++ b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_15.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>TabSRMM_icons</ProjectName>
     <ProjectGuid>{F553F140-B7D3-4984-90B1-00D4831B8A6E}</ProjectGuid>
     <XPDeprecationWarning>false</XPDeprecationWarning>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -81,7 +82,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -93,7 +94,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -105,7 +106,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +118,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_15.vcxproj.filters b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_15.vcxproj.filters
index 82f83f0dff..82f83f0dff 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_15.vcxproj.filters
+++ b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_15.vcxproj.filters
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_16.vcxproj b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_16.vcxproj
index 2991f17616..4ad5cf9e60 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_16.vcxproj
+++ b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_16.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>TabSRMM_icons</ProjectName>
     <ProjectGuid>{F553F140-B7D3-4984-90B1-00D4831B8A6E}</ProjectGuid>
     <XPDeprecationWarning>false</XPDeprecationWarning>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -81,7 +82,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -93,7 +94,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -105,7 +106,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +118,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_16.vcxproj.filters b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_16.vcxproj.filters
index 82f83f0dff..82f83f0dff 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_16.vcxproj.filters
+++ b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_16.vcxproj.filters
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_17.vcxproj b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_17.vcxproj
index 3a423536d1..08e40053e5 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_17.vcxproj
+++ b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_17.vcxproj
@@ -81,7 +81,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -93,7 +93,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -105,7 +105,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,7 +117,7 @@
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_17.vcxproj.filters b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_17.vcxproj.filters
index 82f83f0dff..82f83f0dff 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_17.vcxproj.filters
+++ b/plugins/TabSRMM/TabSRMM_icons/ICONS_NOVA_17.vcxproj.filters
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/avatar.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/avatar.ico
deleted file mode 100644
index 6916aa581e..0000000000
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/avatar.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Font2.ico b/plugins/TabSRMM/TabSRMM_icons/res/Font2.ico
index 443d207407..443d207407 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Font2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/Font2.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/ICONS_NOVA.rc b/plugins/TabSRMM/TabSRMM_icons/res/ICONS_NOVA.rc
index 3bcec338fc..77ea2b89e3 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/ICONS_NOVA.rc
+++ b/plugins/TabSRMM/TabSRMM_icons/res/ICONS_NOVA.rc
@@ -1,173 +1,172 @@
-// Microsoft Visual C++ generated resource script.

-//

-

-#include "..\..\resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "winres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// German (Germany) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)

-#ifdef _WIN32

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_IMAGETAG            ICON                    "..\\..\\imgopen.ico"

-IDI_PULLDOWNARROW       ICON                    "..\\..\\pulldown.ico"

-IDI_LEFTARROW           ICON                    "..\\..\\leftarrow.ico"

-IDI_PULLUPARROW         ICON                    "..\\..\\pullup.ico"

-IDI_RIGHTARROW          ICON                    "..\\..\\rightarrow.ico"

-

-IDI_TRAYANIM1           ICON                    "..\\..\\MessAnim\\m1.ico"

-IDI_TRAYANIM2           ICON                    "..\\..\\MessAnim\\m2.ico"

-IDI_TRAYANIM3           ICON                    "..\\..\\MessAnim\\m3.ico"

-IDI_TRAYANIM4           ICON                    "..\\..\\MessAnim\\m4.ico"

-

-IDI_HISTORY             ICON                    "history.ico"

-IDI_MSGLOGOPT           ICON                    "options.ico"

-IDI_ADDCONTACT          ICON                    "plus.ico"

-IDI_MULTISEND           ICON                    "multisend.ico"

-IDI_TYPING              ICON                    "pencil.ico"

-IDI_QUOTE               ICON                    "quote.ico"

-IDI_SAVE                ICON                    "file.ico"

-IDI_SEND                ICON                    "check.ico"

-IDI_CONTACTPIC          ICON                    "avatar.ico"

-IDI_USERMENU            ICON                    "info.ico"

-IDI_MSGERROR            ICON                    "block.ico"

-IDI_CLOSEMSGDLG         ICON                    "delete.ico"

-IDI_CLOCK               ICON                    "clock.ico"

-IDI_ICONIN              ICON                    "Incom.ico"

-IDI_ICONOUT             ICON                    "outg.ico"

-IDI_SMILEYICON          ICON                    "emoticon.ico"

-IDI_SELFTYPING_ON       ICON                    "mtn.ico"

-IDI_SELFTYPING_OFF      ICON                    "nomtn.ico"

-IDI_CONTAINER           ICON                    "message.ico"

-IDI_SECUREIM_ENABLED    ICON                    "secureOn.ico"

-IDI_SECUREIM_DISABLED   ICON                    "secureOff.ico"

-IDI_STATUSCHANGE        ICON                    "Status change.ico"

-IDI_FONTBOLD            ICON                    "bold.ico"

-IDI_FONTITALIC          ICON                    "italic.ico"

-IDI_FONTUNDERLINE       ICON                    "underline.ico"

-IDI_STRIKEOUT           ICON                    "strike.ico"

-IDI_FONTFACE            ICON                    "font.ico"

-IDI_FONTCOLOR           ICON                    "font2.ico"

-IDI_SOUNDSON            ICON                    "sounds_on.ico"

-IDI_SESSIONLIST         ICON                    "slist.ico"

-IDI_CONFIGSIDEBAR       ICON                    "sbaroptions.ico"

-IDI_RECENTLIST          ICON                    "recentlist.ico"

-IDI_USERPREFS           ICON                    "userprefs.ico"

-IDI_SECURE              ICON                    "unverified.ico"

-IDI_STRONG              ICON                    "private.ico"

-

-IDI_TOPICBUT            ICON                    "chat\\topicbut.ico"

-IDI_JOIN                ICON                    "chat\\join.ico"

-IDI_TOPIC               ICON                    "chat\\topic.ico"

-IDI_ADDSTATUS           ICON                    "chat\\addmode.ico"

-IDI_INFO                ICON                    "chat\\info.ico"

-IDI_KICK                ICON                    "chat\\kick.ico"

-IDI_MESSAGE             ICON                    "chat\\message.ico"

-IDI_NICK                ICON                    "chat\\nick.ico"

-IDI_NOTICE              ICON                    "chat\\notice.ico"

-IDI_PART                ICON                    "chat\\part.ico"

-IDI_QUIT                ICON                    "chat\\quit.ico"

-IDI_REMSTATUS           ICON                    "chat\\removestatus.ico"

-IDI_HIGHLIGHT           ICON                    "chat\\highlight.ico"

-IDI_MESSAGEOUT          ICON                    "chat\\messageout.ico"

-IDI_ACTION              ICON                    "chat\\action.ico"

-IDI_BKGCOLOR            ICON                    "chat\\bkgcolor.ico"

-IDI_CHANMGR             ICON                    "chat\\window.ico"

-IDI_FILTER              ICON                    "chat\\filter.ico"

-IDI_BLANK               ICON                    "chat\\blank.ico"

-IDI_STATUS0             ICON                    "chat\\blank.ico"

-IDI_OVERLAY             ICON                    "chat\\overlay.ico"

-IDI_FILTER2             ICON                    "chat\\filter2.ico"

-IDI_SHOWNICKLIST        ICON                    "chat\\nicklist_show.ico"

-IDI_HIDENICKLIST        ICON                    "chat\\nicklist_hide.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_UNKNOWNAVATAR       BITMAP                  "..\\..\\unknown.bmp"

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\..\\resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-#endif    // German (Germany) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// German (Austria) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)

-#ifdef _WIN32

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_IDENTIFY            "__tabSRMM_ICONPACK 5.0__"

-END

-

-#endif    // German (Austria) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

+// Microsoft Visual C++ generated resource script.
+//
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// German (Germany) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
+#ifdef _WIN32
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_IMAGETAG            ICON                    "imgopen.ico"
+IDI_PULLDOWNARROW       ICON                    "pulldown.ico"
+IDI_LEFTARROW           ICON                    "leftarrow.ico"
+IDI_PULLUPARROW         ICON                    "pullup.ico"
+IDI_RIGHTARROW          ICON                    "rightarrow.ico"
+
+IDI_TRAYANIM1           ICON                    "MessAnim\\m1.ico"
+IDI_TRAYANIM2           ICON                    "MessAnim\\m2.ico"
+IDI_TRAYANIM3           ICON                    "MessAnim\\m3.ico"
+IDI_TRAYANIM4           ICON                    "MessAnim\\m4.ico"
+
+IDI_HISTORY             ICON                    "history.ico"
+IDI_MSGLOGOPT           ICON                    "options.ico"
+IDI_ADDCONTACT          ICON                    "plus.ico"
+IDI_MULTISEND           ICON                    "multisend.ico"
+IDI_TYPING              ICON                    "pencil.ico"
+IDI_QUOTE               ICON                    "quote.ico"
+IDI_SAVE                ICON                    "file.ico"
+IDI_SEND                ICON                    "check.ico"
+IDI_USERMENU            ICON                    "info.ico"
+IDI_MSGERROR            ICON                    "block.ico"
+IDI_CLOSEMSGDLG         ICON                    "delete.ico"
+IDI_CLOCK               ICON                    "clock.ico"
+IDI_ICONIN              ICON                    "Incom.ico"
+IDI_ICONOUT             ICON                    "outg.ico"
+IDI_SMILEYICON          ICON                    "emoticon.ico"
+IDI_SELFTYPING_ON       ICON                    "mtn.ico"
+IDI_SELFTYPING_OFF      ICON                    "nomtn.ico"
+IDI_CONTAINER           ICON                    "message.ico"
+IDI_SECUREIM_ENABLED    ICON                    "secureOn.ico"
+IDI_SECUREIM_DISABLED   ICON                    "secureOff.ico"
+IDI_STATUSCHANGE        ICON                    "Status change.ico"
+IDI_FONTBOLD            ICON                    "bold.ico"
+IDI_FONTITALIC          ICON                    "italic.ico"
+IDI_FONTUNDERLINE       ICON                    "underline.ico"
+IDI_STRIKEOUT           ICON                    "strike.ico"
+IDI_FONTFACE            ICON                    "font.ico"
+IDI_FONTCOLOR           ICON                    "font2.ico"
+IDI_SOUNDSON            ICON                    "sounds_on.ico"
+IDI_SESSIONLIST         ICON                    "slist.ico"
+IDI_CONFIGSIDEBAR       ICON                    "sbaroptions.ico"
+IDI_RECENTLIST          ICON                    "recentlist.ico"
+IDI_USERPREFS           ICON                    "userprefs.ico"
+IDI_SECURE              ICON                    "unverified.ico"
+IDI_STRONG              ICON                    "private.ico"
+
+IDI_TOPICBUT            ICON                    "chat\\topicbut.ico"
+IDI_JOIN                ICON                    "chat\\join.ico"
+IDI_TOPIC               ICON                    "chat\\topic.ico"
+IDI_ADDSTATUS           ICON                    "chat\\addmode.ico"
+IDI_INFO                ICON                    "chat\\info.ico"
+IDI_KICK                ICON                    "chat\\kick.ico"
+IDI_MESSAGE             ICON                    "chat\\message.ico"
+IDI_NICK                ICON                    "chat\\nick.ico"
+IDI_NOTICE              ICON                    "chat\\notice.ico"
+IDI_PART                ICON                    "chat\\part.ico"
+IDI_QUIT                ICON                    "chat\\quit.ico"
+IDI_REMSTATUS           ICON                    "chat\\removestatus.ico"
+IDI_HIGHLIGHT           ICON                    "chat\\highlight.ico"
+IDI_MESSAGEOUT          ICON                    "chat\\messageout.ico"
+IDI_ACTION              ICON                    "chat\\action.ico"
+IDI_BKGCOLOR            ICON                    "chat\\bkgcolor.ico"
+IDI_CHANMGR             ICON                    "chat\\window.ico"
+IDI_FILTER              ICON                    "chat\\filter.ico"
+IDI_BLANK               ICON                    "chat\\blank.ico"
+IDI_STATUS0             ICON                    "chat\\blank.ico"
+IDI_OVERLAY             ICON                    "chat\\overlay.ico"
+IDI_FILTER2             ICON                    "chat\\filter2.ico"
+IDI_SHOWNICKLIST        ICON                    "chat\\nicklist_show.ico"
+IDI_HIDENICKLIST        ICON                    "chat\\nicklist_hide.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_UNKNOWNAVATAR       BITMAP                  "unknown.bmp"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // German (Germany) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// German (Austria) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)
+#ifdef _WIN32
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_IDENTIFY            "__tabSRMM_ICONPACK 5.0__"
+END
+
+#endif    // German (Austria) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Incom.ico b/plugins/TabSRMM/TabSRMM_icons/res/Incom.ico
index e9602dba5d..e9602dba5d 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Incom.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/Incom.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Outg.ico b/plugins/TabSRMM/TabSRMM_icons/res/Outg.ico
index 83c8e296e5..83c8e296e5 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Outg.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/Outg.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Status change.ico b/plugins/TabSRMM/TabSRMM_icons/res/Status change.ico
index feadf04bf2..feadf04bf2 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Status change.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/Status change.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Version.rc b/plugins/TabSRMM/TabSRMM_icons/res/Version.rc
index 226f55c57f..6ebebfd41c 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Version.rc
+++ b/plugins/TabSRMM/TabSRMM_icons/res/Version.rc
@@ -1,38 +1,38 @@
-// Microsoft Visual C++ generated resource script.

-//

-#ifdef APSTUDIO_INVOKED

-#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-#include "afxres.h"

-#include "..\..\version.h"

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION __FILEVERSION_STRING

- PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x0L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "FileDescription", __DESCRIPTION

-            VALUE "InternalName", __PLUGIN_NAME

-            VALUE "LegalCopyright", __COPYRIGHT

-            VALUE "OriginalFilename", __FILENAME

-            VALUE "ProductName", __PLUGIN_NAME

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "winres.h"
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/block.ico b/plugins/TabSRMM/TabSRMM_icons/res/block.ico
index 890d4ebbac..890d4ebbac 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/block.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/block.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/bold.ico b/plugins/TabSRMM/TabSRMM_icons/res/bold.ico
index 63810159f9..63810159f9 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/bold.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/bold.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/Bkgcolor.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/Bkgcolor.ico
index 8ff040dd1b..8ff040dd1b 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/Bkgcolor.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/Bkgcolor.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/action.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/action.ico
index ec7694b075..ec7694b075 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/action.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/action.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/addmode.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/addmode.ico
index fcfa03a6ad..fcfa03a6ad 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/addmode.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/addmode.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/blank.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/blank.ico
index d8a5b3d80d..d8a5b3d80d 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/blank.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/blank.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/filter.ico
index a2edc9e60c..a2edc9e60c 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/filter.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter2.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/filter2.ico
index 3adc966a6c..3adc966a6c 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/filter2.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/highlight.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/highlight.ico
index 850afb2f46..850afb2f46 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/highlight.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/highlight.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/history.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/history.ico
index ae8a25059f..ae8a25059f 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/history.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/history.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/info.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/info.ico
index 419bb1adb5..419bb1adb5 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/info.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/info.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/join.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/join.ico
index 1b6176d0ad..1b6176d0ad 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/join.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/join.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/kick.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/kick.ico
index f8dee5c356..f8dee5c356 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/kick.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/kick.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/message.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/message.ico
index 7d98eb94e3..7d98eb94e3 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/message.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/message.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/messageout.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/messageout.ico
index 83c8e296e5..83c8e296e5 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/messageout.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/messageout.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nick.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/nick.ico
index 27d9fea978..27d9fea978 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nick.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/nick.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_hide.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/nicklist_hide.ico
index 460e7890a2..460e7890a2 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_hide.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/nicklist_hide.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_show.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/nicklist_show.ico
index 236787629b..236787629b 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_show.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/nicklist_show.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/notice.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/notice.ico
index 7cb1691367..7cb1691367 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/notice.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/notice.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/overlay.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/overlay.ico
index dc9738d792..dc9738d792 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/overlay.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/overlay.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/part.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/part.ico
index 5d6e5b90df..5d6e5b90df 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/part.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/part.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/quit.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/quit.ico
index febcbecb96..febcbecb96 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/quit.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/quit.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/removestatus.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/removestatus.ico
index b772f6a9c6..b772f6a9c6 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/removestatus.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/removestatus.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topic.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/topic.ico
index 7d7fe6d402..7d7fe6d402 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topic.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/topic.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topicbut.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/topicbut.ico
index 7c6b07c71a..7c6b07c71a 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topicbut.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/topicbut.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/window.ico b/plugins/TabSRMM/TabSRMM_icons/res/chat/window.ico
index 5f06f02312..5f06f02312 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/window.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/chat/window.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/check.ico b/plugins/TabSRMM/TabSRMM_icons/res/check.ico
index 0990087336..0990087336 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/check.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/check.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/clock.ico b/plugins/TabSRMM/TabSRMM_icons/res/clock.ico
index 082058308f..082058308f 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/clock.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/clock.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/delete.ico b/plugins/TabSRMM/TabSRMM_icons/res/delete.ico
index 086b3574e7..086b3574e7 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/delete.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/delete.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/emoticon.ico b/plugins/TabSRMM/TabSRMM_icons/res/emoticon.ico
index 1062805741..1062805741 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/emoticon.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/emoticon.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/file.ico b/plugins/TabSRMM/TabSRMM_icons/res/file.ico
index df5cd0f6c7..df5cd0f6c7 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/file.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/file.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/font.ico b/plugins/TabSRMM/TabSRMM_icons/res/font.ico
index 9b8e575ade..9b8e575ade 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/font.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/font.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/history.ico b/plugins/TabSRMM/TabSRMM_icons/res/history.ico
index 10bbd7aaf7..10bbd7aaf7 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/history.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/history.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/imgopen.ico b/plugins/TabSRMM/TabSRMM_icons/res/imgopen.ico
index a3cf43b4a0..a3cf43b4a0 100644
--- a/plugins/TabSRMM/TabSRMM_icons/imgopen.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/imgopen.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/info.ico b/plugins/TabSRMM/TabSRMM_icons/res/info.ico
index 2056f57798..2056f57798 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/info.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/info.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/italic.ico b/plugins/TabSRMM/TabSRMM_icons/res/italic.ico
index 42d3fea61b..42d3fea61b 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/italic.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/italic.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/leftarrow.ico b/plugins/TabSRMM/TabSRMM_icons/res/leftarrow.ico
index 18549d2bdd..18549d2bdd 100644
--- a/plugins/TabSRMM/TabSRMM_icons/leftarrow.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/leftarrow.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/messAnim/M1.ico b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M1.ico
index fad2149418..fad2149418 100644
--- a/plugins/TabSRMM/TabSRMM_icons/messAnim/M1.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M1.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/messAnim/M2.ico b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M2.ico
index 8b814ce568..8b814ce568 100644
--- a/plugins/TabSRMM/TabSRMM_icons/messAnim/M2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M2.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/messAnim/M3.ico b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M3.ico
index 2121d5bc25..2121d5bc25 100644
--- a/plugins/TabSRMM/TabSRMM_icons/messAnim/M3.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M3.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/messAnim/M4.ico b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M4.ico
index 5864f47948..5864f47948 100644
--- a/plugins/TabSRMM/TabSRMM_icons/messAnim/M4.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/messAnim/M4.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/message.ico b/plugins/TabSRMM/TabSRMM_icons/res/message.ico
index 956c8b6b2d..956c8b6b2d 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/message.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/message.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/mtn.ico b/plugins/TabSRMM/TabSRMM_icons/res/mtn.ico
index b1ed50b9b6..b1ed50b9b6 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/mtn.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/mtn.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/multisend.ico b/plugins/TabSRMM/TabSRMM_icons/res/multisend.ico
index 4b7f9c90fc..4b7f9c90fc 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/multisend.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/multisend.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/nomtn.ico b/plugins/TabSRMM/TabSRMM_icons/res/nomtn.ico
index 09fda5ef0c..09fda5ef0c 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/nomtn.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/nomtn.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/options.ico b/plugins/TabSRMM/TabSRMM_icons/res/options.ico
index 7c6b07c71a..7c6b07c71a 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/options.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/options.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/pencil.ico b/plugins/TabSRMM/TabSRMM_icons/res/pencil.ico
index f3005229da..f3005229da 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/pencil.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/pencil.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/plus.ico b/plugins/TabSRMM/TabSRMM_icons/res/plus.ico
index fcfa03a6ad..fcfa03a6ad 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/plus.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/plus.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/private.ico b/plugins/TabSRMM/TabSRMM_icons/res/private.ico
index ff23d39b5f..ff23d39b5f 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/private.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/private.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/pulldown.ico b/plugins/TabSRMM/TabSRMM_icons/res/pulldown.ico
index 372482f6c1..372482f6c1 100644
--- a/plugins/TabSRMM/TabSRMM_icons/pulldown.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/pulldown.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/pullup.ico b/plugins/TabSRMM/TabSRMM_icons/res/pullup.ico
index 735916cca1..735916cca1 100644
--- a/plugins/TabSRMM/TabSRMM_icons/pullup.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/pullup.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/quote.ico b/plugins/TabSRMM/TabSRMM_icons/res/quote.ico
index fe725de468..fe725de468 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/quote.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/quote.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/recentlist.ico b/plugins/TabSRMM/TabSRMM_icons/res/recentlist.ico
index 06db21a127..06db21a127 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/recentlist.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/recentlist.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/resource.h b/plugins/TabSRMM/TabSRMM_icons/res/resource.h
index 77c3886dd3..90ee8bfbea 100644
--- a/plugins/TabSRMM/TabSRMM_icons/resource.h
+++ b/plugins/TabSRMM/TabSRMM_icons/res/resource.h
@@ -1,120 +1,119 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by ICONSXP.rc

-//

-

-// standard toolbar icons

-

-#define IDI_HISTORY         1           /* history button */

-#define IDI_MSGLOGOPT       2           /* message log options */

-#define IDI_ADDCONTACT      3           /* add contact symbol (not a button anymore) */

-#define IDI_MULTISEND       4           /* multisend (not a button anymore, symbol still needed) */

-#define IDI_TYPING          5           /* typing notify icon in the statusbar */

-#define IDI_QUOTE           6           /* quote button */

-#define IDI_SAVE            7           /* close tab (with non-empty message area) */

-#define IDI_SEND            8           /* send button */

-#define IDI_CONTACTPIC      9           /* avatar button */

-#define IDI_CLOSEMSGDLG     10          /* close tab (when message area is empty) */

-#define IDI_USERMENU        11          /* user menu pulldown */

-#define IDI_CLOCK           12          /* clock for infobar */

-

-// extended toolbar icons (formatting, etc..)

-

-#define IDI_SMILEYICON      50          /* smiley button fallback */

-#define IDI_FONTBOLD        51          /* bold */

-#define IDI_FONTITALIC      52          /* italic */

-#define IDI_FONTUNDERLINE   53          /* underline */

-#define IDI_FONTFACE        54          /* font face (currently not in use) */

-#define IDI_FONTCOLOR       55          /* font color (not in use yet) */

-#define IDI_STRIKEOUT       56          /* strikedout */

-

-//Message log events

-

-#define IDI_ICONIN          110         /* incoming message icon */

-#define IDI_ICONOUT         111         /* outgoing message icon */

-#define IDI_STATUSCHANGE    112         /* status changes */

-#define IDI_MSGERROR        113         /* error message */

-#define IDI_SECURE          114         /* secure message */

-#define IDI_STRONG          115         /* strongly secure message */

-

- // misc icons, status bar etc.

-           

-#define IDI_SELFTYPING_ON     130       /* sending typing notify is on */

-#define IDI_SELFTYPING_OFF    131       /* sending typing notify is off */

-#define IDI_SECUREIM_ENABLED  132       /* connection is secured via secureim */

-#define IDI_SECUREIM_DISABLED 133       /* connection is not secured */

-#define IDI_SOUNDSON          134       /* msg window sounds are enabled */

-

-#define IDI_CONTAINER       136         /* static container icon */

-

-#define IDI_IMGTAG          138         /* image tag button */

-#define IDI_RECENTLIST      139         /* recent contact list */

-#define IDI_CONFIGSIDEBAR   140         /* sidebar config */

-#define IDI_USERPREFS       141         /* user preferences */

-

-/* arrows */

-

-#define IDI_PULLDOWNARROW   160

-#define IDI_LEFTARROW       161

-#define IDI_PULLUPARROW     162

-#define IDI_RIGHTARROW      163

-

-

-// reserved icons

-

-#define IDI_EMPTY           170

-#define IDI_IMAGETAG        171

-

-#define IDI_TRAYANIM1       190

-#define IDI_TRAYANIM2       191

-#define IDI_TRAYANIM3       192

-#define IDI_TRAYANIM4       193

-

-// chat misc

-

-#define IDI_TOPICBUT                    200

-#define IDI_BKGCOLOR                    201

-#define IDI_CHANMGR                     202

-#define IDI_FILTER                      203

-#define IDI_FILTER2                     204

-#define IDI_OVERLAY                     205

-#define IDI_BLANK                       212

-#define IDI_SHOWNICKLIST                213

-#define IDI_HIDENICKLIST                214

-

-// chat log

-

-#define IDI_JOIN                        250

-#define IDI_PART                        251

-#define IDI_QUIT                        252

-#define IDI_KICK                        253

-#define IDI_NICK                        254

-#define IDI_NOTICE                      255

-#define IDI_MESSAGE                     256

-#define IDI_MESSAGEOUT                  257

-#define IDI_TOPIC                       258

-#define IDI_INFO                        259

-#define IDI_ADDSTATUS                   260

-#define IDI_REMSTATUS                   261

-#define IDI_ACTION                      262

-#define IDI_HIGHLIGHT                   263

-

-

-

-// non icon related

-// 

-

-#define IDB_UNKNOWNAVATAR               100

-#define IDS_IDENTIFY                    101         /* id string resource */

-

-                                     

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        102

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1001

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by ICONSXP.rc
+//
+
+// standard toolbar icons
+
+#define IDI_HISTORY          1          /* history button */
+#define IDI_MSGLOGOPT        2          /* message log options */
+#define IDI_ADDCONTACT       3          /* add contact symbol (not a button anymore) */
+#define IDI_MULTISEND        4          /* multisend (not a button anymore, symbol still needed) */
+#define IDI_TYPING           5          /* typing notify icon in the statusbar */
+#define IDI_QUOTE            6          /* quote button */
+#define IDI_SAVE             7          /* close tab (with non-empty message area) */
+#define IDI_SEND             8          /* send button */
+#define IDI_CLOSEMSGDLG      9          /* close tab (when message area is empty) */
+#define IDI_USERMENU        10          /* user menu pulldown */
+#define IDI_CLOCK           11          /* clock for infobar */
+
+// extended toolbar icons (formatting, etc..)
+
+#define IDI_SMILEYICON      50          /* smiley button fallback */
+#define IDI_FONTBOLD        51          /* bold */
+#define IDI_FONTITALIC      52          /* italic */
+#define IDI_FONTUNDERLINE   53          /* underline */
+#define IDI_FONTFACE        54          /* font face (currently not in use) */
+#define IDI_FONTCOLOR       55          /* font color (not in use yet) */
+#define IDI_STRIKEOUT       56          /* strikedout */
+
+//Message log events
+
+#define IDI_ICONIN          110         /* incoming message icon */
+#define IDI_ICONOUT         111         /* outgoing message icon */
+#define IDI_STATUSCHANGE    112         /* status changes */
+#define IDI_MSGERROR        113         /* error message */
+#define IDI_SECURE          114         /* secure message */
+#define IDI_STRONG          115         /* strongly secure message */
+
+ // misc icons, status bar etc.
+           
+#define IDI_SELFTYPING_ON     130       /* sending typing notify is on */
+#define IDI_SELFTYPING_OFF    131       /* sending typing notify is off */
+#define IDI_SECUREIM_ENABLED  132       /* connection is secured via secureim */
+#define IDI_SECUREIM_DISABLED 133       /* connection is not secured */
+#define IDI_SOUNDSON          134       /* msg window sounds are enabled */
+
+#define IDI_CONTAINER       136         /* static container icon */
+
+#define IDI_IMGTAG          138         /* image tag button */
+#define IDI_RECENTLIST      139         /* recent contact list */
+#define IDI_CONFIGSIDEBAR   140         /* sidebar config */
+#define IDI_USERPREFS       141         /* user preferences */
+
+/* arrows */
+
+#define IDI_PULLDOWNARROW   160
+#define IDI_LEFTARROW       161
+#define IDI_PULLUPARROW     162
+#define IDI_RIGHTARROW      163
+
+
+// reserved icons
+
+#define IDI_EMPTY           170
+#define IDI_IMAGETAG        171
+
+#define IDI_TRAYANIM1       190
+#define IDI_TRAYANIM2       191
+#define IDI_TRAYANIM3       192
+#define IDI_TRAYANIM4       193
+
+// chat misc
+
+#define IDI_TOPICBUT                    200
+#define IDI_BKGCOLOR                    201
+#define IDI_CHANMGR                     202
+#define IDI_FILTER                      203
+#define IDI_FILTER2                     204
+#define IDI_OVERLAY                     205
+#define IDI_BLANK                       212
+#define IDI_SHOWNICKLIST                213
+#define IDI_HIDENICKLIST                214
+
+// chat log
+
+#define IDI_JOIN                        250
+#define IDI_PART                        251
+#define IDI_QUIT                        252
+#define IDI_KICK                        253
+#define IDI_NICK                        254
+#define IDI_NOTICE                      255
+#define IDI_MESSAGE                     256
+#define IDI_MESSAGEOUT                  257
+#define IDI_TOPIC                       258
+#define IDI_INFO                        259
+#define IDI_ADDSTATUS                   260
+#define IDI_REMSTATUS                   261
+#define IDI_ACTION                      262
+#define IDI_HIGHLIGHT                   263
+
+
+
+// non icon related
+// 
+
+#define IDB_UNKNOWNAVATAR               100
+#define IDS_IDENTIFY                    101         /* id string resource */
+
+                                     
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/plugins/TabSRMM/TabSRMM_icons/rightarrow.ico b/plugins/TabSRMM/TabSRMM_icons/res/rightarrow.ico
index 5762b154c0..5762b154c0 100644
--- a/plugins/TabSRMM/TabSRMM_icons/rightarrow.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/rightarrow.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sbaroptions.ico b/plugins/TabSRMM/TabSRMM_icons/res/sbaroptions.ico
index f2a78a0a4c..f2a78a0a4c 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sbaroptions.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/sbaroptions.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureOff.ico b/plugins/TabSRMM/TabSRMM_icons/res/secureOff.ico
index 142c601313..142c601313 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureOff.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/secureOff.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureon.ico b/plugins/TabSRMM/TabSRMM_icons/res/secureon.ico
index 038700d73a..038700d73a 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureon.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/secureon.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/slist.ico b/plugins/TabSRMM/TabSRMM_icons/res/slist.ico
index fc4bf7251b..fc4bf7251b 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/slist.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/slist.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_off.ico b/plugins/TabSRMM/TabSRMM_icons/res/sounds_off.ico
index 4a7b14453d..4a7b14453d 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_off.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/sounds_off.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_on.ico b/plugins/TabSRMM/TabSRMM_icons/res/sounds_on.ico
index da7a3a639e..da7a3a639e 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_on.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/sounds_on.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/strike.ico b/plugins/TabSRMM/TabSRMM_icons/res/strike.ico
index 6cd770f384..6cd770f384 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/strike.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/strike.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/underline.ico b/plugins/TabSRMM/TabSRMM_icons/res/underline.ico
index 646d58456d..646d58456d 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/underline.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/underline.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/unknown.bmp b/plugins/TabSRMM/TabSRMM_icons/res/unknown.bmp
index 96bdb0fd83..96bdb0fd83 100644
--- a/plugins/TabSRMM/TabSRMM_icons/unknown.bmp
+++ b/plugins/TabSRMM/TabSRMM_icons/res/unknown.bmp
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/unverified.ico b/plugins/TabSRMM/TabSRMM_icons/res/unverified.ico
index 0595776a28..0595776a28 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/unverified.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/unverified.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/userprefs.ico b/plugins/TabSRMM/TabSRMM_icons/res/userprefs.ico
index a59b2b659a..a59b2b659a 100644
--- a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/userprefs.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/res/userprefs.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/res/version.h b/plugins/TabSRMM/TabSRMM_icons/res/version.h
new file mode 100644
index 0000000000..cadc98ee25
--- /dev/null
+++ b/plugins/TabSRMM/TabSRMM_icons/res/version.h
@@ -0,0 +1,11 @@
+#define __MAJOR_VERSION          3
+#define __MINOR_VERSION          1
+#define __RELEASE_NUM            99
+#define __BUILD_NUM              9
+
+#include <stdver.h>
+
+#define __PLUGIN_NAME            "TabSRMM icons"
+#define __FILENAME               "TabSRMM_icons.dll"
+#define __DESCRIPTION            "Iconpack for TabSRMM plugin of Miranda NG."
+#define __COPYRIGHT              "© 2012-24 Miranda NG team, 2000-2010 Miranda Project and contributors."
diff --git a/plugins/TabSRMM/TabSRMM_icons/version.h b/plugins/TabSRMM/TabSRMM_icons/version.h
deleted file mode 100644
index 76917772f2..0000000000
--- a/plugins/TabSRMM/TabSRMM_icons/version.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __MAJOR_VERSION            3

-#define __MINOR_VERSION            1

-#define __RELEASE_NUM            99

-#define __BUILD_NUM               8

-

-#include <stdver.h>

-

-#define __PLUGIN_NAME            "TabSRMM icons"

-#define __FILENAME               "TabSRMM_icons.dll"

-#define __DESCRIPTION             "Iconpack for TabSRMM plugin of Miranda NG."

-#define __COPYRIGHT               "© 2012-24 Miranda NG team, 2000-2010 Miranda Project and contributors."

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 6e52d30c82..28bb14993e 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -80,13 +80,6 @@ static int CB_InitDefaultButtons(WPARAM, LPARAM)
 	bbd.pwszTooltip = LPGENW("View user's history");
 	g_plugin.addButton(&bbd);
 
-	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID | BBBF_NOREADONLY;
-	bbd.dwButtonID = IDC_PIC;
-	bbd.dwDefPos = 60;
-	bbd.hIcon = g_plugin.getIconHandle(IDI_CONTACTPIC);
-	bbd.pwszTooltip = LPGENW("Edit user notes");
-	g_plugin.addButton(&bbd);
-
 	// chat buttons
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISSEPARATOR;
 	bbd.dwButtonID = 1;
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index b2b14ad76b..8e743779e3 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -375,47 +375,6 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara
 		SendMessage(m_pContainer->m_hwnd, WM_COMMAND, IDC_TOGGLESIDEBAR, 0);

 		break;

 

-	case IDC_PIC:

-		GetClientRect(m_hwnd, &rc);

-

-		m_bEditNotesActive = !m_bEditNotesActive;

-		if (m_bEditNotesActive) {

-			int iLen = GetWindowTextLength(m_message.GetHwnd());

-			if (iLen != 0) {

-				ActivateTooltip(IDC_SRMM_MESSAGE, TranslateT("You cannot edit user notes when there are unsent messages"));

-				m_bEditNotesActive = false;

-				break;

-			}

-

-			if (!m_bIsAutosizingInput) {

-				m_iSplitterSaved = m_iSplitterY;

-				m_iSplitterY = rc.bottom / 2;

-				Resize();

-			}

-

-			ptrW wszText(db_get_wsa(m_hContact, "UserInfo", "MyNotes"));

-			if (wszText != nullptr)

-				m_message.SetText(wszText);

-		}

-		else {

-			ptrW buf(m_message.GetText());

-			db_set_ws(m_hContact, "UserInfo", "MyNotes", buf);

-			m_message.SetText(L"");

-

-			if (!m_bIsAutosizingInput) {

-				m_iSplitterY = m_iSplitterSaved;

-				Resize();

-				DM_ScrollToBottom(0, 1);

-			}

-		}

-		SetWindowPos(m_message.GetHwnd(), nullptr, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_FRAMECHANGED | SWP_NOZORDER |

-			SWP_NOMOVE | SWP_NOSIZE | SWP_NOCOPYBITS);

-		RedrawWindow(m_hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_UPDATENOW | RDW_ALLCHILDREN);

-

-		if (m_bEditNotesActive)

-			CWarning::show(CWarning::WARN_EDITUSERNOTES, MB_OK | MB_ICONINFORMATION);

-		break;

-

 	case IDM_CLEAR:

 		tabClearLog();

 		break;

@@ -776,7 +735,7 @@ void CMsgDialog::DM_NotifyTyping(int mode)
 	MCONTACT hContact = m_cache->getActiveContact();

 

 	// editing user notes or preparing a message for queued delivery -> don't send MTN

-	if (m_bEditNotesActive || (m_sendMode & SMODE_SENDLATER))

+	if (m_sendMode & SMODE_SENDLATER)

 		return;

 

 	// allow supression of sending out TN for the contact (NOTE: for metacontacts, do NOT use the subcontact handle)

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index b5107c48ad..c7caef5c92 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -59,7 +59,6 @@ static HOTKEYDESC _hotkeydescs[] = {
 	{ "tabsrmm_rtl", LPGEN("Toggle text direction"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_ALT | HOTKEYF_CONTROL, 'B'), 0, TABSRMM_HK_TOGGLERTL },

 	{ "tabsrmm_msend", LPGEN("Toggle multi send"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_ALT | HOTKEYF_CONTROL, 'M'), 0, TABSRMM_HK_TOGGLEMULTISEND },

 	{ "tabsrmm_clearlog", LPGEN("Clear message log"), TABSRMM_HK_SECTION_GENERIC, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'L'), 0, TABSRMM_HK_CLEARLOG },

-	{ "tabsrmm_notes", LPGEN("Edit user notes"), TABSRMM_HK_SECTION_IM, nullptr, HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_CONTROL, 'N'), 0, TABSRMM_HK_EDITNOTES },

 	{ "tabsrmm_sbar", LPGEN("Collapse side bar"), TABSRMM_HK_SECTION_GENERIC, nullptr, HOTKEYCODE(0, VK_F9), 0, TABSRMM_HK_TOGGLESIDEBAR },

 	{ "tabsrmm_muc_cmgr", LPGEN("Channel manager"), TABSRMM_HK_SECTION_GC, nullptr, HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_CONTROL, 'C'), 0, TABSRMM_HK_CHANNELMGR },

 	{ "tabsrmm_muc_filter", LPGEN("Toggle filter"), TABSRMM_HK_SECTION_GC, nullptr, HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_CONTROL, 'F'), 0, TABSRMM_HK_FILTERTOGGLE },

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 4a92e29a35..8cd71399bb 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -703,15 +703,12 @@ void CMsgDialog::OnDestroy()
 	}

 

 	if (m_cache->isValid()) { // not valid means the contact was deleted

-		if (!m_bEditNotesActive) {

-			char *msg = m_message.GetRichTextRtf(true);

-			if (msg) {

-				g_plugin.setUString(m_hContact, "SavedMsg", msg);

-				mir_free(msg);

-			}

-			else g_plugin.delSetting(m_hContact, "SavedMsg");

+		char *msg = m_message.GetRichTextRtf(true);

+		if (msg) {

+			g_plugin.setUString(m_hContact, "SavedMsg", msg);

+			mir_free(msg);

 		}

-		else SendMessage(m_hwnd, WM_COMMAND, IDC_PIC, 0);

+		else g_plugin.delSetting(m_hContact, "SavedMsg");

 	}

 

 	if (AllowTyping())

@@ -768,11 +765,6 @@ void CMsgDialog::OnDestroy()
 

 void CMsgDialog::onClick_Ok(CCtrlButton *)

 {

-	if (m_bEditNotesActive) {

-		ActivateTooltip(IDC_PIC, TranslateT("You are editing the user notes. Click the button again or use the hotkey (default: Alt+N) to save the notes and return to normal messaging mode"));

-		return;

-	}

-

 	int final_sendformat;

 

 	if (!isChat()) {

@@ -1497,9 +1489,6 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 		case TABSRMM_HK_USERDETAILS:

 			SendMessage(m_hwnd, WM_COMMAND, MAKELONG(IDC_NAME, BN_CLICKED), 0);

 			return _dlgReturn(m_hwnd, 1);

-		case TABSRMM_HK_EDITNOTES:

-			PostMessage(m_hwnd, WM_COMMAND, MAKELONG(IDC_PIC, BN_CLICKED), 0);

-			return _dlgReturn(m_hwnd, 1);

 		case TABSRMM_HK_TOGGLESENDLATER:

 			if (SendLater::Avail) {

 				m_sendMode ^= SMODE_SENDLATER;

@@ -1901,9 +1890,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 			replaceStrW(m_wszSearchResult, nullptr);

 		}

 

-		if (wParam == VK_RETURN && m_bEditNotesActive)

-			break;

-

 		if (isCtrl && !isAlt && !isShift) {

 			if (wParam == VK_UP || wParam == VK_DOWN) {          // input history scrolling (ctrl-up / down)

 				m_cache->inputHistoryEvent(wParam);

@@ -2103,7 +2089,6 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			if (CSkin::m_skinEnabled) {

 				UINT item_ids[] = { ID_EXTBKUSERLIST, ID_EXTBKHISTORY, ID_EXTBKINPUTAREA };

 				UINT ctl_ids[] = { IDC_SRMM_NICKLIST, IDC_SRMM_LOG, IDC_SRMM_MESSAGE };

-				BOOL isEditNotesReason = m_bEditNotesActive;

 				BOOL isSendLaterReason = (m_sendMode & SMODE_SENDLATER);

 				BOOL isMultipleReason = (m_sendMode & SMODE_MULTIPLE || m_sendMode & SMODE_CONTAINER);

 

@@ -2120,8 +2105,8 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 						rc.top = pt.y - item->MARGIN_TOP;

 						rc.right = rc.left + item->MARGIN_RIGHT + (rcWindow.right - rcWindow.left) + item->MARGIN_LEFT;

 						rc.bottom = rc.top + item->MARGIN_BOTTOM + (rcWindow.bottom - rcWindow.top) + item->MARGIN_TOP;

-						if (item_ids[i] == ID_EXTBKINPUTAREA && (isMultipleReason || isEditNotesReason || isSendLaterReason)) {

-							HBRUSH br = CreateSolidBrush(isMultipleReason ? RGB(255, 130, 130) : (isEditNotesReason ? RGB(80, 255, 80) : RGB(80, 80, 255)));

+						if (item_ids[i] == ID_EXTBKINPUTAREA && (isMultipleReason || isSendLaterReason)) {

+							HBRUSH br = CreateSolidBrush(isMultipleReason ? RGB(255, 130, 130) : RGB(80, 80, 255));

 							FillRect(hdcMem, &rc, br);

 							DeleteObject(br);

 						}

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index b7e1b1e781..e07e303291 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -527,7 +527,6 @@ void CMsgDialog::DrawNickList(USERINFO *ui, DRAWITEMSTRUCT *dis)
 void CMsgDialog::EnableSendButton(bool bMode) const

 {

 	SendDlgItemMessage(m_hwnd, IDOK, BUTTONSETASNORMAL, bMode, 0);

-	SendDlgItemMessage(m_hwnd, IDC_PIC, BUTTONSETASNORMAL, m_bEditNotesActive ? TRUE : (!bMode && m_iOpenJobs == 0) ? TRUE : FALSE, 0);

 

 	HWND hwndOK = GetDlgItem(GetParent(GetParent(m_hwnd)), IDOK);

 	if (IsWindow(hwndOK))

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index a5b9216a9e..c50ca4d251 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -436,7 +436,6 @@ static TIconDesc _toolbaricons[] =
 	{ "tabSRMM_mlog", LPGEN("Message Log options"), 0, -IDI_MSGLOGOPT, 1 }, // 2

 	{ "tabSRMM_multi", LPGEN("Image tag"), 0, -IDI_IMAGETAG, 1 },

 	{ "tabSRMM_quote", LPGEN("Quote text"), 0, -IDI_QUOTE, 1 },

-	{ "tabSRMM_avatar", LPGEN("Edit user notes"), 0, -IDI_CONTACTPIC, 1 },

 	{ "tabSRMM_save", LPGEN("Save and close"), &PluginConfig.g_buttonBarIcons[ICON_BUTTON_SAVE], -IDI_SAVE, 1 },

 	{ "tabSRMM_send", LPGEN("Send message"), &PluginConfig.g_buttonBarIcons[ICON_BUTTON_SEND], -IDI_SEND, 1 },

 	{ "tabSRMM_close", LPGEN("Close"), &PluginConfig.g_buttonBarIcons[ICON_BUTTON_CANCEL], -IDI_CLOSEMSGDLG, 1 }

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index d7e7d01bae..5e6aefbe58 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -498,7 +498,6 @@ public:
 	bool     m_bActualHistory;

 	bool     m_bIsAutosizingInput;

 	bool     m_bCanFlashTab, m_bTabFlash;

-	bool     m_bEditNotesActive;

 	bool     m_bShowAvatar;

 	bool     m_bSaveBtn, m_bNeedCheckSize;

 	bool     m_bForcedClose;

@@ -879,7 +878,7 @@ struct TIconDescW
 #define HOTKEY_MODIFIERS_CTRLALT 1

 #define HOTKEY_MODIFIERS_ALTSHIFT 2

 

-#include "../TabSRMM_icons/resource.h"         // icon pack values

+#include "../TabSRMM_icons/res/resource.h"         // icon pack values

 

 struct TCpTable {

 	UINT cpId;

@@ -997,16 +996,15 @@ struct SIDEBARITEM
 #define TABSRMM_HK_USERDETAILS      22

 #define TABSRMM_HK_TOGGLEINFOPANEL  23

 #define TABSRMM_HK_CLEARLOG         24

-#define TABSRMM_HK_EDITNOTES        25

-#define TABSRMM_HK_TOGGLESENDLATER  26

-#define TABSRMM_HK_TOGGLESIDEBAR    27

-#define TABSRMM_HK_CHANNELMGR       28

-#define TABSRMM_HK_FILTERTOGGLE     29

-#define TABSRMM_HK_LISTTOGGLE       30

-#define TABSRMM_HK_MUC_SHOWSERVER   31

-#define TABSRMM_HK_CLOSE_OTHER      32

-#define TABSRMM_HK_SENDMENU         33

-#define TABSRMM_HK_PROTOMENU        34

+#define TABSRMM_HK_TOGGLESENDLATER  25

+#define TABSRMM_HK_TOGGLESIDEBAR    26

+#define TABSRMM_HK_CHANNELMGR       27

+#define TABSRMM_HK_FILTERTOGGLE     28

+#define TABSRMM_HK_LISTTOGGLE       29

+#define TABSRMM_HK_MUC_SHOWSERVER   30

+#define TABSRMM_HK_CLOSE_OTHER      31

+#define TABSRMM_HK_SENDMENU         32

+#define TABSRMM_HK_PROTOMENU        33

 

 #define TABSRMM_HK_SECTION_IM LPGEN("Message windows - IM")

 #define TABSRMM_HK_SECTION_GENERIC LPGEN("Message windows - all")

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 714bcb4533..6482a1bb08 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -191,7 +191,6 @@
 #define IDC_DETAILS                     1100

 #define IDC_ADD                         1101

 #define IDC_RTL                         1103

-#define IDC_PIC                         1104

 #define IDC_CANCELADD                   1112

 #define IDC_FONTSTRIKEOUT               1113

 #define IDC_MATH_BKGCOLOUR              1124

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 007f675098..fa07af18e5 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -1957,8 +1957,7 @@ UINT CSkin::NcCalcRichEditFrame(HWND hwnd, const CMsgDialog *mwdat, UINT skinID,
 		ReleaseDC(GetParent(hwnd), hdc);

 		return (bReturn) ? WVR_REDRAW : orig;

 	}

-	if ((mwdat->m_sendMode & SMODE_MULTIPLE || mwdat->m_sendMode & SMODE_CONTAINER ||

-		mwdat->m_bEditNotesActive || mwdat->m_sendMode & SMODE_SENDLATER) && skinID == ID_EXTBKINPUTAREA) {

+	if ((mwdat->m_sendMode & (SMODE_MULTIPLE | SMODE_CONTAINER | SMODE_SENDLATER)) && skinID == ID_EXTBKINPUTAREA) {

 		InflateRect(&nccp->rgrc[0], -1, -1);

 		return WVR_REDRAW;

 	}

@@ -1976,7 +1975,6 @@ UINT CSkin::DrawRichEditFrame(HWND hwnd, const CMsgDialog *mwdat, UINT skinID, U
 	if (mwdat == nullptr)

 		return result;

 

-	BOOL isEditNotesReason = ((mwdat->m_bEditNotesActive) && (skinID == ID_EXTBKINPUTAREA));

 	BOOL isSendLaterReason = ((mwdat->m_sendMode & SMODE_SENDLATER) && (skinID == ID_EXTBKINPUTAREA));

 	BOOL isMultipleReason = ((skinID == ID_EXTBKINPUTAREA) && (mwdat->m_sendMode & SMODE_MULTIPLE || mwdat->m_sendMode & SMODE_CONTAINER));

 

@@ -2014,8 +2012,9 @@ UINT CSkin::DrawRichEditFrame(HWND hwnd, const CMsgDialog *mwdat, UINT skinID, U
 		ReleaseDC(hwnd, hdc);

 		return result;

 	}

-	if (isMultipleReason || isEditNotesReason || isSendLaterReason) {

-		HBRUSH br = CreateSolidBrush(isMultipleReason ? RGB(255, 130, 130) : (isEditNotesReason ? RGB(80, 255, 80) : RGB(80, 80, 255)));

+

+	if (isMultipleReason || isSendLaterReason) {

+		HBRUSH br = CreateSolidBrush(isMultipleReason ? RGB(255, 130, 130) : RGB(80, 80, 255));

 		FillRect(hdc, &rcWindow, br);

 		DeleteObject(br);

 	}

diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h
index 4337763eb3..628b5f8260 100644
--- a/plugins/TabSRMM/src/utils.h
+++ b/plugins/TabSRMM/src/utils.h
@@ -118,7 +118,6 @@ namespace CWarning
 	enum

 	{

 		WARN_SAVEFILE = 1,

-		WARN_EDITUSERNOTES,

 		WARN_ICONPACKMISSING,

 		WARN_AEROPEEK_SKIN,

 		WARN_SENDFILE,