diff --git a/iphone/Maps/UIFont+MapsMeFonts.h b/iphone/Maps/UIFont+MapsMeFonts.h
index 2eed592fa8..71297af9db 100644
--- a/iphone/Maps/UIFont+MapsMeFonts.h
+++ b/iphone/Maps/UIFont+MapsMeFonts.h
@@ -32,6 +32,7 @@
 + (UIFont *)bold17;
 + (UIFont *)bold22;
 + (UIFont *)bold24;
++ (UIFont *)bold36;
 + (UIFont *)bold48;
 
 + (UIFont *)fontWithName:(NSString *)fontName;
diff --git a/iphone/Maps/UIFont+MapsMeFonts.mm b/iphone/Maps/UIFont+MapsMeFonts.mm
index 3a9d6f323b..8aa15fdf5e 100644
--- a/iphone/Maps/UIFont+MapsMeFonts.mm
+++ b/iphone/Maps/UIFont+MapsMeFonts.mm
@@ -6,61 +6,17 @@ NSString * const kLightFontName = @"HelveticaNeue-Light";
 
 @implementation UIFont (MapsMeFonts)
 
-+ (UIFont *)regular10
-{
-  return [UIFont systemFontOfSize:10];
-}
-
-+ (UIFont *)regular12
-{
-  return [UIFont systemFontOfSize:12];
-}
-
-+ (UIFont *)regular13
-{
-  return [UIFont systemFontOfSize:13];
-}
-
-+ (UIFont *)regular14
-{
-  return [UIFont systemFontOfSize:14];
-}
-
-+ (UIFont *)regular15
-{
-  return [UIFont systemFontOfSize:15];
-}
-
-+ (UIFont *)regular16
-{
-  return [UIFont systemFontOfSize:16];
-}
-
-+ (UIFont *)regular17
-{
-  return [UIFont systemFontOfSize:17];
-}
-
-+ (UIFont *)regular18
-{
-  return [UIFont systemFontOfSize:18];
-}
-
-+ (UIFont *)regular24
-{
-  return [UIFont systemFontOfSize:24];
-}
-
-+ (UIFont *)regular32
-{
-  return [UIFont systemFontOfSize:32];
-}
-
-+ (UIFont *)regular52
-{
-  return [UIFont systemFontOfSize:52];
-}
-
++ (UIFont *)regular10 { return [UIFont systemFontOfSize:10]; }
++ (UIFont *)regular12 { return [UIFont systemFontOfSize:12]; }
++ (UIFont *)regular13 { return [UIFont systemFontOfSize:13]; }
++ (UIFont *)regular14 { return [UIFont systemFontOfSize:14]; }
++ (UIFont *)regular15 { return [UIFont systemFontOfSize:15]; }
++ (UIFont *)regular16 { return [UIFont systemFontOfSize:16]; }
++ (UIFont *)regular17 { return [UIFont systemFontOfSize:17]; }
++ (UIFont *)regular18 { return [UIFont systemFontOfSize:18]; }
++ (UIFont *)regular24 { return [UIFont systemFontOfSize:24]; }
++ (UIFont *)regular32 { return [UIFont systemFontOfSize:32]; }
++ (UIFont *)regular52 { return [UIFont systemFontOfSize:52]; }
 + (UIFont *)medium10
 {
   CGFloat const size = 10;
@@ -178,32 +134,14 @@ NSString * const kLightFontName = @"HelveticaNeue-Light";
   return [UIFont systemFontOfSize:size weight:UIFontWeightLight];
 }
 
-+ (UIFont *)bold12
-{
-  return [UIFont boldSystemFontOfSize:12];
-}
-
-+ (UIFont *)bold14
-{
-  return [UIFont boldSystemFontOfSize:14];
-}
-
-+ (UIFont *)bold16
-{
-  return [UIFont boldSystemFontOfSize:16];
-}
-
-+ (UIFont *)bold17
-{
-  return [UIFont boldSystemFontOfSize:17];
-}
++ (UIFont *)bold12 { return [UIFont boldSystemFontOfSize:12]; }
++ (UIFont *)bold14 { return [UIFont boldSystemFontOfSize:14]; }
++ (UIFont *)bold16 { return [UIFont boldSystemFontOfSize:16]; }
++ (UIFont *)bold17 { return [UIFont boldSystemFontOfSize:17]; }
 + (UIFont *)bold22 { return [UIFont boldSystemFontOfSize:22]; }
 + (UIFont *)bold24 { return [UIFont boldSystemFontOfSize:24]; }
-+ (UIFont *)bold48
-{
-  return [UIFont boldSystemFontOfSize:48];
-}
-
++ (UIFont *)bold36 { return [UIFont boldSystemFontOfSize:26]; }
++ (UIFont *)bold48 { return [UIFont boldSystemFontOfSize:48]; }
 + (UIFont *)fontWithName:(NSString *)fontName
 {
 #pragma clang diagnostic push