diff --git a/src/modules/MouseWithoutBorders/App/Control/Machine.cs b/src/modules/MouseWithoutBorders/App/Control/Machine.cs
index e0925ea312..c8ce5306ac 100644
--- a/src/modules/MouseWithoutBorders/App/Control/Machine.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/Machine.cs
@@ -47,7 +47,7 @@ namespace MouseWithoutBorders
             {
                 checkBoxEnabled.Checked = value;
                 Editable = value;
-                pictureBoxLogo.Image = value ? Resources.MachineEnabled : (System.Drawing.Image)Resources.MachineDisabled;
+                pictureBoxLogo.Image = value ? Images.MachineEnabled : (System.Drawing.Image)Images.MachineDisabled;
                 OnEnabledChanged(EventArgs.Empty); // Borrow this event since we do not use it for any other purpose:) (we can create one but l...:))
             }
         }
diff --git a/src/modules/MouseWithoutBorders/App/Control/Machine2.Designer.cs b/src/modules/MouseWithoutBorders/App/Control/Machine2.Designer.cs
index cad1a55b5e..ca9544d84a 100644
--- a/src/modules/MouseWithoutBorders/App/Control/Machine2.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/Machine2.Designer.cs
@@ -74,7 +74,7 @@
             // 
             // ComputerPictureBox
             // 
-            this.ComputerPictureBox.Image = global::MouseWithoutBorders.Properties.Resources.computer_connected;
+            this.ComputerPictureBox.Image = global::MouseWithoutBorders.Properties.Images.computer_connected;
             this.ComputerPictureBox.Location = new System.Drawing.Point(5, 5);
             this.ComputerPictureBox.Name = "ComputerPictureBox";
             this.ComputerPictureBox.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
@@ -86,12 +86,12 @@
             // RemoveButton
             // 
             this.RemoveButton.DisabledImage = null;
-            this.RemoveButton.DownImage = global::MouseWithoutBorders.Properties.Resources.red_close_button_click;
-            this.RemoveButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.red_close_button_hover;
-            this.RemoveButton.Image = global::MouseWithoutBorders.Properties.Resources.red_close_button_normal;
+            this.RemoveButton.DownImage = global::MouseWithoutBorders.Properties.Images.red_close_button_click;
+            this.RemoveButton.HoverImage = global::MouseWithoutBorders.Properties.Images.red_close_button_hover;
+            this.RemoveButton.Image = global::MouseWithoutBorders.Properties.Images.red_close_button_normal;
             this.RemoveButton.Location = new System.Drawing.Point(224, 15);
             this.RemoveButton.Name = "RemoveButton";
-            this.RemoveButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.red_close_button_normal;
+            this.RemoveButton.NormalImage = global::MouseWithoutBorders.Properties.Images.red_close_button_normal;
             this.RemoveButton.Size = new System.Drawing.Size(12, 12);
             this.RemoveButton.TabIndex = 5;
             this.RemoveButton.TabStop = false;
@@ -101,12 +101,12 @@
             // 
             this.OnButton.BackColor = System.Drawing.Color.Transparent;
             this.OnButton.DisabledImage = null;
-            this.OnButton.DownImage = global::MouseWithoutBorders.Properties.Resources.switch_on_click;
-            this.OnButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.switch_on_hover;
-            this.OnButton.Image = global::MouseWithoutBorders.Properties.Resources.switch_on_normal;
+            this.OnButton.DownImage = global::MouseWithoutBorders.Properties.Images.switch_on_click;
+            this.OnButton.HoverImage = global::MouseWithoutBorders.Properties.Images.switch_on_hover;
+            this.OnButton.Image = global::MouseWithoutBorders.Properties.Images.switch_on_normal;
             this.OnButton.Location = new System.Drawing.Point(277, 20);
             this.OnButton.Name = "OnButton";
-            this.OnButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.switch_on_normal;
+            this.OnButton.NormalImage = global::MouseWithoutBorders.Properties.Images.switch_on_normal;
             this.OnButton.Size = new System.Drawing.Size(30, 15);
             this.OnButton.TabIndex = 3;
             this.OnButton.TabStop = false;
@@ -116,12 +116,12 @@
             // 
             this.OffButton.BackColor = System.Drawing.Color.Transparent;
             this.OffButton.DisabledImage = null;
-            this.OffButton.DownImage = global::MouseWithoutBorders.Properties.Resources.switch_off_click;
-            this.OffButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.switch_off_hover;
-            this.OffButton.Image = global::MouseWithoutBorders.Properties.Resources.switch_off_normal;
+            this.OffButton.DownImage = global::MouseWithoutBorders.Properties.Images.switch_off_click;
+            this.OffButton.HoverImage = global::MouseWithoutBorders.Properties.Images.switch_off_hover;
+            this.OffButton.Image = global::MouseWithoutBorders.Properties.Images.switch_off_normal;
             this.OffButton.Location = new System.Drawing.Point(241, 42);
             this.OffButton.Name = "OffButton";
-            this.OffButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.switch_off_normal;
+            this.OffButton.NormalImage = global::MouseWithoutBorders.Properties.Images.switch_off_normal;
             this.OffButton.Size = new System.Drawing.Size(30, 15);
             this.OffButton.TabIndex = 4;
             this.OffButton.TabStop = false;
diff --git a/src/modules/MouseWithoutBorders/App/Control/MachineMatrix.Designer.cs b/src/modules/MouseWithoutBorders/App/Control/MachineMatrix.Designer.cs
index 859ecce4ad..4d7a9a7220 100644
--- a/src/modules/MouseWithoutBorders/App/Control/MachineMatrix.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Control/MachineMatrix.Designer.cs
@@ -48,7 +48,7 @@
             // SingleRowRadioButton
             // 
             this.SingleRowRadioButton.Checked = true;
-            this.SingleRowRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Resources.one_row_button_checked;
+            this.SingleRowRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Images.one_row_button_checked;
             this.SingleRowRadioButton.ImageLocation = new System.Drawing.Point(0, 0);
             this.SingleRowRadioButton.Location = new System.Drawing.Point(0, 0);
             this.SingleRowRadioButton.Margin = new System.Windows.Forms.Padding(0);
@@ -57,13 +57,13 @@
             this.SingleRowRadioButton.TabIndex = 4;
             this.SingleRowRadioButton.TabStop = true;
             this.SingleRowRadioButton.TextLocation = new System.Drawing.Point(0, 0);
-            this.SingleRowRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.one_row_button_unchecked;
+            this.SingleRowRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Images.one_row_button_unchecked;
             this.SingleRowRadioButton.UseVisualStyleBackColor = true;
             this.SingleRowRadioButton.CheckedChanged += new System.EventHandler(this.SingleRowRadioButtonCheckedChanged);
             // 
             // TwoRowsRadioButton
             // 
-            this.TwoRowsRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Resources.two_row_button_checked;
+            this.TwoRowsRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Images.two_row_button_checked;
             this.TwoRowsRadioButton.ImageLocation = new System.Drawing.Point(0, 0);
             this.TwoRowsRadioButton.Location = new System.Drawing.Point(0, 27);
             this.TwoRowsRadioButton.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
@@ -71,7 +71,7 @@
             this.TwoRowsRadioButton.Size = new System.Drawing.Size(27, 24);
             this.TwoRowsRadioButton.TabIndex = 5;
             this.TwoRowsRadioButton.TextLocation = new System.Drawing.Point(0, 0);
-            this.TwoRowsRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.two_row_button_unchecked;
+            this.TwoRowsRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Images.two_row_button_unchecked;
             this.TwoRowsRadioButton.UseVisualStyleBackColor = true;
             this.TwoRowsRadioButton.CheckedChanged += new System.EventHandler(this.TwoRowsRadioButtonCheckedChanged);
             // 
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.Designer.cs
index 7a43058dba..f59f8c1824 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.Designer.cs
@@ -40,8 +40,8 @@
             // 
             this.closeWindowButton.BackColor = System.Drawing.Color.Transparent;
             this.closeWindowButton.DisabledImage = null;
-            this.closeWindowButton.DownImage = global::MouseWithoutBorders.Properties.Resources.close_window_click;
-            this.closeWindowButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.close_window_hover;
+            this.closeWindowButton.DownImage = global::MouseWithoutBorders.Properties.Images.close_window_click;
+            this.closeWindowButton.HoverImage = global::MouseWithoutBorders.Properties.Images.close_window_hover;
             this.closeWindowButton.Location = new System.Drawing.Point(454, 6);
             this.closeWindowButton.Name = "closeWindowButton";
             this.closeWindowButton.NormalImage = null;
@@ -67,7 +67,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackgroundImage = global::MouseWithoutBorders.Properties.Resources.dialog_background;
+            this.BackgroundImage = global::MouseWithoutBorders.Properties.Images.dialog_background;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(477, 476);
             this.Controls.Add(this.closeWindowButton);
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsFormPage.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsFormPage.Designer.cs
index 1a033b69df..9a5375f89b 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsFormPage.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsFormPage.Designer.cs
@@ -52,12 +52,12 @@
             // BackButton
             // 
             this.BackButton.DisabledImage = null;
-            this.BackButton.DownImage = global::MouseWithoutBorders.Properties.Resources.back_button_click;
-            this.BackButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.back_button_hover;
-            this.BackButton.Image = global::MouseWithoutBorders.Properties.Resources.back_button_normal;
+            this.BackButton.DownImage = global::MouseWithoutBorders.Properties.Images.back_button_click;
+            this.BackButton.HoverImage = global::MouseWithoutBorders.Properties.Images.back_button_hover;
+            this.BackButton.Image = global::MouseWithoutBorders.Properties.Images.back_button_normal;
             this.BackButton.Location = new System.Drawing.Point(6, 6);
             this.BackButton.Name = "BackButton";
-            this.BackButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.back_button_normal;
+            this.BackButton.NormalImage = global::MouseWithoutBorders.Properties.Images.back_button_normal;
             this.BackButton.Size = new System.Drawing.Size(24, 24);
             this.BackButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.BackButton.TabIndex = 0;
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage.Designer.cs
index 7363f062ee..e96193726e 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage.Designer.cs
@@ -72,13 +72,13 @@
             // 
             this.DoneButton.BackColor = System.Drawing.Color.Transparent;
             this.DoneButton.DisabledImage = null;
-            this.DoneButton.DownImage = global::MouseWithoutBorders.Properties.Resources.done_button_click;
-            this.DoneButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.done_button_hover;
-            this.DoneButton.Image = global::MouseWithoutBorders.Properties.Resources.done_button_normal;
-            this.DoneButton.InitialImage = global::MouseWithoutBorders.Properties.Resources.yes_button_normal;
+            this.DoneButton.DownImage = global::MouseWithoutBorders.Properties.Images.done_button_click;
+            this.DoneButton.HoverImage = global::MouseWithoutBorders.Properties.Images.done_button_hover;
+            this.DoneButton.Image = global::MouseWithoutBorders.Properties.Images.done_button_normal;
+            this.DoneButton.InitialImage = global::MouseWithoutBorders.Properties.Images.yes_button_normal;
             this.DoneButton.Location = new System.Drawing.Point(199, 366);
             this.DoneButton.Name = "DoneButton";
-            this.DoneButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.done_button_normal;
+            this.DoneButton.NormalImage = global::MouseWithoutBorders.Properties.Images.done_button_normal;
             this.DoneButton.Size = new System.Drawing.Size(55, 55);
             this.DoneButton.TabIndex = 8;
             this.DoneButton.TabStop = false;
@@ -89,13 +89,13 @@
             // 
             this.CloseButton.BackColor = System.Drawing.Color.Transparent;
             this.CloseButton.DisabledImage = null;
-            this.CloseButton.DownImage = global::MouseWithoutBorders.Properties.Resources.close_button_click;
-            this.CloseButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.close_button_hover;
-            this.CloseButton.Image = global::MouseWithoutBorders.Properties.Resources.close_button_normal;
-            this.CloseButton.InitialImage = global::MouseWithoutBorders.Properties.Resources.yes_button_normal;
+            this.CloseButton.DownImage = global::MouseWithoutBorders.Properties.Images.close_button_click;
+            this.CloseButton.HoverImage = global::MouseWithoutBorders.Properties.Images.close_button_hover;
+            this.CloseButton.Image = global::MouseWithoutBorders.Properties.Images.close_button_normal;
+            this.CloseButton.InitialImage = global::MouseWithoutBorders.Properties.Images.yes_button_normal;
             this.CloseButton.Location = new System.Drawing.Point(199, 366);
             this.CloseButton.Name = "CloseButton";
-            this.CloseButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.close_button_normal;
+            this.CloseButton.NormalImage = global::MouseWithoutBorders.Properties.Images.close_button_normal;
             this.CloseButton.Size = new System.Drawing.Size(55, 55);
             this.CloseButton.TabIndex = 7;
             this.CloseButton.TabStop = false;
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage1.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage1.Designer.cs
index 05f9920cd6..5637e422a8 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage1.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage1.Designer.cs
@@ -53,12 +53,12 @@
             // AddComputerButton
             // 
             this.AddComputerButton.DisabledImage = null;
-            this.AddComputerButton.DownImage = global::MouseWithoutBorders.Properties.Resources.computer_button_click;
-            this.AddComputerButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.computer_button_hover;
-            this.AddComputerButton.Image = global::MouseWithoutBorders.Properties.Resources.computer_button_normal;
+            this.AddComputerButton.DownImage = global::MouseWithoutBorders.Properties.Images.computer_button_click;
+            this.AddComputerButton.HoverImage = global::MouseWithoutBorders.Properties.Images.computer_button_hover;
+            this.AddComputerButton.Image = global::MouseWithoutBorders.Properties.Images.computer_button_normal;
             this.AddComputerButton.Location = new System.Drawing.Point(50, 317);
             this.AddComputerButton.Name = "AddComputerButton";
-            this.AddComputerButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.computer_button_normal;
+            this.AddComputerButton.NormalImage = global::MouseWithoutBorders.Properties.Images.computer_button_normal;
             this.AddComputerButton.Size = new System.Drawing.Size(74, 23);
             this.AddComputerButton.TabIndex = 9;
             this.AddComputerButton.TabStop = false;
@@ -67,12 +67,12 @@
             // KeyboardShortcutsButton
             // 
             this.KeyboardShortcutsButton.DisabledImage = null;
-            this.KeyboardShortcutsButton.DownImage = global::MouseWithoutBorders.Properties.Resources.keyboard_button_click;
-            this.KeyboardShortcutsButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.keyboard_button_hover;
-            this.KeyboardShortcutsButton.Image = global::MouseWithoutBorders.Properties.Resources.keyboard_button_normal;
+            this.KeyboardShortcutsButton.DownImage = global::MouseWithoutBorders.Properties.Images.keyboard_button_click;
+            this.KeyboardShortcutsButton.HoverImage = global::MouseWithoutBorders.Properties.Images.keyboard_button_hover;
+            this.KeyboardShortcutsButton.Image = global::MouseWithoutBorders.Properties.Images.keyboard_button_normal;
             this.KeyboardShortcutsButton.Location = new System.Drawing.Point(327, 317);
             this.KeyboardShortcutsButton.Name = "KeyboardShortcutsButton";
-            this.KeyboardShortcutsButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.keyboard_button_normal;
+            this.KeyboardShortcutsButton.NormalImage = global::MouseWithoutBorders.Properties.Images.keyboard_button_normal;
             this.KeyboardShortcutsButton.Size = new System.Drawing.Size(84, 23);
             this.KeyboardShortcutsButton.TabIndex = 11;
             this.KeyboardShortcutsButton.TabStop = false;
@@ -81,12 +81,12 @@
             // AdvancedOptionsButton
             // 
             this.AdvancedOptionsButton.DisabledImage = null;
-            this.AdvancedOptionsButton.DownImage = global::MouseWithoutBorders.Properties.Resources.advanced_button_click;
-            this.AdvancedOptionsButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.advanced_button_hover;
-            this.AdvancedOptionsButton.Image = global::MouseWithoutBorders.Properties.Resources.advanced_button_normal;
+            this.AdvancedOptionsButton.DownImage = global::MouseWithoutBorders.Properties.Images.advanced_button_click;
+            this.AdvancedOptionsButton.HoverImage = global::MouseWithoutBorders.Properties.Images.advanced_button_hover;
+            this.AdvancedOptionsButton.Image = global::MouseWithoutBorders.Properties.Images.advanced_button_normal;
             this.AdvancedOptionsButton.Location = new System.Drawing.Point(244, 317);
             this.AdvancedOptionsButton.Name = "AdvancedOptionsButton";
-            this.AdvancedOptionsButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.advanced_button_normal;
+            this.AdvancedOptionsButton.NormalImage = global::MouseWithoutBorders.Properties.Images.advanced_button_normal;
             this.AdvancedOptionsButton.Size = new System.Drawing.Size(74, 23);
             this.AdvancedOptionsButton.TabIndex = 12;
             this.AdvancedOptionsButton.TabStop = false;
@@ -95,12 +95,12 @@
             // LinkComputerButton
             // 
             this.LinkComputerButton.DisabledImage = null;
-            this.LinkComputerButton.DownImage = global::MouseWithoutBorders.Properties.Resources.small_link_button_click;
-            this.LinkComputerButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.small_link_button_hover;
-            this.LinkComputerButton.Image = global::MouseWithoutBorders.Properties.Resources.small_link_button_normal;
+            this.LinkComputerButton.DownImage = global::MouseWithoutBorders.Properties.Images.small_link_button_click;
+            this.LinkComputerButton.HoverImage = global::MouseWithoutBorders.Properties.Images.small_link_button_hover;
+            this.LinkComputerButton.Image = global::MouseWithoutBorders.Properties.Images.small_link_button_normal;
             this.LinkComputerButton.Location = new System.Drawing.Point(133, 317);
             this.LinkComputerButton.Name = "LinkComputerButton";
-            this.LinkComputerButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.small_link_button_normal;
+            this.LinkComputerButton.NormalImage = global::MouseWithoutBorders.Properties.Images.small_link_button_normal;
             this.LinkComputerButton.Size = new System.Drawing.Size(74, 23);
             this.LinkComputerButton.TabIndex = 13;
             this.LinkComputerButton.TabStop = false;
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage3.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage3.Designer.cs
index 522012f388..4bddbaac42 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage3.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage3.Designer.cs
@@ -67,7 +67,7 @@
             // ShareClipboardCheckbox
             // 
             this.ShareClipboardCheckbox.AutoSize = true;
-            this.ShareClipboardCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_checked;
+            this.ShareClipboardCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_checked;
             this.ShareClipboardCheckbox.DisabledImage = null;
             this.ShareClipboardCheckbox.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F);
             this.ShareClipboardCheckbox.Location = new System.Drawing.Point(54, 188);
@@ -76,14 +76,14 @@
             this.ShareClipboardCheckbox.Size = new System.Drawing.Size(128, 34);
             this.ShareClipboardCheckbox.TabIndex = 16;
             this.ShareClipboardCheckbox.Text = "Share Clipboard (Text \r\nand Image)";
-            this.ShareClipboardCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_unchecked;
+            this.ShareClipboardCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_unchecked;
             this.ShareClipboardCheckbox.UseVisualStyleBackColor = true;
             this.ShareClipboardCheckbox.CheckedChanged += new System.EventHandler(this.ShareClipboardCheckbox_CheckedChanged);
             // 
             // HideOnLoginCheckbox
             // 
             this.HideOnLoginCheckbox.AutoSize = true;
-            this.HideOnLoginCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_checked;
+            this.HideOnLoginCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_checked;
             this.HideOnLoginCheckbox.DisabledImage = null;
             this.HideOnLoginCheckbox.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F);
             this.HideOnLoginCheckbox.Location = new System.Drawing.Point(54, 238);
@@ -92,14 +92,14 @@
             this.HideOnLoginCheckbox.Size = new System.Drawing.Size(143, 34);
             this.HideOnLoginCheckbox.TabIndex = 17;
             this.HideOnLoginCheckbox.Text = "Hide Mouse w/o Borders \r\non the Login Desktop";
-            this.HideOnLoginCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_unchecked;
+            this.HideOnLoginCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_unchecked;
             this.HideOnLoginCheckbox.UseVisualStyleBackColor = true;
             this.HideOnLoginCheckbox.CheckedChanged += new System.EventHandler(this.HideOnLoginCheckbox_CheckedChanged);
             // 
             // EnableEasyMouseCheckbox
             // 
             this.EnableEasyMouseCheckbox.AutoSize = true;
-            this.EnableEasyMouseCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_checked;
+            this.EnableEasyMouseCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_checked;
             this.EnableEasyMouseCheckbox.DisabledImage = null;
             this.EnableEasyMouseCheckbox.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F);
             this.EnableEasyMouseCheckbox.Location = new System.Drawing.Point(54, 288);
@@ -108,14 +108,14 @@
             this.EnableEasyMouseCheckbox.Size = new System.Drawing.Size(114, 19);
             this.EnableEasyMouseCheckbox.TabIndex = 18;
             this.EnableEasyMouseCheckbox.Text = "Enable Easy Mouse";
-            this.EnableEasyMouseCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_unchecked;
+            this.EnableEasyMouseCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_unchecked;
             this.EnableEasyMouseCheckbox.UseVisualStyleBackColor = true;
             this.EnableEasyMouseCheckbox.CheckedChanged += new System.EventHandler(this.EnableEasyMouseCheckbox_CheckedChanged);
             // 
             // WrapMouseCheckbox
             // 
             this.WrapMouseCheckbox.AutoSize = true;
-            this.WrapMouseCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_checked;
+            this.WrapMouseCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_checked;
             this.WrapMouseCheckbox.DisabledImage = null;
             this.WrapMouseCheckbox.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.WrapMouseCheckbox.Location = new System.Drawing.Point(238, 288);
@@ -124,14 +124,14 @@
             this.WrapMouseCheckbox.Size = new System.Drawing.Size(85, 19);
             this.WrapMouseCheckbox.TabIndex = 19;
             this.WrapMouseCheckbox.Text = "Wrap Mouse";
-            this.WrapMouseCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_unchecked;
+            this.WrapMouseCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_unchecked;
             this.WrapMouseCheckbox.UseVisualStyleBackColor = true;
             this.WrapMouseCheckbox.CheckedChanged += new System.EventHandler(this.WrapMouseCheckbox_CheckedChanged);
             // 
             // DisableCADCheckbox
             // 
             this.DisableCADCheckbox.AutoSize = true;
-            this.DisableCADCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_checked;
+            this.DisableCADCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_checked;
             this.DisableCADCheckbox.DisabledImage = null;
             this.DisableCADCheckbox.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F);
             this.DisableCADCheckbox.Location = new System.Drawing.Point(238, 188);
@@ -140,14 +140,14 @@
             this.DisableCADCheckbox.Size = new System.Drawing.Size(154, 34);
             this.DisableCADCheckbox.TabIndex = 20;
             this.DisableCADCheckbox.Text = "Disable Ctrl+Alt+Del on the \r\nLogin Screen";
-            this.DisableCADCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_unchecked;
+            this.DisableCADCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_unchecked;
             this.DisableCADCheckbox.UseVisualStyleBackColor = true;
             this.DisableCADCheckbox.CheckedChanged += new System.EventHandler(this.DisableCADCheckbox_CheckedChanged);
             // 
             // BlockScreenSaverCheckbox
             // 
             this.BlockScreenSaverCheckbox.AutoSize = true;
-            this.BlockScreenSaverCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_checked;
+            this.BlockScreenSaverCheckbox.CheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_checked;
             this.BlockScreenSaverCheckbox.DisabledImage = null;
             this.BlockScreenSaverCheckbox.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F);
             this.BlockScreenSaverCheckbox.Location = new System.Drawing.Point(238, 238);
@@ -156,7 +156,7 @@
             this.BlockScreenSaverCheckbox.Size = new System.Drawing.Size(158, 34);
             this.BlockScreenSaverCheckbox.TabIndex = 21;
             this.BlockScreenSaverCheckbox.Text = "Block Screen Saver on Other\r\nMachines";
-            this.BlockScreenSaverCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.checkbox_unchecked;
+            this.BlockScreenSaverCheckbox.UncheckedImage = global::MouseWithoutBorders.Properties.Images.checkbox_unchecked;
             this.BlockScreenSaverCheckbox.UseVisualStyleBackColor = true;
             this.BlockScreenSaverCheckbox.CheckedChanged += new System.EventHandler(this.BlockScreenSaverCheckbox_CheckedChanged);
             // 
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage4.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage4.Designer.cs
index 045f1f53f4..bf4244ec14 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage4.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SettingsPage4.Designer.cs
@@ -212,7 +212,7 @@
             // DisabledRadioButton
             // 
             this.DisabledRadioButton.AutoSize = true;
-            this.DisabledRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Resources.radio_button_checked;
+            this.DisabledRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Images.radio_button_checked;
             this.DisabledRadioButton.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.DisabledRadioButton.ForeColor = System.Drawing.Color.White;
             this.DisabledRadioButton.ImageLocation = new System.Drawing.Point(0, 3);
@@ -222,14 +222,14 @@
             this.DisabledRadioButton.TabIndex = 2;
             this.DisabledRadioButton.Text = "Disabled";
             this.DisabledRadioButton.TextLocation = new System.Drawing.Point(14, 0);
-            this.DisabledRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.radio_button_unchecked;
+            this.DisabledRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Images.radio_button_unchecked;
             this.DisabledRadioButton.UseVisualStyleBackColor = true;
             this.DisabledRadioButton.CheckedChanged += new System.EventHandler(this.DisabledRadioButton_CheckedChanged);
             // 
             // NumbersRadioButton
             // 
             this.NumbersRadioButton.AutoSize = true;
-            this.NumbersRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Resources.radio_button_checked;
+            this.NumbersRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Images.radio_button_checked;
             this.NumbersRadioButton.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.NumbersRadioButton.ForeColor = System.Drawing.Color.White;
             this.NumbersRadioButton.ImageLocation = new System.Drawing.Point(0, 3);
@@ -239,14 +239,14 @@
             this.NumbersRadioButton.TabIndex = 1;
             this.NumbersRadioButton.Text = "1, 2, 3, 4";
             this.NumbersRadioButton.TextLocation = new System.Drawing.Point(14, 0);
-            this.NumbersRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.radio_button_unchecked;
+            this.NumbersRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Images.radio_button_unchecked;
             this.NumbersRadioButton.UseVisualStyleBackColor = true;
             this.NumbersRadioButton.CheckedChanged += new System.EventHandler(this.NumbersRadioButton_CheckedChanged);
             // 
             // FKeysRadioButton
             // 
             this.FKeysRadioButton.AutoSize = true;
-            this.FKeysRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Resources.radio_button_checked;
+            this.FKeysRadioButton.CheckedImage = global::MouseWithoutBorders.Properties.Images.radio_button_checked;
             this.FKeysRadioButton.Font = new System.Drawing.Font(DefaultFont.Name, 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FKeysRadioButton.ForeColor = System.Drawing.Color.White;
             this.FKeysRadioButton.ImageLocation = new System.Drawing.Point(0, 3);
@@ -256,7 +256,7 @@
             this.FKeysRadioButton.TabIndex = 0;
             this.FKeysRadioButton.Text = "F1, F2, F3, F4";
             this.FKeysRadioButton.TextLocation = new System.Drawing.Point(14, 0);
-            this.FKeysRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Resources.radio_button_unchecked;
+            this.FKeysRadioButton.UncheckedImage = global::MouseWithoutBorders.Properties.Images.radio_button_unchecked;
             this.FKeysRadioButton.UseVisualStyleBackColor = true;
             this.FKeysRadioButton.CheckedChanged += new System.EventHandler(this.FKeysRadioButton_CheckedChanged);
             // 
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage1.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage1.Designer.cs
index 59e46a81f8..8270758d68 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage1.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage1.Designer.cs
@@ -110,13 +110,13 @@ namespace MouseWithoutBorders
             // 
             this.NoButton.BackColor = System.Drawing.Color.Transparent;
             this.NoButton.DisabledImage = null;
-            this.NoButton.DownImage = global::MouseWithoutBorders.Properties.Resources.no_button_click;
-            this.NoButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.no_button_hover;
-            this.NoButton.Image = global::MouseWithoutBorders.Properties.Resources.no_button_normal;
-            this.NoButton.InitialImage = global::MouseWithoutBorders.Properties.Resources.yes_button_normal;
+            this.NoButton.DownImage = global::MouseWithoutBorders.Properties.Images.no_button_click;
+            this.NoButton.HoverImage = global::MouseWithoutBorders.Properties.Images.no_button_hover;
+            this.NoButton.Image = global::MouseWithoutBorders.Properties.Images.no_button_normal;
+            this.NoButton.InitialImage = global::MouseWithoutBorders.Properties.Images.yes_button_normal;
             this.NoButton.Location = new System.Drawing.Point(234, 366);
             this.NoButton.Name = "NoButton";
-            this.NoButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.no_button_normal;
+            this.NoButton.NormalImage = global::MouseWithoutBorders.Properties.Images.no_button_normal;
             this.NoButton.Size = new System.Drawing.Size(55, 55);
             this.NoButton.TabIndex = 7;
             this.NoButton.TabStop = false;
@@ -126,13 +126,13 @@ namespace MouseWithoutBorders
             // 
             this.YesButton.BackColor = System.Drawing.Color.Transparent;
             this.YesButton.DisabledImage = null;
-            this.YesButton.DownImage = global::MouseWithoutBorders.Properties.Resources.yes_button_click;
-            this.YesButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.yes_button_hover;
-            this.YesButton.Image = global::MouseWithoutBorders.Properties.Resources.yes_button_normal;
-            this.YesButton.InitialImage = global::MouseWithoutBorders.Properties.Resources.yes_button_normal;
+            this.YesButton.DownImage = global::MouseWithoutBorders.Properties.Images.yes_button_click;
+            this.YesButton.HoverImage = global::MouseWithoutBorders.Properties.Images.yes_button_hover;
+            this.YesButton.Image = global::MouseWithoutBorders.Properties.Images.yes_button_normal;
+            this.YesButton.InitialImage = global::MouseWithoutBorders.Properties.Images.yes_button_normal;
             this.YesButton.Location = new System.Drawing.Point(164, 366);
             this.YesButton.Name = "YesButton";
-            this.YesButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.yes_button_normal;
+            this.YesButton.NormalImage = global::MouseWithoutBorders.Properties.Images.yes_button_normal;
             this.YesButton.Size = new System.Drawing.Size(55, 55);
             this.YesButton.TabIndex = 6;
             this.YesButton.TabStop = false;
@@ -140,7 +140,7 @@ namespace MouseWithoutBorders
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Image = global::MouseWithoutBorders.Properties.Resources.Mouse;
+            this.pictureBox1.Image = global::MouseWithoutBorders.Properties.Images.Mouse;
             this.pictureBox1.Location = new System.Drawing.Point(206, 40);
             this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
             this.pictureBox1.Name = "pictureBox1";
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2a.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2a.Designer.cs
index 7338e1c403..c463e3ba60 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2a.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2a.Designer.cs
@@ -98,14 +98,14 @@ namespace MouseWithoutBorders
             // 
             // LinkButton
             // 
-            this.LinkButton.DisabledImage = global::MouseWithoutBorders.Properties.Resources.link_button_disabled;
-            this.LinkButton.DownImage = global::MouseWithoutBorders.Properties.Resources.link_button_click;
+            this.LinkButton.DisabledImage = global::MouseWithoutBorders.Properties.Images.link_button_disabled;
+            this.LinkButton.DownImage = global::MouseWithoutBorders.Properties.Images.link_button_click;
             this.LinkButton.Enabled = false;
-            this.LinkButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.link_button_hover;
-            this.LinkButton.Image = global::MouseWithoutBorders.Properties.Resources.link_button_normal;
+            this.LinkButton.HoverImage = global::MouseWithoutBorders.Properties.Images.link_button_hover;
+            this.LinkButton.Image = global::MouseWithoutBorders.Properties.Images.link_button_normal;
             this.LinkButton.Location = new System.Drawing.Point(199, 366);
             this.LinkButton.Name = "LinkButton";
-            this.LinkButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.link_button_normal;
+            this.LinkButton.NormalImage = global::MouseWithoutBorders.Properties.Images.link_button_normal;
             this.LinkButton.Size = new System.Drawing.Size(55, 55);
             this.LinkButton.TabIndex = 15;
             this.LinkButton.TabStop = false;
@@ -126,12 +126,12 @@ namespace MouseWithoutBorders
             // ExpandHelpButton
             // 
             this.ExpandHelpButton.DisabledImage = null;
-            this.ExpandHelpButton.DownImage = global::MouseWithoutBorders.Properties.Resources.expand_button_click;
-            this.ExpandHelpButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.expand_button_highlight;
-            this.ExpandHelpButton.Image = global::MouseWithoutBorders.Properties.Resources.expand_button_normal;
+            this.ExpandHelpButton.DownImage = global::MouseWithoutBorders.Properties.Images.expand_button_click;
+            this.ExpandHelpButton.HoverImage = global::MouseWithoutBorders.Properties.Images.expand_button_highlight;
+            this.ExpandHelpButton.Image = global::MouseWithoutBorders.Properties.Images.expand_button_normal;
             this.ExpandHelpButton.Location = new System.Drawing.Point(360, 211);
             this.ExpandHelpButton.Name = "ExpandHelpButton";
-            this.ExpandHelpButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.expand_button_normal;
+            this.ExpandHelpButton.NormalImage = global::MouseWithoutBorders.Properties.Images.expand_button_normal;
             this.ExpandHelpButton.Size = new System.Drawing.Size(11, 11);
             this.ExpandHelpButton.TabIndex = 24;
             this.ExpandHelpButton.TabStop = false;
@@ -140,12 +140,12 @@ namespace MouseWithoutBorders
             // CollapseHelpButton
             // 
             this.CollapseHelpButton.DisabledImage = null;
-            this.CollapseHelpButton.DownImage = global::MouseWithoutBorders.Properties.Resources.collapse_button_click;
-            this.CollapseHelpButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.collapse_button_hover;
-            this.CollapseHelpButton.Image = global::MouseWithoutBorders.Properties.Resources.collapse_button_normal;
+            this.CollapseHelpButton.DownImage = global::MouseWithoutBorders.Properties.Images.collapse_button_click;
+            this.CollapseHelpButton.HoverImage = global::MouseWithoutBorders.Properties.Images.collapse_button_hover;
+            this.CollapseHelpButton.Image = global::MouseWithoutBorders.Properties.Images.collapse_button_normal;
             this.CollapseHelpButton.Location = new System.Drawing.Point(360, 211);
             this.CollapseHelpButton.Name = "CollapseHelpButton";
-            this.CollapseHelpButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.collapse_button_normal;
+            this.CollapseHelpButton.NormalImage = global::MouseWithoutBorders.Properties.Images.collapse_button_normal;
             this.CollapseHelpButton.Size = new System.Drawing.Size(11, 11);
             this.CollapseHelpButton.TabIndex = 25;
             this.CollapseHelpButton.TabStop = false;
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2b.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2b.Designer.cs
index bf9a0064a4..aa97ce8162 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2b.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2b.Designer.cs
@@ -99,7 +99,7 @@ namespace MouseWithoutBorders
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Image = global::MouseWithoutBorders.Properties.Resources.Mouse;
+            this.pictureBox1.Image = global::MouseWithoutBorders.Properties.Images.Mouse;
             this.pictureBox1.Location = new System.Drawing.Point(206, 365);
             this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
             this.pictureBox1.Name = "pictureBox1";
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.Designer.cs
index 68375996f9..dc92dc0c53 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.Designer.cs
@@ -72,7 +72,7 @@ namespace MouseWithoutBorders
             // 
             // ExamplePicture
             // 
-            this.ExamplePicture.Image = global::MouseWithoutBorders.Properties.Resources.copy_paste_example;
+            this.ExamplePicture.Image = global::MouseWithoutBorders.Properties.Images.copy_paste_example;
             this.ExamplePicture.Location = new System.Drawing.Point(101, 251);
             this.ExamplePicture.Name = "ExamplePicture";
             this.ExamplePicture.Size = new System.Drawing.Size(251, 79);
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
index 4f0da5b209..b7992c9a1a 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
@@ -12,7 +12,7 @@ namespace MouseWithoutBorders
 {
     public partial class SetupPage3a : SettingsFormPage
     {
-        private readonly Image[] _frames = { Resources.copy_paste_example, Resources.drag_example, Resources.keyboard_example };
+        private readonly Image[] _frames = { Images.copy_paste_example, Images.drag_example, Images.keyboard_example };
         private readonly string[] _messages =
         {
                                                   "Copy && paste across screens",
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage4.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage4.Designer.cs
index 7fb84ffc40..f12f2b5f71 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage4.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage4.Designer.cs
@@ -78,7 +78,7 @@ namespace MouseWithoutBorders
             // 
             // ExamplePicture
             // 
-            this.ExamplePicture.Image = global::MouseWithoutBorders.Properties.Resources.combined_example;
+            this.ExamplePicture.Image = global::MouseWithoutBorders.Properties.Images.combined_example;
             this.ExamplePicture.Location = new System.Drawing.Point(75, 283);
             this.ExamplePicture.Name = "ExamplePicture";
             this.ExamplePicture.Size = new System.Drawing.Size(307, 25);
@@ -119,12 +119,12 @@ namespace MouseWithoutBorders
             // NextButton
             // 
             this.NextButton.DisabledImage = null;
-            this.NextButton.DownImage = global::MouseWithoutBorders.Properties.Resources.next_button_click;
-            this.NextButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.next_button_hover;
-            this.NextButton.Image = global::MouseWithoutBorders.Properties.Resources.next_button_normal;
+            this.NextButton.DownImage = global::MouseWithoutBorders.Properties.Images.next_button_click;
+            this.NextButton.HoverImage = global::MouseWithoutBorders.Properties.Images.next_button_hover;
+            this.NextButton.Image = global::MouseWithoutBorders.Properties.Images.next_button_normal;
             this.NextButton.Location = new System.Drawing.Point(199, 366);
             this.NextButton.Name = "NextButton";
-            this.NextButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.next_button_normal;
+            this.NextButton.NormalImage = global::MouseWithoutBorders.Properties.Images.next_button_normal;
             this.NextButton.Size = new System.Drawing.Size(55, 55);
             this.NextButton.TabIndex = 16;
             this.NextButton.TabStop = false;
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage5.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage5.Designer.cs
index d4ff6334fc..aa83f6f8eb 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage5.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage5.Designer.cs
@@ -43,7 +43,7 @@ namespace MouseWithoutBorders
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Image = global::MouseWithoutBorders.Properties.Resources.Mouse;
+            this.pictureBox1.Image = global::MouseWithoutBorders.Properties.Images.Mouse;
             this.pictureBox1.Location = new System.Drawing.Point(206, 40);
             this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
             this.pictureBox1.Name = "pictureBox1";
@@ -106,12 +106,12 @@ namespace MouseWithoutBorders
             // DoneButton
             // 
             this.DoneButton.DisabledImage = null;
-            this.DoneButton.DownImage = global::MouseWithoutBorders.Properties.Resources.done_button_click;
-            this.DoneButton.HoverImage = global::MouseWithoutBorders.Properties.Resources.done_button_hover;
-            this.DoneButton.Image = global::MouseWithoutBorders.Properties.Resources.done_button_normal;
+            this.DoneButton.DownImage = global::MouseWithoutBorders.Properties.Images.done_button_click;
+            this.DoneButton.HoverImage = global::MouseWithoutBorders.Properties.Images.done_button_hover;
+            this.DoneButton.Image = global::MouseWithoutBorders.Properties.Images.done_button_normal;
             this.DoneButton.Location = new System.Drawing.Point(199, 366);
             this.DoneButton.Name = "DoneButton";
-            this.DoneButton.NormalImage = global::MouseWithoutBorders.Properties.Resources.done_button_normal;
+            this.DoneButton.NormalImage = global::MouseWithoutBorders.Properties.Images.done_button_normal;
             this.DoneButton.Size = new System.Drawing.Size(55, 56);
             this.DoneButton.TabIndex = 26;
             this.DoneButton.TabStop = false;
diff --git a/src/modules/MouseWithoutBorders/App/Form/frmAbout.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/frmAbout.Designer.cs
index 75bc1aed18..08b5cdea5f 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmAbout.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmAbout.Designer.cs
@@ -42,7 +42,7 @@
             // logoPictureBox
             // 
             this.logoPictureBox.ErrorImage = null;
-            this.logoPictureBox.Image = global::MouseWithoutBorders.Properties.Resources.Logo;
+            this.logoPictureBox.Image = global::MouseWithoutBorders.Properties.Images.Logo;
             this.logoPictureBox.Location = new System.Drawing.Point(12, 12);
             this.logoPictureBox.Name = "logoPictureBox";
             this.logoPictureBox.Size = new System.Drawing.Size(131, 136);
diff --git a/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs b/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs
index 9f7d30064f..7588122f0b 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.Designer.cs
@@ -237,7 +237,7 @@
             // picLogonLogo
             // 
             this.picLogonLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.picLogonLogo.Image = global::MouseWithoutBorders.Properties.Resources.MouseWithoutBorders;
+            this.picLogonLogo.Image = global::MouseWithoutBorders.Properties.Images.MouseWithoutBorders;
             this.picLogonLogo.Location = new System.Drawing.Point(99, 62);
             this.picLogonLogo.Name = "picLogonLogo";
             this.picLogonLogo.Size = new System.Drawing.Size(95, 17);
diff --git a/src/modules/MouseWithoutBorders/App/Properties/Resources.Designer.cs b/src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs
similarity index 99%
rename from src/modules/MouseWithoutBorders/App/Properties/Resources.Designer.cs
rename to src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs
index 7672c14165..1625d54a5c 100644
--- a/src/modules/MouseWithoutBorders/App/Properties/Resources.Designer.cs
+++ b/src/modules/MouseWithoutBorders/App/Properties/Images.Designer.cs
@@ -22,14 +22,14 @@ namespace MouseWithoutBorders.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    internal class Images {
         
         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() {
+        internal Images() {
         }
         
         /// <summary>
@@ -39,7 +39,7 @@ namespace MouseWithoutBorders.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MouseWithoutBorders.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MouseWithoutBorders.Properties.Images", typeof(Images).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/modules/MouseWithoutBorders/App/Properties/Resources.resx b/src/modules/MouseWithoutBorders/App/Properties/Images.resx
similarity index 100%
rename from src/modules/MouseWithoutBorders/App/Properties/Resources.resx
rename to src/modules/MouseWithoutBorders/App/Properties/Images.resx