diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
index da35b32b..6ea3c739 100755
--- a/SparkleShare/Mac/SparkleEventLog.cs
+++ b/SparkleShare/Mac/SparkleEventLog.cs
@@ -115,7 +115,7 @@ namespace SparkleShare {
                     new PointF (60, ContentView.Frame.Height - 27),
                     new SizeF (60, 20)),
                 StringValue     = "…",
-                Font            = SparkleUI.BoldFont
+                Font            = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize)
             };
 
 
@@ -140,7 +140,7 @@ namespace SparkleShare {
                     new SizeF (60, 20)
                 ),
                 StringValue     = "…",
-                Font            = SparkleUI.BoldFont
+                Font            = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize)
             };
 
             this.popup_button = new NSPopUpButton () {
diff --git a/SparkleShare/Mac/SparkleNote.cs b/SparkleShare/Mac/SparkleNote.cs
index 2c3ec1f7..9b9cbf2d 100755
--- a/SparkleShare/Mac/SparkleNote.cs
+++ b/SparkleShare/Mac/SparkleNote.cs
@@ -100,7 +100,7 @@ namespace SparkleShare {
                     new PointF (85, ContentView.Frame.Height - 41),
                     new SizeF (320, 22)),
                 StringValue     = Program.Controller.CurrentUser.Name,
-                Font            = SparkleUI.BoldFont
+                Font            = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize)
             };
             
             this.user_email_text_field = new NSTextField () {
diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index a3b4048c..2145bff7 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -145,19 +145,20 @@ namespace SparkleShare {
                 Description = "Do you want to add this project to SparkleShare?";
 
                 AddressLabel       = new SparkleLabel ("Address:", NSTextAlignment.Right);
-                AddressLabel.Frame = new RectangleF (165, Frame.Height - 240, 160, 17);
+                AddressLabel.Frame = new RectangleF (165, Frame.Height - 238, 160, 17);
+                AddressLabel.Font  = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize);
      
                 AddressTextField = new SparkleLabel (Controller.PendingInvite.Address, NSTextAlignment.Left) {
-                    Frame = new RectangleF (330, Frame.Height - 240, 260, 17),
-                    Font  = SparkleUI.BoldFont
+                    Frame = new RectangleF (330, Frame.Height - 240, 260, 17)
                 };
 
                 PathLabel       = new SparkleLabel ("Remote Path:", NSTextAlignment.Right);
-                PathLabel.Frame = new RectangleF (165, Frame.Height - 264, 160, 17);
+                PathLabel.Frame = new RectangleF (165, Frame.Height - 262, 160, 17);
+                PathLabel.Font  = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize);
+
 
                 PathTextField = new SparkleLabel (Controller.PendingInvite.RemotePath, NSTextAlignment.Left) {
-                    Frame = new RectangleF (330, Frame.Height - 264, 260, 17),
-                    Font  = SparkleUI.BoldFont
+                    Frame = new RectangleF (330, Frame.Height - 264, 260, 17)
                 };
 
                 CancelButton = new NSButton () { Title = "Cancel" };
@@ -183,12 +184,11 @@ namespace SparkleShare {
 
                 AddressLabel = new SparkleLabel ("Address:", NSTextAlignment.Left) {
                     Frame = new RectangleF (190, Frame.Height - 308, 160, 17),
-                    Font  = SparkleUI.BoldFont
+                    Font  = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize)
                 };
 
                 AddressTextField = new NSTextField () {
                     Frame       = new RectangleF (190, Frame.Height - 336, 196, 22),
-                    Font        = SparkleUI.Font,
                     Enabled     = (Controller.SelectedPlugin.Address == null),
                     Delegate    = new SparkleTextFieldDelegate (),
                     StringValue = "" + Controller.PreviousAddress
@@ -198,7 +198,7 @@ namespace SparkleShare {
 
                 PathLabel = new SparkleLabel ("Remote Path:", NSTextAlignment.Left) {
                     Frame = new RectangleF (190 + 196 + 16, Frame.Height - 308, 160, 17),
-                    Font  = SparkleUI.BoldFont
+                    Font  = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize)
                 };
 
                 PathTextField = new NSTextField () {
@@ -212,22 +212,18 @@ namespace SparkleShare {
 
                 PathHelpLabel = new SparkleLabel (Controller.SelectedPlugin.PathExample, NSTextAlignment.Left) {
                     TextColor       = NSColor.DisabledControlText,
-                    Frame           = new RectangleF (190 + 196 + 16, Frame.Height - 355, 204, 17),
-                    Font            = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande",
-                        NSFontTraitMask.Condensed, 0, 11),
+                    Frame           = new RectangleF (190 + 196 + 16, Frame.Height - 358, 204, 19)
                 };
 
                 AddressHelpLabel = new SparkleLabel (Controller.SelectedPlugin.AddressExample, NSTextAlignment.Left) {
                     TextColor       = NSColor.DisabledControlText,
-                    Frame           = new RectangleF (190, Frame.Height - 355, 204, 17),
-                    Font            = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande",
-                        NSFontTraitMask.Condensed, 0, 11),
+                    Frame           = new RectangleF (190, Frame.Height - 358, 204, 19)
                 };
 
                 if (TableView == null || TableView.RowCount != Controller.Plugins.Count) {
                     TableView = new NSTableView () {
                         Frame            = new RectangleF (0, 0, 0, 0),
-                        RowHeight        = 34,
+                        RowHeight        = 38,
                         IntercellSpacing = new SizeF (8, 12),
                         HeaderView       = null,
                         Delegate         = new SparkleTableViewDelegate ()
@@ -252,8 +248,8 @@ namespace SparkleShare {
                         Editable      = false
                     };
 
-                    DescriptionColumn.DataCell.Font = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande",
-                        NSFontTraitMask.Condensed, 0, 11);
+                    DescriptionColumn.DataCell.Font = NSFontManager.SharedFontManager.FontWithFamily (
+                        SparkleUI.FontName, NSFontTraitMask.Condensed, 0, 11);
 
                     TableView.AddColumn (IconColumn);
                     TableView.AddColumn (DescriptionColumn);
@@ -407,7 +403,7 @@ namespace SparkleShare {
 
                 string html = "<style>" +
                     "* {" +
-                    "  font-family: 'Lucida Grande';" +
+                    "  font-family: '" + SparkleUI.FontName + " Bold" + "';" +
                     "  font-size: 12px; cursor: default;" +
                     "}" +
                     "body {" +
@@ -473,8 +469,8 @@ namespace SparkleShare {
                     extra_pos_y = 20;
   
                 PasswordLabel = new SparkleLabel ("Password:", NSTextAlignment.Right) {
-                    Frame           = new RectangleF (155, Frame.Height - 204 - extra_pos_y, 160, 17),
-                    Font            = SparkleUI.BoldFont
+                    Frame           = new RectangleF (155, Frame.Height - 202 - extra_pos_y, 160, 17),
+                    Font            = NSFont.FromFontName (SparkleUI.FontName + " Bold", NSFont.SystemFontSize)
                 };
 
                 PasswordTextField = new NSSecureTextField () {
@@ -748,14 +744,14 @@ namespace SparkleShare {
 
                 NSTextFieldCell cell = new NSTextFieldCell ();
 
-                NSData name_data = NSData.FromString ("<font face='Lucida Grande'><b>" + plugin.Name + "</b></font>");
+                NSData name_data = NSData.FromString ("<font face='" + SparkleUI.FontName + "'><b>" + plugin.Name + "</b></font>");
 
                 NSDictionary name_dictionary       = new NSDictionary();
                 NSAttributedString name_attributes = new NSAttributedString (
                     name_data, new NSUrl ("file://"), out name_dictionary);
 
                 NSData description_data = NSData.FromString (
-                    "<small><font style='line-height: 150%' color='#aaa' face='Lucida Grande'>" + plugin.Description + "</font></small>");
+                    "<small><font style='line-height: 150%' color='#aaa' face='" + SparkleUI.FontName + "'>" + plugin.Description + "</font></small>");
 
                 NSDictionary description_dictionary       = new NSDictionary();
                 NSAttributedString description_attributes = new NSAttributedString (
@@ -771,14 +767,14 @@ namespace SparkleShare {
                 NSTextFieldCell selected_cell = new NSTextFieldCell ();
 
                 NSData selected_name_data = NSData.FromString (
-                    "<font color='white' face='Lucida Grande'><b>" + plugin.Name + "</b></font>");
+                    "<font color='white' face='" + SparkleUI.FontName +"'><b>" + plugin.Name + "</b></font>");
 
                 NSDictionary selected_name_dictionary = new NSDictionary ();
                 NSAttributedString selected_name_attributes = new NSAttributedString (
                     selected_name_data, new NSUrl ("file://"), out selected_name_dictionary);
 
                 NSData selected_description_data = NSData.FromString (
-                    "<small><font style='line-height: 150%' color='#9bbaeb' face='Lucida Grande'>" +
+                    "<small><font style='line-height: 150%' color='#9bbaeb' face='" + SparkleUI.FontName + "'>" +
                     plugin.Description + "</font></small>");
 
                 NSDictionary selected_description_dictionary       = new NSDictionary ();
@@ -877,7 +873,6 @@ namespace SparkleShare {
             BackgroundColor = NSColor.WindowBackground;
             Bordered        = false;
             Editable        = false;
-            Font            = SparkleUI.Font;
         }
     }
 }
diff --git a/SparkleShare/Mac/SparkleSetupWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs
index 11e8d865..a0dcb8a2 100755
--- a/SparkleShare/Mac/SparkleSetupWindow.cs
+++ b/SparkleShare/Mac/SparkleSetupWindow.cs
@@ -62,13 +62,11 @@ namespace SparkleShare {
             this.header_text_field = new SparkleLabel ("", NSTextAlignment.Left) {
                 Frame = new RectangleF (190, Frame.Height - 80, Frame.Width, 24),
                 Font  = NSFontManager.SharedFontManager.FontWithFamily (
-                    "Lucida Grande", NSFontTraitMask.Bold, 0, 15),
+                    SparkleUI.FontName, NSFontTraitMask.Bold, 0, 16)
             };
 
             this.description_text_field = new SparkleLabel ("", NSTextAlignment.Left) {
-                Frame = new RectangleF (190, Frame.Height - 130, 640 - 240, 44),
-                Font  = NSFontManager.SharedFontManager.FontWithFamily (
-                    "Lucida Grande", NSFontTraitMask.Condensed, 0, 13)
+                Frame = new RectangleF (190, Frame.Height - 130, 640 - 240, 44)
             };
 
             this.header_text_field.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail;
@@ -106,7 +104,6 @@ namespace SparkleShare {
                 foreach (NSButton button in Buttons) {
                     button.BezelStyle = NSBezelStyle.Rounded;
                     button.Frame      = new RectangleF (Frame.Width - 15 - x - (105 * i), 12, 105, 32);
-                    button.Font       = SparkleUI.Font;
 
                     // Make the button a bit wider if the text is likely to be longer
                     if (button.Title.Contains (" ")) {
diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index d187eb9a..bcd148c8 100755
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -30,16 +30,14 @@ namespace SparkleShare {
         public SparkleBubbles Bubbles;
         public SparkleAbout About;
         public SparkleNote Note;
-
-		public static NSFont Font = NSFontManager.SharedFontManager.FontWithFamily (
-			"Lucida Grande", NSFontTraitMask.Condensed, 0, 13);
-		
-        public static NSFont BoldFont = NSFontManager.SharedFontManager.FontWithFamily (
-			"Lucida Grande", NSFontTraitMask.Bold, 0, 13);
 		
+        public static string FontName = "Helvetica Neue";
 
         public SparkleUI ()
         {
+            if (Environment.OSVersion.Version.Major < 14)
+                FontName = "Lucida Grande";
+
             Program.Controller.Invoke (() => {
                 NSWorkspace.SharedWorkspace.SetIconforFile (
                     NSImage.ImageNamed ("sparkleshare-folder.icns"), Program.Controller.FoldersPath, 0);