diff --git a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs
index 6d0087fbd2b..c019ea89cef 100644
--- a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs
@@ -252,35 +252,22 @@ public bool DrawDefault {
 		protected virtual void DrawBackground(DrawTreeNodeEventArgs e)
 		{
 			Graphics g = e.Graphics;
-			int width = MeasureItemWidth(e) + 2;
+			int width = MeasureItemWidth(e);
 			Rectangle backRect = new Rectangle(e.Bounds.X, e.Bounds.Y, width, e.Bounds.Height);
 			
-			if ((e.State & (TreeNodeStates.Selected | TreeNodeStates.Focused)) == TreeNodeStates.Selected) {
+			if ((e.State & SelectedAndFocused) == TreeNodeStates.Selected) {
 				g.FillRectangle(SystemBrushes.Control, backRect);
 			} else if ((e.State & TreeNodeStates.Selected) == TreeNodeStates.Selected) {
 				g.FillRectangle(SystemBrushes.Highlight, backRect);
+				ControlPaint.DrawFocusRectangle(e.Graphics, backRect);
 			} else {
 				g.FillRectangle(SystemBrushes.Window, backRect);
 			}
-			
-			if ((e.State & TreeNodeStates.Focused) == TreeNodeStates.Focused) {
-				backRect.Width--;
-				backRect.Height--;
-				using (Pen dottedPen = new Pen(SystemColors.WindowText)) {
-					dottedPen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
-					g.DrawRectangle(dottedPen, backRect);
-					Color h = SystemColors.Highlight;
-					dottedPen.Color = Color.FromArgb(255 - h.R, 255 - h.G, 255 - h.B);
-					dottedPen.DashOffset = 1;
-					g.DrawRectangle(dottedPen, backRect);
-				}
-				g.DrawLine(SystemPens.WindowText, backRect.Right + 1, backRect.Y, backRect.Right + 1, backRect.Bottom);
-			}
 		}
 		
 		protected virtual int MeasureItemWidth(DrawTreeNodeEventArgs e)
 		{
-			return MeasureTextWidth(e.Graphics, Text, TreeView.Font);
+			return MeasureTextWidth(e.Graphics, Text, e.Node.NodeFont);
 		}
 		
 		protected virtual void DrawForeground(DrawTreeNodeEventArgs e)
@@ -296,27 +283,22 @@ public void Draw(DrawTreeNodeEventArgs e)
 		// Helper routines
 		protected int MeasureTextWidth(Graphics g, string text, Font font)
 		{
-			SizeF size = g.MeasureString(text, font);
+			var size = TextRenderer.MeasureText(text, font);
 			return (int)size.Width;
 		}
 		
 		const TreeNodeStates SelectedAndFocused = TreeNodeStates.Selected | TreeNodeStates.Focused;
 		
-		protected void DrawText(DrawTreeNodeEventArgs e, string text, Brush brush, Font font)
+		protected void DrawText(DrawTreeNodeEventArgs e, string text, Color color, Font font)
 		{
 			float x = e.Bounds.X;
-			DrawText(e, text, brush, font, ref x);
+			DrawText(e, text, color, font, ref x);
 		}
 		
-		protected void DrawText(DrawTreeNodeEventArgs e, string text, Brush brush, Font font, ref float x)
+		protected void DrawText(DrawTreeNodeEventArgs e, string text, Color color, Font font, ref float x)
 		{
-			if ((e.State & SelectedAndFocused) == SelectedAndFocused) {
-				brush = SystemBrushes.HighlightText;
-			}
-			e.Graphics.DrawString(text, font, brush, new PointF(x, e.Bounds.Y));
-			
-			SizeF size = e.Graphics.MeasureString(text, font);
-			x += size.Width;
+			color = GetTextColor(e.State, color);
+			TextRenderer.DrawText(e.Graphics, text, font, new Point((int) x, e.Bounds.Y), color);
 		}
 		
 		protected Color GetTextColor(TreeNodeStates state, Color c)
@@ -353,7 +335,7 @@ public static Font ItalicMonospacedFont {
 		
 		public static Font RegularDefaultFont {
 			get {
-				return TreeView.DefaultFont;
+				return SystemFonts.MessageBoxFont;
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
index b6d56fb2319..a137affdd49 100644
--- a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
@@ -362,7 +362,7 @@ protected override void OnDrawNode(DrawTreeNodeEventArgs e)
 						// HACK: work around TreeView bug in OwnerDrawText mode:
 						// overpaint blue selection with the correct gray selection
 						e.Graphics.FillRectangle(SystemBrushes.Control, e.Bounds);
-						e.Graphics.DrawString(e.Node.Text, this.Font, SystemBrushes.ControlText, e.Bounds.Location);
+						TextRenderer.DrawText(e.Graphics, e.Node.Text, this.Font, e.Bounds.Location, SystemColors.ControlText);
 						e.DrawDefault = false;
 					} else {
 						e.DrawDefault = true;
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs
index c24643a6aa9..6ee99657589 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs
@@ -123,7 +123,7 @@ protected override int MeasureItemWidth(DrawTreeNodeEventArgs e)
 		protected override void DrawForeground(DrawTreeNodeEventArgs e)
 		{
 			if (isStartupProject) {
-				DrawText(e, this.Text, SystemBrushes.WindowText, BoldDefaultFont);
+				DrawText(e, this.Text, SystemColors.WindowText, BoldDefaultFont);
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.Core.WinForms/WinFormsResourceService.cs b/src/Main/ICSharpCode.Core.WinForms/WinFormsResourceService.cs
index c68d23fd670..6fd91cb3a88 100644
--- a/src/Main/ICSharpCode.Core.WinForms/WinFormsResourceService.cs
+++ b/src/Main/ICSharpCode.Core.WinForms/WinFormsResourceService.cs
@@ -153,7 +153,7 @@ public static Font LoadFont(string fontName, int size, FontStyle style, Graphics
 		public static Font LoadFont(Font baseFont, FontStyle newStyle)
 		{
 			try {
-				return new Font(baseFont, newStyle);
+				return new Font(baseFont.FontFamily.Name, (int) Math.Ceiling(baseFont.Size), newStyle, baseFont.Unit);
 			} catch (Exception ex) {
 				LoggingService.Warn(ex);
 				return baseFont;