diff --git a/Source/NSBrowser.m b/Source/NSBrowser.m
index 3462cfe56..e1198fc39 100644
--- a/Source/NSBrowser.m
+++ b/Source/NSBrowser.m
@@ -184,7 +184,7 @@
 
   [self setTextColor: [NSColor windowFrameTextColor]];
   [self setBackgroundColor: [NSColor controlShadowColor]];
-  [self setFont: [NSFont titleBarFontOfSize:12]];
+  [self setFont: [NSFont titleBarFontOfSize: 0]];
   _cell.is_editable = NO;
   _cell.is_bezeled = YES;
   _cell.text_align = NSCenterTextAlignment;
diff --git a/Source/NSFontPanel.m b/Source/NSFontPanel.m
index 2d0446b61..54c5cb90a 100644
--- a/Source/NSFontPanel.m
+++ b/Source/NSFontPanel.m
@@ -405,7 +405,7 @@ float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
 
   // label for selection of size
   label = [[NSTextField alloc] initWithFrame: l3];
-  [label setFont: [NSFont boldSystemFontOfSize: 12]];
+  [label setFont: [NSFont boldSystemFontOfSize: 0]];
   [label setAlignment: NSCenterTextAlignment];
   [label setDrawsBackground: YES];
   [label setEditable: NO];
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index c920cafa0..93bcdf28d 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -1098,7 +1098,7 @@ Ghiradelli chocolate to he who puts all the pieces together : ) */
   int startIndex;
   NSRect firstProposedRect;
   NSRect secondProposedRect;
-  NSFont *default_font = [NSFont systemFontOfSize: 12.0];
+  NSFont *default_font = [NSFont systemFontOfSize: 0];
   int widthOfString;
   NSSize rSize;
   NSCharacterSet *selectionParagraphGranularitySet = [NSCharacterSet characterSetWithCharactersInString: @"\n"];
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index d359232ea..9413fa483 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -1366,7 +1366,7 @@ static NSString	*NSMenuLocationsKey = @"NSMenuLocations";
 
   // Draw the title.
   [[NSColor windowFrameTextColor] set];
-  [[NSFont boldSystemFontOfSize: 12] set];
+  [[NSFont boldSystemFontOfSize: 0] set];
   PSmoveto(rect.origin.x + 7, rect.origin.y + 7);
   PSshow([[menu title] cString]);
 
diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m
index 57e8febe0..f64a485e7 100644
--- a/Source/NSMenuItemCell.m
+++ b/Source/NSMenuItemCell.m
@@ -178,10 +178,10 @@ static NSImage	*arrowImageH = nil;
     }
   else
     {
-      mcell_titleWidth = [[NSFont menuFontOfSize:12]
-			   widthOfString:[mcell_item title]];
-      mcell_keyEquivalentWidth = [[NSFont menuFontOfSize:12]
-				   widthOfString:[mcell_item keyEquivalent]];
+      NSFont *defFont = [NSFont menuFontOfSize: 0];
+      
+      mcell_titleWidth = [defFont widthOfString:[mcell_item title]];
+      mcell_keyEquivalentWidth = [defFont widthOfString:[mcell_item keyEquivalent]];
     }
 
   // Submenu Arrow
diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index bebb8fb34..44a777a77 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -416,7 +416,7 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
   unsigned	i;
   unsigned	howMany = [menuv_itemCells count];
   float		howHigh = (howMany * cellSize.height);
-  float		neededImageAndTitleWidth = [[NSFont boldSystemFontOfSize: 12]
+  float		neededImageAndTitleWidth = [[NSFont boldSystemFontOfSize: 0]
 				   widthOfString: [menuv_menu title]] + 17;
   float		neededKeyEquivalentWidth = 0.0;
   float		neededStateImageWidth = 0.0;
diff --git a/Source/NSPanel.m b/Source/NSPanel.m
index 5e3ff6545..f89187eb1 100644
--- a/Source/NSPanel.m
+++ b/Source/NSPanel.m
@@ -347,7 +347,7 @@ static const float ButtonInterspace = 10.0;
 static const float ButtonMinHeight = 24.0;
 static const float ButtonMinWidth = 72.0;
 
-#define MessageFont [NSFont systemFontOfSize: 14.0]
+#define MessageFont [NSFont messageFontOfSize: 14]
 // TODO: Check on NeXTSTEP, I think that the message font size is only 12.0.
 
 + (void) initialize
@@ -432,7 +432,7 @@ makeScrollViewWithRect(NSRect rect)
   [button setTitle: @""];
   [button setTarget: self];
   [button setAction: @selector(buttonAction: )];
-  [button setFont: [NSFont systemFontOfSize: 12.0]];
+  [button setFont: [NSFont systemFontOfSize: 0]];
   return button;
 }
 
diff --git a/Source/NSStringDrawing.m b/Source/NSStringDrawing.m
index 2c8d00f7a..c356b1db3 100644
--- a/Source/NSStringDrawing.m
+++ b/Source/NSStringDrawing.m
@@ -95,7 +95,7 @@ checkInit()
    * These defaults could change during the running of the program if the
    * user defaults are changed.
    */
-  defFont = [NSFont userFontOfSize: 12];
+  defFont = [NSFont userFontOfSize: 0];
   defFgCol = [NSColor textColor];
 }
 
diff --git a/Source/NSTabView.m b/Source/NSTabView.m
index af2f165b5..d37628064 100644
--- a/Source/NSTabView.m
+++ b/Source/NSTabView.m
@@ -45,7 +45,7 @@
   // setup variables  
 
   tab_items = [NSMutableArray new];
-  tab_font = RETAIN([NSFont systemFontOfSize: 12]);
+  tab_font = RETAIN([NSFont systemFontOfSize: 0]);
   tab_selected = nil;
 
   return self;
diff --git a/Source/NSTableHeaderCell.m b/Source/NSTableHeaderCell.m
index 9ee96ab9c..cd13c499e 100644
--- a/Source/NSTableHeaderCell.m
+++ b/Source/NSTableHeaderCell.m
@@ -46,7 +46,7 @@ static NSColor *clearCol = nil;
   _cell.text_align = NSCenterTextAlignment;
   ASSIGN (_text_color, [NSColor windowFrameTextColor]);
   [self setBackgroundColor: [NSColor controlShadowColor]];
-  [self setFont: [NSFont titleBarFontOfSize:12]];
+  [self setFont: [NSFont titleBarFontOfSize: 0]];
   _cell.is_bezeled = YES;
   _textfieldcell_draws_background = YES;
 
diff --git a/Source/NSText.m b/Source/NSText.m
index c3564c43d..29d8eddcf 100644
--- a/Source/NSText.m
+++ b/Source/NSText.m
@@ -3318,7 +3318,7 @@ other than copy/paste or dragging. */
 {
   return [NSDictionary dictionaryWithObjectsAndKeys:
 			 [NSParagraphStyle defaultParagraphStyle], NSParagraphStyleAttributeName,
-			 [NSFont userFontOfSize: 12], NSFontAttributeName,
+			 [NSFont userFontOfSize: 0], NSFontAttributeName,
 		         [NSColor textColor], NSForegroundColorAttributeName,
 		         nil];
 }