diff --git a/GUI/SensorNotifyIcon.cs b/GUI/SensorNotifyIcon.cs
index dc50a19..324359a 100644
--- a/GUI/SensorNotifyIcon.cs
+++ b/GUI/SensorNotifyIcon.cs
@@ -74,7 +74,7 @@ namespace OpenHardwareMonitor.GUI {
       Color = Config.Get(sensor.Identifier + "/traycolor", defaultColor);      
       
       this.pen = new Pen(Color.FromArgb(96, Color.Black));
-      this.font = new Font(SystemFonts.StatusFont.FontFamily, 9);
+      this.font = new Font(SystemFonts.MessageBoxFont.FontFamily, 9);
 
       ContextMenuStrip contextMenuStrip = new ContextMenuStrip();
       ToolStripMenuItem removeItem = new ToolStripMenuItem("Remove");
diff --git a/Hardware/Mainboard/Manufacturer.cs b/Hardware/Mainboard/Manufacturer.cs
index e306323..101e7de 100644
--- a/Hardware/Mainboard/Manufacturer.cs
+++ b/Hardware/Mainboard/Manufacturer.cs
@@ -45,6 +45,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
     DFI,
     EPoX,
     Gigabyte,
+    IBM,
     MSI,
     Unkown    
   }
diff --git a/Hardware/Mainboard/SMBIOS.cs b/Hardware/Mainboard/SMBIOS.cs
index 0e1ce31..d5d33b9 100644
--- a/Hardware/Mainboard/SMBIOS.cs
+++ b/Hardware/Mainboard/SMBIOS.cs
@@ -200,13 +200,16 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
           case "ASUSTeK Computer INC.":
             manufacturer = Manufacturer.ASUS; break;
           case "DFI":
-          case "DFI Inc.:":
+          case "DFI Inc.":            
             manufacturer = Manufacturer.DFI; break;
           case "EPoX COMPUTER CO., LTD":
             manufacturer = Manufacturer.EPoX; break;
           case "Gigabyte Technology Co., Ltd.":
             manufacturer = Manufacturer.Gigabyte; break;
+          case "IBM":
+            manufacturer = Manufacturer.IBM; break;
           case "MICRO-STAR INTERNATIONAL CO., LTD":
+          case "MICRO-STAR INTERNATIONAL CO.,LTD":
             manufacturer = Manufacturer.MSI; break;
           default:
             manufacturer = Manufacturer.Unkown; break;