diff --git a/src/webimtray/WebIMTray/Main.resx b/src/webimtray/WebIMTray/Main.resx
index c652c98f..1bdf3bd1 100644
--- a/src/webimtray/WebIMTray/Main.resx
+++ b/src/webimtray/WebIMTray/Main.resx
@@ -209,67 +209,21 @@
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAAAB
-        AAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwADA3MAA8MqmAAQE
-        BAAICAgADAwMABEREQAWFhYAHBwcACIiIgApKSkAVVVVAE1NTQBCQkIAOTk5AIB8/wBQUP8AkwDWAP/s
-        zADG1u8A1ufnAJCprQAAADMAAABmAAAAmQAAAMwAADMAAAAzMwAAM2YAADOZAAAzzAAAM/8AAGYAAABm
-        MwAAZmYAAGaZAABmzAAAZv8AAJkAAACZMwAAmWYAAJmZAACZzAAAmf8AAMwAAADMMwAAzGYAAMyZAADM
-        zAAAzP8AAP9mAAD/mQAA/8wAMwAAADMAMwAzAGYAMwCZADMAzAAzAP8AMzMAADMzMwAzM2YAMzOZADMz
-        zAAzM/8AM2YAADNmMwAzZmYAM2aZADNmzAAzZv8AM5kAADOZMwAzmWYAM5mZADOZzAAzmf8AM8wAADPM
-        MwAzzGYAM8yZADPMzAAzzP8AM/8zADP/ZgAz/5kAM//MADP//wBmAAAAZgAzAGYAZgBmAJkAZgDMAGYA
-        /wBmMwAAZjMzAGYzZgBmM5kAZjPMAGYz/wBmZgAAZmYzAGZmZgBmZpkAZmbMAGaZAABmmTMAZplmAGaZ
-        mQBmmcwAZpn/AGbMAABmzDMAZsyZAGbMzABmzP8AZv8AAGb/MwBm/5kAZv/MAMwA/wD/AMwAmZkAAJkz
-        mQCZAJkAmQDMAJkAAACZMzMAmQBmAJkzzACZAP8AmWYAAJlmMwCZM2YAmWaZAJlmzACZM/8AmZkzAJmZ
-        ZgCZmZkAmZnMAJmZ/wCZzAAAmcwzAGbMZgCZzJkAmczMAJnM/wCZ/wAAmf8zAJnMZgCZ/5kAmf/MAJn/
-        /wDMAAAAmQAzAMwAZgDMAJkAzADMAJkzAADMMzMAzDNmAMwzmQDMM8wAzDP/AMxmAADMZjMAmWZmAMxm
-        mQDMZswAmWb/AMyZAADMmTMAzJlmAMyZmQDMmcwAzJn/AMzMAADMzDMAzMxmAMzMmQDMzMwAzMz/AMz/
-        AADM/zMAmf9mAMz/mQDM/8wAzP//AMwAMwD/AGYA/wCZAMwzAAD/MzMA/zNmAP8zmQD/M8wA/zP/AP9m
-        AAD/ZjMAzGZmAP9mmQD/ZswAzGb/AP+ZAAD/mTMA/5lmAP+ZmQD/mcwA/5n/AP/MAAD/zDMA/8xmAP/M
-        mQD/zMwA/8z/AP//MwDM/2YA//+ZAP//zABmZv8AZv9mAGb//wD/ZmYA/2b/AP//ZgAhAKUAX19fAHd3
-        dwCGhoYAlpaWAMvLywCysrIA19fXAN3d3QDj4+MA6urqAPHx8QD4+PgA8Pv/AKSgoACAgIAAAAD/AAD/
-        AAAA//8A/wAAAP8A/wD//wAA////AAoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCouLi4uL
-        i4uLiwoKi4uLCgqLi4uLi4uLi4sKCouLiwoKra2Li4uLi4uLCgqLi4sKCgqtra2tra2tCgqtra0KCgoK
-        Cq2tra2tCgqtra0KCgoKCgoKra2tCgqtra0KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgrUs7MKCrOzswoK
-        CgoKCgrU1NTUswqzs7OzCgoKCgoK1NTU1NQKs7OzswoKCgoKCtTU1NTUCtTU1NQKCgoKCgoK1NTUCgrU
-        1NQKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr//wAA//8AAIAxAACAMQAAgDEAAMBj
-        AADgxwAA8Y8AAP//AADxjwAA4IcAAOCHAADghwAA8Y8AAP//AAD//wAAKAAAACAAAABAAAAAAQAIAAAA
-        AAAABAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAAwNzAAPDK
-        pgAEBAQACAgIAAwMDAAREREAFhYWABwcHAAiIiIAKSkpAFVVVQBNTU0AQkJCADk5OQCAfP8AUFD/AJMA
-        1gD/7MwAxtbvANbn5wCQqa0AAAAzAAAAZgAAAJkAAADMAAAzAAAAMzMAADNmAAAzmQAAM8wAADP/AABm
-        AAAAZjMAAGZmAABmmQAAZswAAGb/AACZAAAAmTMAAJlmAACZmQAAmcwAAJn/AADMAAAAzDMAAMxmAADM
-        mQAAzMwAAMz/AAD/ZgAA/5kAAP/MADMAAAAzADMAMwBmADMAmQAzAMwAMwD/ADMzAAAzMzMAMzNmADMz
-        mQAzM8wAMzP/ADNmAAAzZjMAM2ZmADNmmQAzZswAM2b/ADOZAAAzmTMAM5lmADOZmQAzmcwAM5n/ADPM
-        AAAzzDMAM8xmADPMmQAzzMwAM8z/ADP/MwAz/2YAM/+ZADP/zAAz//8AZgAAAGYAMwBmAGYAZgCZAGYA
-        zABmAP8AZjMAAGYzMwBmM2YAZjOZAGYzzABmM/8AZmYAAGZmMwBmZmYAZmaZAGZmzABmmQAAZpkzAGaZ
-        ZgBmmZkAZpnMAGaZ/wBmzAAAZswzAGbMmQBmzMwAZsz/AGb/AABm/zMAZv+ZAGb/zADMAP8A/wDMAJmZ
-        AACZM5kAmQCZAJkAzACZAAAAmTMzAJkAZgCZM8wAmQD/AJlmAACZZjMAmTNmAJlmmQCZZswAmTP/AJmZ
-        MwCZmWYAmZmZAJmZzACZmf8AmcwAAJnMMwBmzGYAmcyZAJnMzACZzP8Amf8AAJn/MwCZzGYAmf+ZAJn/
-        zACZ//8AzAAAAJkAMwDMAGYAzACZAMwAzACZMwAAzDMzAMwzZgDMM5kAzDPMAMwz/wDMZgAAzGYzAJlm
-        ZgDMZpkAzGbMAJlm/wDMmQAAzJkzAMyZZgDMmZkAzJnMAMyZ/wDMzAAAzMwzAMzMZgDMzJkAzMzMAMzM
-        /wDM/wAAzP8zAJn/ZgDM/5kAzP/MAMz//wDMADMA/wBmAP8AmQDMMwAA/zMzAP8zZgD/M5kA/zPMAP8z
-        /wD/ZgAA/2YzAMxmZgD/ZpkA/2bMAMxm/wD/mQAA/5kzAP+ZZgD/mZkA/5nMAP+Z/wD/zAAA/8wzAP/M
-        ZgD/zJkA/8zMAP/M/wD//zMAzP9mAP//mQD//8wAZmb/AGb/ZgBm//8A/2ZmAP9m/wD//2YAIQClAF9f
-        XwB3d3cAhoaGAJaWlgDLy8sAsrKyANfX1wDd3d0A4+PjAOrq6gDx8fEA+Pj4APD7/wCkoKAAgICAAAAA
-        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKi4uLi4uLi4uLCgoK
-        CgoKCgoKCouLi4uLi4uLiwoKCgCLi4uLi4uLi4sAAAAAAAAAAAAAi4uLi4uLi4uLCgoKAIuLi4uLi4uL
-        iwAAAAAAAAAAAACLi4uLi4uLi4sKCgoAAIuLi4uLi4sAAAAAAAAAAAAAAACtra2tra2tCgoKCgAAAK2t
-        ra2tAAAAAACtAACtAAAAAACtra2trQAKCgoKAAAAAK2trQAAAAAAra0AAK2tAAAAAACtra0AAAoKCgoA
-        AAAAAAAAAAAAAK2tra2tra2tAAAAAAAAAAAACgoKCgAAAACtra0AAACtra2tra2tra2tAAAAra2tAAAK
-        CgoKAAAAra2tra0AAACtra2tra2trQAAAK2tra2tAAoKCgoAAACzs7OzswAAAACzswAAs7MAAAAAs7Oz
-        s7MACgoKCgAAANTU1NSzAAAAAACzAACzAAAAAADU1NSzswAKCgoKAAAAANTU1AAAAAAAAAAAAAAAAAAA
-        AADU1NQAAAoKCgoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK
-        CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK////////////////////////////////////////
-        /////////////8Af+APAH/gDwB/4A+A//Afwfb4P+PmfH//wD//44Acf8HAOD/B5ng/wfb4P+P//H///
-        //////////////////////////////////////////////////8=
+        AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAktmIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAktmIktmIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACa3bcktmIktmIAAAAAAAAAAAAAAAAktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIk
+        tmIktmIktmIktmIAAAAktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIk
+        tmIktmIktmIktmIktmI4vHCq4sLp+O/2/Pn2/Pnn9+686c89vnQktmIktmIktmIktmIktmIktmIktmKD
+        1qbi9eqc3rlMw34ktmIktmJHwnuc3rnn9+6j4b0ktmIktmIktmIktmIktmKD1qaq4sIktmIktmIktmIk
+        tmIktmIktmIktmIktmKc3rmV3LMktmIktmIktmIktmI4vHAktmIktmJVx4RHwnsktmIktmI9vnRZx4gk
+        tmIktmIktmIktmIktmIktmIktmIktmIktmIquGb////y+/UktmIktmLt+fP///89vnQktmIktmIktmIk
+        tmIktmIktmIktmIktmIktmK258uD1qYktmIktmKH16m258sktmIktmIktmIktmIktmIktmIktmIktmIk
+        tmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIktmIAAAAktmIktmIktmIktmIktmIktmIk
+        tmIktmIktmIktmIktmIktmIktmIktmIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/3wAA/88AAP/H
+        AACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA//8AAP//AAD//wAA
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/webimtray/WebIMTray/App.ico b/src/webimtray/WebIMTray/icons/App.ico
similarity index 65%
rename from src/webimtray/WebIMTray/App.ico
rename to src/webimtray/WebIMTray/icons/App.ico
index 0dc5a4ef..1da8e383 100644
Binary files a/src/webimtray/WebIMTray/App.ico and b/src/webimtray/WebIMTray/icons/App.ico differ
diff --git a/src/webimtray/WebIMTray/icons/Notify.ico b/src/webimtray/WebIMTray/icons/Notify.ico
index 8246e11f..f042a878 100644
Binary files a/src/webimtray/WebIMTray/icons/Notify.ico and b/src/webimtray/WebIMTray/icons/Notify.ico differ
diff --git a/src/webimtray/WebIMTray/icons/Notify_offl.ico b/src/webimtray/WebIMTray/icons/Notify_offl.ico
index 62d27d8c..8e48733b 100644
Binary files a/src/webimtray/WebIMTray/icons/Notify_offl.ico and b/src/webimtray/WebIMTray/icons/Notify_offl.ico differ
diff --git a/src/webimtray/WebIMTray/webImTray.csproj b/src/webimtray/WebIMTray/webImTray.csproj
index 795ba9c4..309d4720 100644
--- a/src/webimtray/WebIMTray/webImTray.csproj
+++ b/src/webimtray/WebIMTray/webImTray.csproj
@@ -6,7 +6,7 @@
     <ProjectGuid>{21C7CA72-7F77-416C-9FD7-2DF748443E46}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>App.ico</ApplicationIcon>
+    <ApplicationIcon>icons\App.ico</ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>webImTray</AssemblyName>
@@ -90,9 +90,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="App.ico" />
-    <None Include="icons\Notify_offl.ico" />
-    <None Include="icons\Notify.ico" />
+    <Content Include="icons\App.ico" />
+    <Content Include="icons\Notify.ico" />
+    <Content Include="icons\Notify_offl.ico" />
     <Compile Include="App.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -148,6 +148,16 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="UserActivityHook.cs" />
+    <Compile Include="webImTray.en-US.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>webImTray.en-US.resx</DependentUpon>
+    </Compile>
+    <Compile Include="webImTray.ru-RU.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>webImTray.ru-RU.resx</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="App.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
@@ -184,9 +194,13 @@
     </EmbeddedResource>
     <EmbeddedResource Include="webImTray.en-US.resx">
       <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>webImTray.en-US.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="webImTray.ru-RU.resx">
       <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>webImTray.ru-RU.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />