diff --git a/Classes/CDIAddListTableViewCell.m b/Classes/CDIAddListTableViewCell.m
index 740d060..b9fbd89 100644
--- a/Classes/CDIAddListTableViewCell.m
+++ b/Classes/CDIAddListTableViewCell.m
@@ -28,7 +28,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 		_textField = [[SSTextField alloc] initWithFrame:CGRectZero];
 		_textField.textColor = [UIColor cheddarTextColor];
 		_textField.placeholderTextColor = [UIColor cheddarLightTextColor];
-		_textField.font = [UIFont cheddarFontOfSize:20.0f];
+		_textField.font = [UIFont cheddarFontOfSize:18.0f];
 		_textField.backgroundColor = [UIColor whiteColor];
 		_textField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
 		_textField.returnKeyType = UIReturnKeyDone;
diff --git a/Classes/CDIAddTaskAnimationView.m b/Classes/CDIAddTaskAnimationView.m
index 4fc6a13..1cc7430 100644
--- a/Classes/CDIAddTaskAnimationView.m
+++ b/Classes/CDIAddTaskAnimationView.m
@@ -89,7 +89,7 @@ - (void)animationToPoint:(CGPoint)point height:(CGFloat)height insertTask:(void(
 		checkbox.frame = frame;
 		
 		label.frame = CGRectMake(44.0f, 13.0f, size.width - 54.0f, 24.0f);
-		label.font = [UIFont cheddarFontOfSize:20.0f];
+		label.font = [UIFont cheddarFontOfSize:18.0f];
 		
 		frame = container.frame;
 		frame.origin.y += 20.0f;
diff --git a/Classes/CDILoadingView.m b/Classes/CDILoadingView.m
index d15be8d..9459388 100644
--- a/Classes/CDILoadingView.m
+++ b/Classes/CDILoadingView.m
@@ -14,7 +14,7 @@ @implementation CDILoadingView
 
 - (id)initWithFrame:(CGRect)frame {
 	if ((self = [super initWithFrame:frame])) {
-		self.textLabel.font = [UIFont cheddarFontOfSize:16.0f];
+		self.textLabel.font = [UIFont cheddarInterfaceFontOfSize:16.0f];
 		self.backgroundColor = [UIColor clearColor];
 	}
 	return self;
diff --git a/Classes/CDISettingsTextSizePickerViewController.m b/Classes/CDISettingsTextSizePickerViewController.m
index b25d130..cb71d7d 100644
--- a/Classes/CDISettingsTextSizePickerViewController.m
+++ b/Classes/CDISettingsTextSizePickerViewController.m
@@ -24,7 +24,7 @@ @implementation CDISettingsTextSizePickerViewController
 + (CGFloat)fontSizeAdjustment {
 	NSString *key = [self selectedKey];
 	if ([key isEqualToString:kCDITextSizeSmallKey]) {
-		return -4.0f;
+		return -3.0f;
 	} if ([key isEqualToString:kCDITextSizeLargeKey]) {
 		return 4.0f;
 	}
@@ -68,8 +68,7 @@ - (void)viewDidLoad {
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 	UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
 
-	NSString *key = [[self keys] objectAtIndex:indexPath.row];
-	cell.textLabel.font = [UIFont cheddarFontOfSize:18.0f fontKey:key];
+	cell.textLabel.font = [UIFont cheddarInterfaceFontOfSize:18.0f];
 	cell.textLabel.textColor = [UIColor cheddarTextColor];
 
 	return cell;
diff --git a/Classes/CDITableViewCell.m b/Classes/CDITableViewCell.m
index 4a13d07..1cd4c6e 100644
--- a/Classes/CDITableViewCell.m
+++ b/Classes/CDITableViewCell.m
@@ -135,7 +135,7 @@ - (void)prepareForReuse {
 
 - (void)updateFonts {
 	_textField.font = self.textLabel.font;
-	self.textLabel.font = [UIFont cheddarFontOfSize:20.0f];
+	self.textLabel.font = [UIFont cheddarFontOfSize:18.0f];
 }
 
 
diff --git a/Classes/CDITableViewCellDeleteConfirmationControl.m b/Classes/CDITableViewCellDeleteConfirmationControl.m
index 65d6189..71e62de 100644
--- a/Classes/CDITableViewCellDeleteConfirmationControl.m
+++ b/Classes/CDITableViewCellDeleteConfirmationControl.m
@@ -22,7 +22,7 @@ - (void)drawRectCustom:(CGRect)rect {
 	[[image stretchableImageWithLeftCapWidth:5 topCapHeight:0] drawInRect:rect];
 
 	NSString *text = [self valueForKey:@"title"];
-	UIFont *font = [UIFont cheddarFontOfSize:15.0f];
+	UIFont *font = [UIFont cheddarInterfaceFontOfSize:15.0f];
 	UILineBreakMode lineBreakMode = UILineBreakModeClip;
 	UITextAlignment alignment = UITextAlignmentCenter;
 
diff --git a/Classes/CDITaskTableViewCell.m b/Classes/CDITaskTableViewCell.m
index 67de310..0a52e66 100644
--- a/Classes/CDITaskTableViewCell.m
+++ b/Classes/CDITaskTableViewCell.m
@@ -56,7 +56,7 @@ + (CGFloat)cellHeightForTask:(CDKTask *)task width:(CGFloat)width {
 		label = [[TTTAttributedLabel alloc] initWithFrame:CGRectZero];
 		label.numberOfLines = 0;
 	});
-	label.font = [UIFont cheddarFontOfSize:20.0f];
+	label.font = [UIFont cheddarFontOfSize:18.0f];
 	label.text = task.attributedDisplayText;
 	CGSize size = [label sizeThatFits:CGSizeMake(width - 54.0f, 2000.0f)];
 	label.text = nil;
@@ -137,7 +137,7 @@ - (void)prepareForReuse {
 
 - (void)updateFonts {
 	[super updateFonts];
-	_attributedLabel.font = [UIFont cheddarFontOfSize:20.0f];
+	_attributedLabel.font = [UIFont cheddarFontOfSize:18.0f];
 	[self _updateAttributedText];
 }
 
diff --git a/Classes/CDIUpgradeViewController.m b/Classes/CDIUpgradeViewController.m
index dd295cd..ba25640 100644
--- a/Classes/CDIUpgradeViewController.m
+++ b/Classes/CDIUpgradeViewController.m
@@ -44,7 +44,7 @@ - (void)viewDidLoad {
 	TTTAttributedLabel *label = [[TTTAttributedLabel alloc] initWithFrame:CGRectMake(20.0f, 10.0f, width - 40.0f, 300.0f)];
 	label.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 	label.backgroundColor = [UIColor clearColor];
-	label.font = [UIFont cheddarFontOfSize:18.0f];
+	label.font = [UIFont cheddarInterfaceFontOfSize:18.0f];
 	label.numberOfLines = 0;
 	label.textColor = [UIColor cheddarTextColor];
 	label.verticalAlignment = TTTAttributedLabelVerticalAlignmentTop;
diff --git a/Classes/CDKTask+CheddariOSAdditions.m b/Classes/CDKTask+CheddariOSAdditions.m
index 52913e0..c7fcfa5 100644
--- a/Classes/CDKTask+CheddariOSAdditions.m
+++ b/Classes/CDKTask+CheddariOSAdditions.m
@@ -7,6 +7,7 @@
 //
 
 #import "CDKTask+CheddariOSAdditions.h"
+#import "CDISettingsTextSizePickerViewController.h"
 #import "UIFont+CheddariOSAdditions.h"
 #import "TTTAttributedLabel.h"
 
@@ -21,7 +22,8 @@ - (NSAttributedString *)attributedDisplayText {
 	
 	NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:self.displayText];
 	NSString *fontName = [UIFont cheddarFontNameForStyle:kCDIFontRegularKey];
-	CTFontRef regularFont = CTFontCreateWithName((__bridge CFStringRef)fontName, 20.0f, NULL);
+	CGFloat fontSize = 18.0f + [CDISettingsTextSizePickerViewController fontSizeAdjustment];
+	CTFontRef regularFont = CTFontCreateWithName((__bridge CFStringRef)fontName, fontSize, NULL);
 	if (regularFont) {
 		[attributedString addAttribute:(__bridge NSString *)kCTFontAttributeName value:(__bridge id)regularFont range:NSMakeRange(0, self.displayText.length)];
 	}
diff --git a/Classes/UIButton+CheddariOSAdditions.m b/Classes/UIButton+CheddariOSAdditions.m
index fa1a77c..554abba 100644
--- a/Classes/UIButton+CheddariOSAdditions.m
+++ b/Classes/UIButton+CheddariOSAdditions.m
@@ -19,7 +19,7 @@ + (UIButton *)cheddarBigButton {
 	[button setTitleColor:[UIColor colorWithRed:0.384 green:0.412 blue:0.455 alpha:1] forState:UIControlStateNormal];
 	[button setTitleShadowColor:[UIColor whiteColor] forState:UIControlStateNormal];
 	button.titleLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
-	button.titleLabel.font = [UIFont cheddarFontOfSize:18.0f];
+	button.titleLabel.font = [UIFont cheddarInterfaceFontOfSize:18.0f];
 	return button;
 }
 
@@ -30,7 +30,7 @@ + (UIButton *)cheddarBigOrangeButton {
 	[button setBackgroundImage:[[UIImage imageNamed:@"big-orange-button-highlighted"] stretchableImageWithLeftCapWidth:5 topCapHeight:0] forState:UIControlStateHighlighted];
 	[button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
 	[button setTitleShadowColor:[UIColor colorWithWhite:0.0f alpha:0.2f] forState:UIControlStateNormal];
-	button.titleLabel.font = [UIFont cheddarFontOfSize:20.0f];
+	button.titleLabel.font = [UIFont cheddarInterfaceFontOfSize:20.0f];
 	button.titleLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
 	button.titleEdgeInsets = UIEdgeInsetsMake(-1.0f, 0.0f, 0.0f, 0.0f);
 	return button;
@@ -43,7 +43,7 @@ + (UIButton *)cheddarBigGrayButton {
 	[button setBackgroundImage:[[UIImage imageNamed:@"big-gray-button-highlighted"] stretchableImageWithLeftCapWidth:5 topCapHeight:0] forState:UIControlStateHighlighted];
 	[button setTitleColor:[UIColor cheddarSteelColor] forState:UIControlStateNormal];
 	[button setTitleShadowColor:[UIColor whiteColor] forState:UIControlStateNormal];
-	button.titleLabel.font = [UIFont cheddarFontOfSize:20.0f];
+	button.titleLabel.font = [UIFont cheddarInterfaceFontOfSize:20.0f];
 	button.titleLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
 	button.titleEdgeInsets = UIEdgeInsetsMake(-1.0f, 0.0f, 0.0f, 0.0f);
 	return button;
@@ -56,7 +56,7 @@ + (UIButton *)cheddarBarButton {
 	[button setTitleShadowColor:[UIColor colorWithWhite:0.0f alpha:0.2f] forState:UIControlStateNormal];
 	[button setBackgroundImage:[[UIImage imageNamed:@"nav-button"] stretchableImageWithLeftCapWidth:6 topCapHeight:0] forState:UIControlStateNormal];
 	[button setBackgroundImage:[[UIImage imageNamed:@"nav-button-highlighted"] stretchableImageWithLeftCapWidth:6 topCapHeight:0] forState:UIControlStateHighlighted];
-	button.titleLabel.font = [UIFont cheddarFontOfSize:14.0f];
+	button.titleLabel.font = [UIFont cheddarInterfaceFontOfSize:14.0f];
 	button.titleLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
 //	button.titleEdgeInsets = UIEdgeInsetsMake(-1.0f, 0.0f, 0.0f, 0.0f);
 	return button;