diff --git a/Greenshot/Forms/AboutForm.Designer.cs b/Greenshot/Forms/AboutForm.Designer.cs
index 8b7c34e7d..1b35f8699 100644
--- a/Greenshot/Forms/AboutForm.Designer.cs
+++ b/Greenshot/Forms/AboutForm.Designer.cs
@@ -67,7 +67,7 @@ namespace Greenshot.Forms {
 			// 
 			// lblTitle
 			// 
-			this.lblTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(0)));
+			this.lblTitle.Font = new System.Drawing.Font(System.Drawing.FontFamily.GenericSansSerif, 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.lblTitle.Location = new System.Drawing.Point(108, 12);
 			this.lblTitle.Name = "lblTitle";
 			this.lblTitle.Size = new System.Drawing.Size(263, 19);
diff --git a/Greenshot/Forms/CaptureForm.Designer.cs b/Greenshot/Forms/CaptureForm.Designer.cs
index b3cf10288..ee3b43b99 100644
--- a/Greenshot/Forms/CaptureForm.Designer.cs
+++ b/Greenshot/Forms/CaptureForm.Designer.cs
@@ -55,8 +55,8 @@ namespace Greenshot.Forms {
 			// 
 			// CaptureForm
 			// 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(0, 0);
 			this.Cursor = System.Windows.Forms.Cursors.Cross;
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs
index 04da3d0a0..cce905007 100644
--- a/Greenshot/Forms/ImageEditorForm.Designer.cs
+++ b/Greenshot/Forms/ImageEditorForm.Designer.cs
@@ -231,8 +231,8 @@ namespace Greenshot {
 			// 
 			// topToolStripContainer
 			// 
-			this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-			this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.topToolStripContainer.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.topToolStripContainer.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			// 
 			// topToolStripContainer.BottomToolStripPanel
 			// 
@@ -1037,7 +1037,6 @@ namespace Greenshot {
 			// 
 			// propertiesToolStrip
 			// 
-			this.propertiesToolStrip.AutoSize = false;
 			this.propertiesToolStrip.ClickThrough = true;
 			this.propertiesToolStrip.ImageScalingSize = coreConfiguration.ScaledIconSize;
 			this.propertiesToolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1225,7 +1224,6 @@ namespace Greenshot {
 			// fontFamilyComboBox
 			// 
 			this.fontFamilyComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.fontFamilyComboBox.AutoSize = false;
 			this.fontFamilyComboBox.MaxDropDownItems = 20;
 			this.fontFamilyComboBox.Name = "fontFamilyComboBox";
 			this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 20);
@@ -1815,8 +1813,8 @@ namespace Greenshot {
 			// 
 			// ImageEditorForm
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(785, 485);
 			this.Controls.Add(this.topToolStripContainer);
 			this.KeyPreview = true;
diff --git a/GreenshotPlugin/Core/AbstractDestination.cs b/GreenshotPlugin/Core/AbstractDestination.cs
index c76f036d6..ba9878c23 100644
--- a/GreenshotPlugin/Core/AbstractDestination.cs
+++ b/GreenshotPlugin/Core/AbstractDestination.cs
@@ -161,8 +161,10 @@ namespace GreenshotPlugin.Core {
 				var screenDpi = DpiHelper.GetDpi(menu.Location);
 				var scaledIconSize = DpiHelper.ScaleWithDpi(CoreConfig.IconSize, screenDpi);
                 menu.SuspendLayout();
-				menu.ImageScalingSize = scaledIconSize;
-                menu.ResumeLayout();
+                var fontSize = DpiHelper.ScaleWithDpi(12f, screenDpi);
+				menu.Font = new Font(FontFamily.GenericSansSerif, fontSize, FontStyle.Regular, GraphicsUnit.Pixel);
+                menu.ImageScalingSize = scaledIconSize;
+				menu.ResumeLayout();
 			};
 
 			menu.Closing += delegate(object source, ToolStripDropDownClosingEventArgs eventArgs) {