diff --git a/src/windows2go.switcher/FormMain.Designer.cs b/src/windows2go.switcher/FormMain.Designer.cs
index 07a9b84..f0587ec 100644
--- a/src/windows2go.switcher/FormMain.Designer.cs
+++ b/src/windows2go.switcher/FormMain.Designer.cs
@@ -30,11 +30,14 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.menuStripItemAbout = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBox = new System.Windows.Forms.GroupBox();
-            this.buttonSetNormal = new System.Windows.Forms.Button();
-            this.buttonSetPortable = new System.Windows.Forms.Button();
+            this.buttonSet = new System.Windows.Forms.Button();
             this.labelState = new System.Windows.Forms.Label();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.toolStripRegValue = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelRegValue = new System.Windows.Forms.ToolStripStatusLabel();
             this.menuStrip.SuspendLayout();
             this.groupBox.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // menuStrip
@@ -79,37 +82,26 @@
             this.groupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox.Controls.Add(this.buttonSetNormal);
-            this.groupBox.Controls.Add(this.buttonSetPortable);
+            this.groupBox.Controls.Add(this.buttonSet);
             this.groupBox.Controls.Add(this.labelState);
             this.groupBox.Location = new System.Drawing.Point(12, 27);
             this.groupBox.Name = "groupBox";
-            this.groupBox.Size = new System.Drawing.Size(463, 175);
+            this.groupBox.Size = new System.Drawing.Size(463, 173);
             this.groupBox.TabIndex = 1;
             this.groupBox.TabStop = false;
             this.groupBox.Text = "Current state:";
             // 
-            // buttonSetNormal
+            // buttonSet
             // 
-            this.buttonSetNormal.Enabled = false;
-            this.buttonSetNormal.Location = new System.Drawing.Point(260, 124);
-            this.buttonSetNormal.Name = "buttonSetNormal";
-            this.buttonSetNormal.Size = new System.Drawing.Size(197, 41);
-            this.buttonSetNormal.TabIndex = 1;
-            this.buttonSetNormal.Text = "Set Normal";
-            this.buttonSetNormal.UseVisualStyleBackColor = true;
-            this.buttonSetNormal.Click += new System.EventHandler(this.buttonSetNormal_Click);
-            // 
-            // buttonSetPortable
-            // 
-            this.buttonSetPortable.Enabled = false;
-            this.buttonSetPortable.Location = new System.Drawing.Point(6, 124);
-            this.buttonSetPortable.Name = "buttonSetPortable";
-            this.buttonSetPortable.Size = new System.Drawing.Size(197, 41);
-            this.buttonSetPortable.TabIndex = 1;
-            this.buttonSetPortable.Text = "Set Portable (windows to go)";
-            this.buttonSetPortable.UseVisualStyleBackColor = true;
-            this.buttonSetPortable.Click += new System.EventHandler(this.buttonSetPortable_Click);
+            this.buttonSet.Enabled = false;
+            this.buttonSet.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.buttonSet.Location = new System.Drawing.Point(6, 124);
+            this.buttonSet.Name = "buttonSet";
+            this.buttonSet.Size = new System.Drawing.Size(451, 41);
+            this.buttonSet.TabIndex = 1;
+            this.buttonSet.Text = "Set Some State";
+            this.buttonSet.UseVisualStyleBackColor = true;
+            this.buttonSet.Click += new System.EventHandler(this.buttonSetNormal_Click);
             // 
             // labelState
             // 
@@ -123,11 +115,36 @@
             this.labelState.Text = "state";
             this.labelState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripRegValue,
+            this.toolStripStatusLabelRegValue});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 203);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(487, 22);
+            this.statusStrip1.TabIndex = 2;
+            this.statusStrip1.Text = "statusStrip";
+            // 
+            // toolStripRegValue
+            // 
+            this.toolStripRegValue.Image = global::windows2go.switcher.Properties.Resources.Icon8;
+            this.toolStripRegValue.Name = "toolStripRegValue";
+            this.toolStripRegValue.Size = new System.Drawing.Size(161, 17);
+            this.toolStripRegValue.Text = "PortableOperatingSystem:";
+            // 
+            // toolStripStatusLabelRegValue
+            // 
+            this.toolStripStatusLabelRegValue.Image = global::windows2go.switcher.Properties.Resources.cancel;
+            this.toolStripStatusLabelRegValue.Name = "toolStripStatusLabelRegValue";
+            this.toolStripStatusLabelRegValue.Size = new System.Drawing.Size(16, 17);
+            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(487, 214);
+            this.ClientSize = new System.Drawing.Size(487, 225);
+            this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.groupBox);
             this.Controls.Add(this.menuStrip);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -141,6 +158,8 @@
             this.menuStrip.ResumeLayout(false);
             this.menuStrip.PerformLayout();
             this.groupBox.ResumeLayout(false);
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -155,8 +174,10 @@
         private System.Windows.Forms.ToolStripMenuItem menuStripItemAbout;
         private System.Windows.Forms.GroupBox groupBox;
         private System.Windows.Forms.Label labelState;
-        private System.Windows.Forms.Button buttonSetNormal;
-        private System.Windows.Forms.Button buttonSetPortable;
+        private System.Windows.Forms.Button buttonSet;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripRegValue;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelRegValue;
     }
 }
 
diff --git a/src/windows2go.switcher/FormMain.cs b/src/windows2go.switcher/FormMain.cs
index 2fc80cb..7c88c2b 100644
--- a/src/windows2go.switcher/FormMain.cs
+++ b/src/windows2go.switcher/FormMain.cs
@@ -1,119 +1,293 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace windows2go.switcher {
     public partial class FormMain : Form {
+        
+        static RegistryKey BaseKey = Registry.LocalMachine;
+        static RegistryKey SYSTEMKey = BaseKey.OpenSubKey("SYSTEM");
+        static RegistryKey CurrentControlSetKey = SYSTEMKey.OpenSubKey("CurrentControlSet");
+        static RegistryKey ControlKey = CurrentControlSetKey.OpenSubKey("Control",true);
 
-        RegistryKey key = RegistryKey.OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, RegistryView.Default);
-
-        const string keyName ="HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control";
+        int CurrentStateCode; //-1 not exists, 0 normal,  1 portable, 2 wrond  dword,  3 not a  dword
 
         public FormMain() {
             InitializeComponent();
-            UACSecurity.AddShieldToButton(buttonSetNormal);
-            UACSecurity.AddShieldToButton(buttonSetPortable);
-            //  if (!UACSecurity.IsAdmin()) {
-            //      
-            //     
-            //  } else
-            //      this.Text += " (Administrator)";
-        }
-
-        bool PortableState;
-        bool KeyExists;
-        bool unExpected;
-
-        private void FormMain_Load(object sender, EventArgs e) {
-            FullRegistryCheck();
-        }
-
-        private void FullRegistryCheck() {
-            GetState();
-            if (!KeyExists) {
-                inUnexpectedlState();
-            } else {
-                switch (PortableState) {
-                    case true:
-                        inPortableState();
-                        break;
-                    case false:
-                        inNormalState();
-                        break;
-                    default:
-                        inUnexpectedlState();
-                        break;
-                }
-            }
-        }
-
-        private void GetState() {
-
-            RegistryKey key = RegistryKey.OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, RegistryView.Registry32);
-            key = key.OpenSubKey(@"SYSTEM\CurrentControlSet\Control", true);
-            //check for exists "PortableOperatingSystem"
-            if (key != null) {
-                switch (key.GetValue("PortableOperatingSystem")) {
-                    case 0:
-                        PortableState = true;
-                        KeyExists = true;
-                        break;
-                    case 1:
-                        PortableState = false;
-                        KeyExists = true;
-                        break; 
-                    default:
-                        PortableState = false;
-                        KeyExists = false;
-                        break;
-                }
-            } 
-           
-        }
-        private void inNormalState() {
-            buttonSetNormal.Enabled = false;
-            buttonSetPortable.Enabled = true;
-            labelState.Text = @"You are in normal mode";
-            labelState.ForeColor = Color.LimeGreen;
-            unExpected = false;
-        }
-        private void inPortableState() {
-            buttonSetNormal.Enabled = true;
-            buttonSetPortable.Enabled = false;
-            labelState.Text = @"You are in portable (Windows To Go) mode";
-            labelState.ForeColor = Color.Crimson;
-            unExpected = false;
-        }
-        private void inUnexpectedlState() {
-            buttonSetNormal.Enabled = true;
-            buttonSetPortable.Enabled = false;
-            buttonSetNormal.Text = @"Forced set to normal?";
-            labelState.Text = "Maby DWORD \"PortableOperatingSystem\" not found in registry or have wrong value or type." +Environment.NewLine+
-                              "sIt equals normal mode.";
-            labelState.ForeColor = Color.OrangeRed;
-            unExpected = true;
-        }
-
-        private void buttonSetNormal_Click(object sender, EventArgs e) {
-            Registry.SetValue(keyName, "PortableOperatingSystem", 0);
-            FullRegistryCheck();
-
-
+            UACSecurity.AddShieldToButton(buttonSet);
 
+            if (UACSecurity.IsAdmin()) this.Text += " (Administrator)";
             
         }
 
-        private void buttonSetPortable_Click(object sender, EventArgs e) {
-            Registry.SetValue(keyName, "PortableOperatingSystem", 1); 
+        private void FormMain_Load(object sender, EventArgs e) {
+            try {
+                TryToGetValue();
+            } catch (Exception ex) {
+                MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
 
 
+        private void TryToGetValue() {
+            object PortableOperatingSystemValue = ControlKey.GetValue("PortableOperatingSystem");
+            if(PortableOperatingSystemValue != null) {
+                switch (ControlKey.GetValueKind("PortableOperatingSystem")) {
+                    case RegistryValueKind.String:
+                    case RegistryValueKind.ExpandString:
+                        //MessageBox.Show("ValueST = " + PortableOperatingSystemValue);
+                        inBadTypeState();
+                        break;
+                    case RegistryValueKind.Binary:
+                        /*
+                        foreach (byte b in (byte[])PortableOperatingSystemValue) {
+                            MessageBox.Show("{0:x2} " + b);
+                        }
+                        Console.WriteLine();
+                        */
+                        inBadTypeState();
+                        break;
+                    case RegistryValueKind.DWord: 
+                        //if "PortableOperatingSystem" and it;s value not normal. example = "PortableOperatingSystem=42"
+                        if ((PortableOperatingSystemValue.ToString() != "0") && (PortableOperatingSystemValue.ToString() != "1")) {
+                            //MessageBox.Show("ValueDW = " + Convert.ToString((Int32)PortableOperatingSystemValue));
+                            inWrongValueState();
+                        } else if (PortableOperatingSystemValue.ToString() == "0") {
+                            inNormalValueState();
+                            //MessageBox.Show(PortableOperatingSystemValue.ToString(), "");
+                        } else if(PortableOperatingSystemValue.ToString() == "1") {
+                            inPortableValueState();
+                            //MessageBox.Show(PortableOperatingSystemValue.ToString(), "");
+                        }
+                        break;
+                    case RegistryValueKind.QWord:
+                        //MessageBox.Show("ValueQW = " + Convert.ToString((Int64)PortableOperatingSystemValue));
+                        inBadTypeState();
+                        break;
+                    case RegistryValueKind.MultiString:
+                        foreach (string s in (string[])PortableOperatingSystemValue) {
+                            //MessageBox.Show("[{0:s}], ", s);
+                            inBadTypeState();
+                        }
+                        Console.WriteLine();
+                        break;
+                    default:
+                        //MessageBox.Show("Value = (Unknown)");
+                        inBadTypeState();
+                        break;
+                }
+
+            } else {
+                inNotExistsState();
+            }
+
+
+
+
+
+            /*
+            try {
+                
+            } catch (Exception ex) {
+                    inUnexpectedlState();
+                    MessageBox.Show(ex.ToString(), "");
+            }
+            */
+            }
+
+        #region states
+
+        private void inNotExistsState() {
+            buttonSet.Enabled = true;
+            buttonSet.Text = @"Forced set to normal?";
+            labelState.Text = "\"PortableOperatingSystem\" not found in registry." + Environment.NewLine +
+                              "It's equals normal mode.";
+            labelState.ForeColor = Color.OrangeRed;
+            toolStripStatusLabelRegValue.Image = Properties.Resources.cancel;
+            toolStripStatusLabelRegValue.Text = "";
+            CurrentStateCode = -1;
+        }
+
+        private void inNormalValueState() {
+            buttonSet.Enabled = true;
+            buttonSet.Text = @"Set Portable";
+            labelState.Text = "System running in normal mode." + Environment.NewLine + 
+                "You able to switch to another.";
+            labelState.ForeColor = Color.LimeGreen;
+            toolStripStatusLabelRegValue.Image = null;
+            toolStripStatusLabelRegValue.Text = "0";
+            CurrentStateCode = 0; 
+        }
+
+        private void inPortableValueState() {
+            buttonSet.Enabled = true;
+            buttonSet.Text = @"Set Normal";
+            labelState.Text = "System running in \"Windows To Go\" mode." + Environment.NewLine +
+                "You able to switch to another.";
+            labelState.ForeColor = Color.Crimson;
+            toolStripStatusLabelRegValue.Image = null;
+            toolStripStatusLabelRegValue.Text = "1";
+            CurrentStateCode = 1;
+        }
+
+        private void inWrongValueState() {
+            buttonSet.Enabled = true;
+            buttonSet.Text = @"Forced set to normal?";
+            labelState.Text = "DWORD \"PortableOperatingSystem\" have wrong value." + Environment.NewLine +
+                              "It's strange but equals normal mode.";
+            labelState.ForeColor = Color.OrangeRed;
+            toolStripStatusLabelRegValue.Image = Properties.Resources.cancel;
+            toolStripStatusLabelRegValue.Text = "";
+            CurrentStateCode = 2;
+        }
+
+        private void inBadTypeState() {
+            buttonSet.Enabled = true;
+            buttonSet.Text = @"Forced set to normal?";
+            labelState.Text = "\"PortableOperatingSystem\" is not a DWORD." + Environment.NewLine +
+                              "It's strange but equals normal mode.";
+            labelState.ForeColor = Color.OrangeRed;
+            toolStripStatusLabelRegValue.Image = Properties.Resources.cancel;
+            toolStripStatusLabelRegValue.Text = "";
+            CurrentStateCode = 3;
+        }
+        #endregion
+
+     
+        private void SetNormalState() { 
+                ControlKey.SetValue("PortableOperatingSystem", 0, RegistryValueKind.DWord); 
+        }
+       
+        private void ForcedFixNormalState() { 
+                ControlKey.DeleteValue("PortableOperatingSystem");
+                SetNormalState();
+          
+        }
+
+        private void SetPortableState() { 
+                ControlKey.SetValue("PortableOperatingSystem", 1, RegistryValueKind.DWord);
+         
+        }
+
+
+        /* 
+         private void FullRegistryCheck() {
+               GetState();
+               if (!KeyExists) {
+                   inUnexpectedlState();
+               } else {
+                   switch (PortableState) {
+                       case true:
+                           inPortableState();
+                           break;
+                       case false:
+                           inNormalState();
+                           break;
+                       default:
+                           inUnexpectedlState();
+                           break;
+                   }
+               }
+           }
+
+           private void GetState() {
+
+               RegistryKey key = RegistryKey.OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, RegistryView.Registry32);
+               key = key.OpenSubKey(@"SYSTEM\CurrentControlSet\Control", true);
+               //check for exists "PortableOperatingSystem"
+               if (key != null) {
+                   switch (key.GetValue("PortableOperatingSystem")) {
+                       case 0:
+                           PortableState = true;
+                           KeyExists = true;
+                           break;
+                       case 1:
+                           PortableState = false;
+                           KeyExists = true;
+                           break; 
+                       default:
+                           PortableState = false;
+                           KeyExists = false;
+                           break;
+                   }
+               } 
+
+           }
+           private void inNormalState() {
+               buttonSetNormal.Enabled = false;
+               buttonSetPortable.Enabled = true;
+               labelState.Text = @"You are in normal mode";
+               labelState.ForeColor = Color.LimeGreen;
+               unExpected = false;
+           }
+           private void inPortableState() {
+               buttonSetNormal.Enabled = true;
+               buttonSetPortable.Enabled = false;
+               labelState.Text = @"You are in portable (Windows To Go) mode";
+               labelState.ForeColor = Color.Crimson;
+               unExpected = false;
+           }
+          
+
+         */
+
+        private void buttonSetNormal_Click(object sender, EventArgs e) {
+            // Registry.SetValue(keyName, "PortableOperatingSystem", 0);
+            // FullRegistryCheck();
+            switch (CurrentStateCode) {
+                //case when it not exists yet
+                case -1:
+                    try {
+                        SetNormalState();
+                        MessageBox.Show("Succuess!", "Info", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    } catch (Exception ex) {
+                        MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    
+                    break;
+                //case when it in normal mode
+                case 0:
+                    try {
+                        SetPortableState();
+                        MessageBox.Show("Succuess!", "Info", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    } catch (Exception ex) {
+                        MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    break;
+                //case when it in portable mode
+                case 1:
+                    try {
+                        SetNormalState();
+                        MessageBox.Show("Succuess!", "Info", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    } catch (Exception ex) {
+                        MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    break;
+                //case when wrond  dword value
+                case 2:
+                    try {
+                        SetNormalState();
+                        MessageBox.Show("Succuess!", "Info", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    } catch (Exception ex) {
+                        MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    break;
+                //case when it is not an dwrond
+                case 3:
+                    try {
+                        ForcedFixNormalState();
+                        MessageBox.Show("Succuess!", "Info", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    } catch (Exception ex) {
+                        MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    break;
+            }
+            try {
+                TryToGetValue();
+            } catch (Exception ex) {
+                MessageBox.Show("Error!" + Environment.NewLine + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            } 
         }
     }
 }
diff --git a/src/windows2go.switcher/FormMain.resx b/src/windows2go.switcher/FormMain.resx
index 748ac91..b1d491f 100644
--- a/src/windows2go.switcher/FormMain.resx
+++ b/src/windows2go.switcher/FormMain.resx
@@ -120,6 +120,9 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>125, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/src/windows2go.switcher/Properties/Resources.Designer.cs b/src/windows2go.switcher/Properties/Resources.Designer.cs
index 4a324af..7b30a7c 100644
--- a/src/windows2go.switcher/Properties/Resources.Designer.cs
+++ b/src/windows2go.switcher/Properties/Resources.Designer.cs
@@ -9,8 +9,9 @@
 //------------------------------------------------------------------------------
 
 namespace windows2go.switcher.Properties {
-
-
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -18,33 +19,33 @@ namespace windows2go.switcher.Properties {
     // 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", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-
+        
         /// <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 ((resourceMan == null)) {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("windows2go.switcher.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
@@ -58,5 +59,35 @@ namespace windows2go.switcher.Properties {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap cancel {
+            get {
+                object obj = ResourceManager.GetObject("cancel", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Icon6 {
+            get {
+                object obj = ResourceManager.GetObject("Icon6", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Icon8 {
+            get {
+                object obj = ResourceManager.GetObject("Icon8", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/src/windows2go.switcher/Properties/Resources.resx b/src/windows2go.switcher/Properties/Resources.resx
index af7dbeb..b32f998 100644
--- a/src/windows2go.switcher/Properties/Resources.resx
+++ b/src/windows2go.switcher/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : 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">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <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">
@@ -85,9 +87,10 @@
                 <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" msdata:Ordinal="1" />
+              <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">
@@ -109,9 +112,19 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Icon8" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icon8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Icon6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icon6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/windows2go.switcher/Resources/Icon6.png b/src/windows2go.switcher/Resources/Icon6.png
new file mode 100644
index 0000000..4d32782
Binary files /dev/null and b/src/windows2go.switcher/Resources/Icon6.png differ
diff --git a/src/windows2go.switcher/Resources/Icon8.png b/src/windows2go.switcher/Resources/Icon8.png
new file mode 100644
index 0000000..86e8fa7
Binary files /dev/null and b/src/windows2go.switcher/Resources/Icon8.png differ
diff --git a/src/windows2go.switcher/Resources/cancel.png b/src/windows2go.switcher/Resources/cancel.png
new file mode 100644
index 0000000..f43d174
Binary files /dev/null and b/src/windows2go.switcher/Resources/cancel.png differ
diff --git a/src/windows2go.switcher/windows2go.switcher.csproj b/src/windows2go.switcher/windows2go.switcher.csproj
index bca31cd..36a5cf5 100644
--- a/src/windows2go.switcher/windows2go.switcher.csproj
+++ b/src/windows2go.switcher/windows2go.switcher.csproj
@@ -72,6 +72,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
@@ -88,6 +89,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\Icon6.png" />
+    <None Include="Resources\Icon8.png" />
+    <None Include="Resources\cancel.png" />
     <Content Include="windows.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />