diff --git a/.gitignore b/.gitignore
index 105a8346..b64e5d69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ po/sparkleshare.pot
 SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
 gnome-doc-utils.make
 sparkleshare-*
+desktop.ini
diff --git a/SparkleShare/Windows/Icons.Designer.cs b/SparkleShare/Windows/Icons.Designer.cs
new file mode 100644
index 00000000..cabe4017
--- /dev/null
+++ b/SparkleShare/Windows/Icons.Designer.cs
@@ -0,0 +1,392 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4211
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace SparkleShare {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Icons {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Icons() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SparkleShare.Icons", typeof(Icons).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap avatar_default {
+            get {
+                object obj = ResourceManager.GetObject("avatar_default", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap avatar_default_16 {
+            get {
+                object obj = ResourceManager.GetObject("avatar_default_16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap avatar_default_22 {
+            get {
+                object obj = ResourceManager.GetObject("avatar_default_22", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap avatar_default_24 {
+            get {
+                object obj = ResourceManager.GetObject("avatar_default_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap avatar_default_32 {
+            get {
+                object obj = ResourceManager.GetObject("avatar_default_32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap avatar_default_48 {
+            get {
+                object obj = ResourceManager.GetObject("avatar_default_48", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap dialog_error_16 {
+            get {
+                object obj = ResourceManager.GetObject("dialog_error_16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap dialog_error_24 {
+            get {
+                object obj = ResourceManager.GetObject("dialog_error_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap document_added_12 {
+            get {
+                object obj = ResourceManager.GetObject("document_added_12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap document_deleted_12 {
+            get {
+                object obj = ResourceManager.GetObject("document_deleted_12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap document_edited_12 {
+            get {
+                object obj = ResourceManager.GetObject("document_edited_12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap document_moved_12 {
+            get {
+                object obj = ResourceManager.GetObject("document_moved_12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap error {
+            get {
+                object obj = ResourceManager.GetObject("error", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap error_active {
+            get {
+                object obj = ResourceManager.GetObject("error_active", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_16 {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_16_mist {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_16_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_22 {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_22", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_22_mist {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_22_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_24 {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_24_mist {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_24_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_256 {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_256", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_256_mist {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_256_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_32 {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_32_mist {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_32_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_48 {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_48", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sparkleshare_48_mist {
+            get {
+                object obj = ResourceManager.GetObject("folder_sparkleshare_48_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle0 {
+            get {
+                object obj = ResourceManager.GetObject("idle0", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle0_active {
+            get {
+                object obj = ResourceManager.GetObject("idle0_active", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle1 {
+            get {
+                object obj = ResourceManager.GetObject("idle1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle1_active {
+            get {
+                object obj = ResourceManager.GetObject("idle1_active", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle2 {
+            get {
+                object obj = ResourceManager.GetObject("idle2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle2_active {
+            get {
+                object obj = ResourceManager.GetObject("idle2_active", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle3 {
+            get {
+                object obj = ResourceManager.GetObject("idle3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle3_active {
+            get {
+                object obj = ResourceManager.GetObject("idle3_active", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle4 {
+            get {
+                object obj = ResourceManager.GetObject("idle4", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap idle4_active {
+            get {
+                object obj = ResourceManager.GetObject("idle4_active", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_24 {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_24_mist {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_24_mist", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_i_24 {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_i_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_ii_24 {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_ii_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_iii_24 {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_iii_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_iiii_24 {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_iiii_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_syncing_sparkleshare_iiiii_24 {
+            get {
+                object obj = ResourceManager.GetObject("process_syncing_sparkleshare_iiiii_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap process_working_22 {
+            get {
+                object obj = ResourceManager.GetObject("process_working_22", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap side_splash {
+            get {
+                object obj = ResourceManager.GetObject("side_splash", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Icon sparkleshare {
+            get {
+                object obj = ResourceManager.GetObject("sparkleshare", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap sparkleshare_syncing_error_24 {
+            get {
+                object obj = ResourceManager.GetObject("sparkleshare_syncing_error_24", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/SparkleShare/Windows/Icons.resx b/SparkleShare/Windows/Icons.resx
new file mode 100644
index 00000000..111a44f9
--- /dev/null
+++ b/SparkleShare/Windows/Icons.resx
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <data name="avatar_default_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\avatar-default-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="avatar_default_22" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\avatar-default-22.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="avatar_default_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\avatar-default-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="avatar_default_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\avatar-default-32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="avatar_default_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\avatar-default-48.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="dialog_error_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\dialog-error-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="dialog_error_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\dialog-error-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="document_added_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\document-added-12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="document_deleted_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\document-deleted-12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="document_edited_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\document-edited-12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="document_moved_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\document-moved-12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="error_active" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\error-active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_16_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-16-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_22_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-22-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_22" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-22.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_24_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-24-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_256_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-256-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-256.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_32_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-32-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_48_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-48-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="folder_sparkleshare_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\folder-sparkleshare-48.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle0_active" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle0-active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle0" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle1_active" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle1-active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle2_active" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle2-active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle3_active" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle3-active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle4_active" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle4-active.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="idle4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\idle4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_24_mist" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-24-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_i_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-i-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_ii_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-ii-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_iii_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-iii-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_iiii_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-iiii-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_syncing_sparkleshare_iiiii_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-syncing-sparkleshare-iiiii-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="process_working_22" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\process-working-22.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="sparkleshare_syncing_error_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\sparkleshare-syncing-error-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="sparkleshare" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\icons\sparkleshare.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="avatar_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\avatar-default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+        <data name="side_splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\..\data\side-splash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+  </root>
diff --git a/SparkleShare/Windows/Icons.tt b/SparkleShare/Windows/Icons.tt
new file mode 100644
index 00000000..ef4bcb83
--- /dev/null
+++ b/SparkleShare/Windows/Icons.tt
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<#@ template language="C#v3.5" HostSpecific="true" #>
+<#@ output extension="resx" #>
+<#@ import namespace="System" #>
+<#@ import namespace="System.IO" #>
+<#@ import namespace="System.Diagnostics" #>
+<#@ import namespace="System.Text.RegularExpressions" #>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <#
+    string RelativeDir = @"..\..\data\icons";
+    DirectoryInfo dir = new DirectoryInfo(RelativeDir);
+
+    foreach (FileInfo f in dir.GetFiles("*.png"))
+    {
+      string DataName = Regex.Replace(Path.ChangeExtension(f.Name, null), "[^a-zA-Z0-9_]", "_");
+      string FileName = Path.Combine(RelativeDir, f.Name);
+  #>
+      <data name="<#= DataName #>" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value><#= FileName #>;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+  <#  
+    }
+  
+    foreach (FileInfo f in dir.GetFiles("*.ico"))
+    {
+      string DataName = Regex.Replace(Path.ChangeExtension(f.Name, null), "[^a-zA-Z0-9_]", "_");
+      string FileName = Path.Combine(RelativeDir, f.Name);
+  #>
+      <data name="<#= DataName #>" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value><#= FileName #>;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+  <#  
+    }
+    
+    RelativeDir = @"..\..\data";
+    dir = new DirectoryInfo(RelativeDir);
+
+    foreach (FileInfo f in dir.GetFiles("*.png"))
+    {
+      string DataName = Regex.Replace(Path.ChangeExtension(f.Name, null), "[^a-zA-Z0-9_]", "_");
+      string FileName = Path.Combine(RelativeDir, f.Name);
+  #>
+      <data name="<#= DataName #>" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value><#= FileName #>;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+      </data>
+  <#  
+    }
+    
+  #>
+</root>
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index 0853160c..17599a2d 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -74,6 +74,11 @@
       <DependentUpon>GlobalAssemblyInfo.tt</DependentUpon>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Icons.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Icons.resx</DependentUpon>
+    </Compile>
     <Compile Include="Notification.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -150,8 +155,27 @@
     <PreBuildEvent>$(ProjectDir)transform_tt.cmd</PreBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Icons.resx">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Icons.tt</DependentUpon>
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Icons.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Notification.resx">
       <DependentUpon>Notification.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Icons.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Icons.resx</LastGenOutput>
+    </None>
+    <None Include="Resources\folder-sparkleshare-16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\sparkleshare.ico" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SparkleShare/Win32/sparkleshare.ico b/data/icons/sparkleshare.ico
similarity index 100%
rename from SparkleShare/Win32/sparkleshare.ico
rename to data/icons/sparkleshare.ico