diff --git a/GUI/SensorNotifyIcon.cs b/GUI/SensorNotifyIcon.cs
index 5b73fa3..763fcfd 100644
--- a/GUI/SensorNotifyIcon.cs
+++ b/GUI/SensorNotifyIcon.cs
@@ -53,8 +53,6 @@ namespace OpenHardwareMonitor.GUI {
         "traycolor").ToString(), defaultColor);      
       
       this.pen = new Pen(Color.FromArgb(96, Color.Black));
-      this.font = SystemFonts.MessageBoxFont;
-      this.smallFont = new Font(font.FontFamily, font.Size * 0.8f);
 
       ContextMenu contextMenu = new ContextMenu();
       MenuItem hideShowItem = new MenuItem("Hide/Show");
@@ -88,7 +86,7 @@ namespace OpenHardwareMonitor.GUI {
       this.notifyIcon.ContextMenu = contextMenu;
       this.notifyIcon.DoubleClick += delegate(object obj, EventArgs args) {
         sensorSystemTray.SendHideShowCommand();
-      };
+      };      
 
       // get the default dpi to create an icon with the correct size
       float dpiX, dpiY;
@@ -102,8 +100,22 @@ namespace OpenHardwareMonitor.GUI {
       int height = (int)Math.Round(16 * dpiY / 96);
 
       // make sure it does never get smaller than 16x16
-      width = width < 16 ? 16: width;
-      height = height < 16 ? 16: height;
+      width = width < 16 ? 16 : width;
+      height = height < 16 ? 16 : height;
+
+      // adjust the font size to the icon size
+      FontFamily family = SystemFonts.MessageBoxFont.FontFamily;
+      float baseSize;
+      switch (family.Name) {
+        case "Segoe UI": baseSize = 12; break;
+        case "Tahoma": baseSize = 11; break;
+        default: baseSize = 12; break;
+      }
+
+      this.font = new Font(family,
+        baseSize * width / 16.0f, GraphicsUnit.Pixel);
+      this.smallFont = new Font(family, 
+        0.75f * baseSize * width / 16.0f, GraphicsUnit.Pixel);
 
       this.bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);      
       this.graphics = Graphics.FromImage(this.bitmap);
@@ -151,6 +163,7 @@ namespace OpenHardwareMonitor.GUI {
       pen.Dispose();
       graphics.Dispose();      
       bitmap.Dispose();
+      font.Dispose();
       smallFont.Dispose();
     }
 
@@ -169,7 +182,7 @@ namespace OpenHardwareMonitor.GUI {
           if (unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit)
             return string.Format("{0:F0}", 
               UnitManager.CelsiusToFahrenheit(sensor.Value));
-          else 
+          else
             return string.Format("{0:F0}", sensor.Value);
         case SensorType.Fan: 
           return string.Format("{0:F1}", 1e-3f * sensor.Value);
diff --git a/OpenHardwareMonitor.csproj b/OpenHardwareMonitor.csproj
index 1217708..5e0473f 100644
--- a/OpenHardwareMonitor.csproj
+++ b/OpenHardwareMonitor.csproj
@@ -173,7 +173,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="Resources\app.manifest" />
+    <None Include="Resources\app.manifest">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Resources\icon.ico" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs
index 7e19d30..33ee70c 100644
--- a/Properties/AssemblyVersion.cs
+++ b/Properties/AssemblyVersion.cs
@@ -10,5 +10,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.4.0.17")]
-[assembly: AssemblyInformationalVersion("0.4.0.17 Alpha")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.4.0.18")]
+[assembly: AssemblyInformationalVersion("0.4.0.18 Alpha")]
\ No newline at end of file
diff --git a/Resources/app.manifest b/Resources/app.manifest
index 7d8f835..9724afc 100644
--- a/Resources/app.manifest
+++ b/Resources/app.manifest
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" 
+  xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" 
+  xmlns:asmv2="urn:schemas-microsoft-com:asm.v2"
+  xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -7,4 +11,9 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
 </asmv1:assembly>