diff --git a/SoundSwitch/Properties/SettingsString.Designer.cs b/SoundSwitch/Properties/SettingsString.Designer.cs
index 2c0016cb7f..75987ffd36 100644
--- a/SoundSwitch/Properties/SettingsString.Designer.cs
+++ b/SoundSwitch/Properties/SettingsString.Designer.cs
@@ -132,6 +132,15 @@ internal static string connected {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cycle through.
+        /// </summary>
+        internal static string cycleDevice {
+            get {
+                return ResourceManager.GetString("cycleDevice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Disconnected.
         /// </summary>
@@ -159,6 +168,15 @@ internal static string hotkeyUncheckExplanation {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Keep systray icon.
+        /// </summary>
+        internal static string keepSystrayIcon {
+            get {
+                return ResourceManager.GetString("keepSystrayIcon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Notification.
         /// </summary>
diff --git a/SoundSwitch/Properties/SettingsString.fr.resx b/SoundSwitch/Properties/SettingsString.fr.resx
index b67cfe85a3..4902c79d2c 100644
--- a/SoundSwitch/Properties/SettingsString.fr.resx
+++ b/SoundSwitch/Properties/SettingsString.fr.resx
@@ -169,4 +169,7 @@
 	<data name="tooltip" xml:space="preserve">
 		<value>Information lors du survol</value>
 	</data>
+	<data name="cycleDevice" xml:space="preserve">
+		<value>Switcher entre</value>
+	</data>
 </root>
\ No newline at end of file
diff --git a/SoundSwitch/Properties/SettingsString.resx b/SoundSwitch/Properties/SettingsString.resx
index 1adb0c972b..396a3b6033 100644
--- a/SoundSwitch/Properties/SettingsString.resx
+++ b/SoundSwitch/Properties/SettingsString.resx
@@ -169,4 +169,10 @@
 	<data name="tooltip" xml:space="preserve">
 		<value>Tooltip on hover</value>
 	</data>
+	<data name="cycleDevice" xml:space="preserve">
+		<value>Cycle through</value>
+	</data>
+	<data name="keepSystrayIcon" xml:space="preserve">
+		<value>Keep systray icon</value>
+	</data>
 </root>
\ No newline at end of file
diff --git a/SoundSwitch/UI/Forms/Settings.Designer.cs b/SoundSwitch/UI/Forms/Settings.Designer.cs
index 009a77bf6e..5fadcde42d 100644
--- a/SoundSwitch/UI/Forms/Settings.Designer.cs
+++ b/SoundSwitch/UI/Forms/Settings.Designer.cs
@@ -57,6 +57,7 @@ private void InitializeComponent()
             this.hotkeysLabel = new System.Windows.Forms.Label();
             this.selectSoundFileDialog = new System.Windows.Forms.OpenFileDialog();
             this.hotkeysCheckbox = new System.Windows.Forms.CheckBox();
+            this.checkboxSystrayIcon = new System.Windows.Forms.CheckBox();
             this.tabControl.SuspendLayout();
             this.playbackPage.SuspendLayout();
             this.recordingPage.SuspendLayout();
@@ -70,7 +71,7 @@ private void InitializeComponent()
             // 
             this.RunAtStartup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.RunAtStartup.AutoSize = true;
-            this.RunAtStartup.Location = new System.Drawing.Point(6, 23);
+            this.RunAtStartup.Location = new System.Drawing.Point(6, 19);
             this.RunAtStartup.Name = "RunAtStartup";
             this.RunAtStartup.Size = new System.Drawing.Size(95, 17);
             this.RunAtStartup.TabIndex = 7;
@@ -94,7 +95,7 @@ private void InitializeComponent()
             // 
             this.communicationCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.communicationCheckbox.AutoSize = true;
-            this.communicationCheckbox.Location = new System.Drawing.Point(6, 34);
+            this.communicationCheckbox.Location = new System.Drawing.Point(6, 38);
             this.communicationCheckbox.Name = "communicationCheckbox";
             this.communicationCheckbox.Size = new System.Drawing.Size(140, 17);
             this.communicationCheckbox.TabIndex = 12;
@@ -236,18 +237,18 @@ private void InitializeComponent()
             this.audioSettingsGroup.Controls.Add(this.selectSoundButton);
             this.audioSettingsGroup.Controls.Add(this.notifLabel);
             this.audioSettingsGroup.Controls.Add(this.notificationComboBox);
-            this.audioSettingsGroup.Location = new System.Drawing.Point(3, 55);
+            this.audioSettingsGroup.Location = new System.Drawing.Point(3, 71);
             this.audioSettingsGroup.Name = "audioSettingsGroup";
-            this.audioSettingsGroup.Size = new System.Drawing.Size(312, 175);
+            this.audioSettingsGroup.Size = new System.Drawing.Size(312, 179);
             this.audioSettingsGroup.TabIndex = 13;
             this.audioSettingsGroup.TabStop = false;
-            this.audioSettingsGroup.Text = "Audio Settings";
+            this.audioSettingsGroup.Text = global::SoundSwitch.Properties.SettingsString.audioSettings;
             // 
             // cyclerLabel
             // 
             this.cyclerLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cyclerLabel.AutoSize = true;
-            this.cyclerLabel.Location = new System.Drawing.Point(6, 150);
+            this.cyclerLabel.Location = new System.Drawing.Point(6, 154);
             this.cyclerLabel.Name = "cyclerLabel";
             this.cyclerLabel.Size = new System.Drawing.Size(72, 13);
             this.cyclerLabel.TabIndex = 23;
@@ -258,7 +259,7 @@ private void InitializeComponent()
             this.cyclerComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cyclerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cyclerComboBox.FormattingEnabled = true;
-            this.cyclerComboBox.Location = new System.Drawing.Point(98, 146);
+            this.cyclerComboBox.Location = new System.Drawing.Point(98, 150);
             this.cyclerComboBox.Name = "cyclerComboBox";
             this.cyclerComboBox.Size = new System.Drawing.Size(177, 21);
             this.cyclerComboBox.TabIndex = 22;
@@ -268,7 +269,7 @@ private void InitializeComponent()
             // 
             this.tooltipLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.tooltipLabel.AutoSize = true;
-            this.tooltipLabel.Location = new System.Drawing.Point(6, 110);
+            this.tooltipLabel.Location = new System.Drawing.Point(6, 114);
             this.tooltipLabel.Name = "tooltipLabel";
             this.tooltipLabel.Size = new System.Drawing.Size(86, 13);
             this.tooltipLabel.TabIndex = 21;
@@ -279,7 +280,7 @@ private void InitializeComponent()
             this.tooltipInfoComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.tooltipInfoComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.tooltipInfoComboBox.FormattingEnabled = true;
-            this.tooltipInfoComboBox.Location = new System.Drawing.Point(98, 106);
+            this.tooltipInfoComboBox.Location = new System.Drawing.Point(98, 110);
             this.tooltipInfoComboBox.Name = "tooltipInfoComboBox";
             this.tooltipInfoComboBox.Size = new System.Drawing.Size(177, 21);
             this.tooltipInfoComboBox.TabIndex = 20;
@@ -288,7 +289,7 @@ private void InitializeComponent()
             // selectSoundButton
             // 
             this.selectSoundButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.selectSoundButton.Location = new System.Drawing.Point(281, 66);
+            this.selectSoundButton.Location = new System.Drawing.Point(281, 70);
             this.selectSoundButton.Name = "selectSoundButton";
             this.selectSoundButton.Size = new System.Drawing.Size(24, 23);
             this.selectSoundButton.TabIndex = 19;
@@ -301,7 +302,7 @@ private void InitializeComponent()
             // 
             this.notifLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.notifLabel.AutoSize = true;
-            this.notifLabel.Location = new System.Drawing.Point(6, 72);
+            this.notifLabel.Location = new System.Drawing.Point(6, 76);
             this.notifLabel.Name = "notifLabel";
             this.notifLabel.Size = new System.Drawing.Size(60, 13);
             this.notifLabel.TabIndex = 17;
@@ -312,7 +313,7 @@ private void InitializeComponent()
             this.notificationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.notificationComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.notificationComboBox.FormattingEnabled = true;
-            this.notificationComboBox.Location = new System.Drawing.Point(98, 67);
+            this.notificationComboBox.Location = new System.Drawing.Point(98, 71);
             this.notificationComboBox.Name = "notificationComboBox";
             this.notificationComboBox.Size = new System.Drawing.Size(177, 21);
             this.notificationComboBox.TabIndex = 16;
@@ -320,13 +321,14 @@ private void InitializeComponent()
             // 
             // basicSettingsGroup
             // 
+            this.basicSettingsGroup.Controls.Add(this.checkboxSystrayIcon);
             this.basicSettingsGroup.Controls.Add(this.RunAtStartup);
             this.basicSettingsGroup.Location = new System.Drawing.Point(3, 3);
             this.basicSettingsGroup.Name = "basicSettingsGroup";
-            this.basicSettingsGroup.Size = new System.Drawing.Size(312, 46);
+            this.basicSettingsGroup.Size = new System.Drawing.Size(312, 62);
             this.basicSettingsGroup.TabIndex = 0;
             this.basicSettingsGroup.TabStop = false;
-            this.basicSettingsGroup.Text = "Basic Settings";
+            this.basicSettingsGroup.Text = global::SoundSwitch.Properties.SettingsString.basicSettings;
             // 
             // hotkeyTextBox
             // 
@@ -361,6 +363,17 @@ private void InitializeComponent()
             this.hotkeysCheckbox.UseVisualStyleBackColor = true;
             this.hotkeysCheckbox.CheckedChanged += new System.EventHandler(this.hotkeysCheckbox_CheckedChanged);
             // 
+            // checkboxSystrayIcon
+            // 
+            this.checkboxSystrayIcon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.checkboxSystrayIcon.AutoSize = true;
+            this.checkboxSystrayIcon.Location = new System.Drawing.Point(6, 39);
+            this.checkboxSystrayIcon.Name = "checkboxSystrayIcon";
+            this.checkboxSystrayIcon.Size = new System.Drawing.Size(109, 17);
+            this.checkboxSystrayIcon.TabIndex = 8;
+            this.checkboxSystrayIcon.Text = global::SoundSwitch.Properties.SettingsString.keepSystrayIcon;
+            this.checkboxSystrayIcon.UseVisualStyleBackColor = true;
+            // 
             // Settings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -416,5 +429,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label tooltipLabel;
         private System.Windows.Forms.Label cyclerLabel;
         private System.Windows.Forms.ComboBox cyclerComboBox;
+        private System.Windows.Forms.CheckBox checkboxSystrayIcon;
     }
 }
\ No newline at end of file