diff --git a/src/Greenshot.Base/Controls/AnimatingForm.cs b/src/Greenshot.Base/Controls/AnimatingForm.cs
index 4a2135606..cde3997ae 100644
--- a/src/Greenshot.Base/Controls/AnimatingForm.cs
+++ b/src/Greenshot.Base/Controls/AnimatingForm.cs
@@ -21,8 +21,6 @@
 
 using System;
 using System.Windows.Forms;
-using Greenshot.Base.UnmanagedHelpers;
-using Greenshot.Base.UnmanagedHelpers.Enums;
 using log4net;
 
 namespace Greenshot.Base.Controls
diff --git a/src/Greenshot/Forms/SettingsForm.Designer.cs b/src/Greenshot/Forms/SettingsForm.Designer.cs
index 92eb61eef..e8f284850 100644
--- a/src/Greenshot/Forms/SettingsForm.Designer.cs
+++ b/src/Greenshot/Forms/SettingsForm.Designer.cs
@@ -1257,8 +1257,8 @@ namespace Greenshot.Forms {
 			// 
 			// SettingsForm
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(451, 431);
 			this.Controls.Add(this.tabcontrol);
 			this.Controls.Add(this.settings_confirm);
diff --git a/src/Greenshot/Forms/SettingsForm.cs b/src/Greenshot/Forms/SettingsForm.cs
index 4ac354aca..7fecda8e2 100644
--- a/src/Greenshot/Forms/SettingsForm.cs
+++ b/src/Greenshot/Forms/SettingsForm.cs
@@ -94,6 +94,14 @@ namespace Greenshot.Forms
             // Changes for BUG-2077
             numericUpDown_daysbetweencheck.ValueChanged += NumericUpDownDaysbetweencheckOnValueChanged;
 
+            // Expert mode, the clipboard formats
+            foreach (ClipboardFormat clipboardFormat in Enum.GetValues(typeof(ClipboardFormat)))
+            {
+                ListViewItem item = listview_clipboardformats.Items.Add(Language.Translate(clipboardFormat));
+                item.Tag = clipboardFormat;
+                item.Checked = coreConfiguration.ClipboardFormats.Contains(clipboardFormat);
+            }
+
             _daysBetweenCheckPreviousValue = (int) numericUpDown_daysbetweencheck.Value;
             DisplayPluginTab();
             UpdateUi();
@@ -470,14 +478,6 @@ namespace Greenshot.Forms
         {
             colorButton_window_background.SelectedColor = coreConfiguration.DWMBackgroundColor;
 
-            // Expert mode, the clipboard formats
-            foreach (ClipboardFormat clipboardFormat in Enum.GetValues(typeof(ClipboardFormat)))
-            {
-                ListViewItem item = listview_clipboardformats.Items.Add(Language.Translate(clipboardFormat));
-                item.Tag = clipboardFormat;
-                item.Checked = coreConfiguration.ClipboardFormats.Contains(clipboardFormat);
-            }
-
             if (Language.CurrentLanguage != null)
             {
                 combobox_language.SelectedValue = Language.CurrentLanguage;