Custom buttons and nav background.

media/ios/Classes/FeedDetailViewController.m

@@ -77,10 +77,10 @@
     spacerBarButton.width = -12;
     spacer2BarButton = [[UIBarButtonItem alloc]
                        initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
-    spacer2BarButton.width = -4;
+    spacer2BarButton.width = -10;
     spacer3BarButton = [[UIBarButtonItem alloc]
                        initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
-    spacer3BarButton.width = -4;
+    spacer3BarButton.width = -10;
     
     UIImage *separatorImage = [UIImage imageNamed:@"bar-separator.png"];
     separatorBarButton = [UIBarButtonItem barItemWithImage:separatorImage target:nil action:nil];
@@ -119,9 +119,6 @@
             
     // set center title
     UILabel *titleLabel = (UILabel *)[appDelegate makeFeedTitle:appDelegate.activeFeed];
-    [titleLabel setTextColor:UIColorFromRGB(0x404040)];
-    [titleLabel setShadowOffset:CGSizeMake(0, -1)];
-    [titleLabel setShadowColor:UIColorFromRGB(0xFAFAFA)];
     self.navigationItem.titleView = titleLabel;
     
     // set right avatar title image

media/ios/Classes/NewsBlurAppDelegate.m

@@ -194,16 +194,17 @@
 //    splashView.frame = CGRectMake(-60, -80, 440, 728);
     [UIView commitAnimations];
     
-    NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:
+    [[UINavigationBar appearance] setBackgroundImage:[UIImage imageNamed:@"navbar_background.png"] forBarMetrics:UIBarMetricsDefault];
-                                UIColorFromRGB(0x404040),
+    [[UINavigationBar appearance] setBackgroundImage:[UIImage imageNamed:@"navbar_landscape_background.png"] forBarMetrics:UIBarMetricsLandscapePhone];
-                                UITextAttributeTextColor,
+    [[UIToolbar appearance] setBackgroundImage:[UIImage imageNamed:@"toolbar_background.png"] forToolbarPosition:0 barMetrics:UIBarMetricsDefault];
-                                UIColorFromRGB(0xFAFAFA),
+
-                                UITextAttributeTextShadowColor, nil];
+    [[UINavigationBar appearance]
+     setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                             UIColorFromRGB(0x404040), UITextAttributeTextColor,
+                             UIColorFromRGB(0xFAFAFA), UITextAttributeTextShadowColor,
+                             [NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
+                             nil]];
     
-    [[UIBarButtonItem appearance] setTitleTextAttributes: attributes
-                                                forState: UIControlStateNormal];
-    [[UIBarButtonItem appearance] setTitleTextAttributes: attributes
-                                                forState: UIControlStateHighlighted];
 //    [self showFirstTimeUser];
 	return YES;
 }
@@ -1681,10 +1682,10 @@
     titleLabel.backgroundColor = [UIColor clearColor];
     titleLabel.textAlignment = UITextAlignmentLeft;
     titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:15.0];
-    titleLabel.textColor = [UIColor whiteColor];
+    titleLabel.textColor = UIColorFromRGB(0x404040);
     titleLabel.lineBreakMode = UILineBreakModeTailTruncation;
     titleLabel.numberOfLines = 1;
-    titleLabel.shadowColor = [UIColor blackColor];
+    titleLabel.shadowColor = UIColorFromRGB(0xF5F5F5);
     titleLabel.shadowOffset = CGSizeMake(0, -1);
     titleLabel.center = CGPointMake(0, -2);
     [titleLabel sizeToFit];

media/ios/Classes/NewsBlurViewController.m

@@ -171,6 +171,26 @@ static const CGFloat kFolderTitleHeight = 28;
     [[UIBarButtonItem appearance] setBackButtonBackgroundImage:i4
                                                       forState:UIControlStateHighlighted 
                                                     barMetrics:UIBarMetricsLandscapePhone];
+    
+    UIImage *b1 = [[UIImage imageNamed:@"button.png"]
+                   resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
+    UIImage *b2 = [[UIImage imageNamed:@"button_selected.png"]
+                   resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
+    
+    [[UIBarButtonItem appearance] setBackgroundImage:b1
+                                            forState:UIControlStateNormal
+                                          barMetrics:UIBarMetricsDefault];
+    [[UIBarButtonItem appearance] setBackgroundImage:b2
+                                            forState:UIControlStateHighlighted
+                                          barMetrics:UIBarMetricsDefault];
+
+    [[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil]
+     setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                             UIColorFromRGB(0x404040), UITextAttributeTextColor,
+                             UIColorFromRGB(0xFAFAFA), UITextAttributeTextShadowColor,
+                             [NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
+                             nil]
+     forState:UIControlStateNormal];    
     [[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil]
      setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
                              UIColorFromRGB(0xF0F0F0), UITextAttributeTextColor,
@@ -439,17 +459,17 @@ static const CGFloat kFolderTitleHeight = 28;
     
     UIImage *addImage = [UIImage imageNamed:@"nav_icn_add.png"];
     UIButton *addButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [addButton sizeToFit];
+    addButton.bounds = CGRectMake(0, 0, 34, 44);
     [addButton setImage:addImage forState:UIControlStateNormal];
     [addButton addTarget:self action:@selector(tapAddSite:) forControlEvents:UIControlEventTouchUpInside];
     [addBarButton setCustomView:addButton];
     
     UIImage *settingsImage = [UIImage imageNamed:@"nav_icn_settings.png"];
     UIButton *settingsButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [settingsButton sizeToFit];
+    settingsButton.bounds = CGRectMake(0, 0, 34, 44);
     [settingsButton setImage:settingsImage forState:UIControlStateNormal];
     [settingsButton addTarget:self action:@selector(showSettingsPopover:) forControlEvents:UIControlEventTouchUpInside];
-    [settingsBarButton setCustomView:settingsButton];    
+    [settingsBarButton setCustomView:settingsButton];
     
     UIBarButtonItem *spacer = [[UIBarButtonItem alloc]
                                        initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace

media/ios/Classes/StoryPageControl.m

@@ -94,7 +94,7 @@
     self.progressViewContainer.hidden = YES;
     
     rightToolbar = [[TransparentToolbar alloc]
-                    initWithFrame:CGRectMake(0, 0, 68,
+                    initWithFrame:CGRectMake(0, 0, 80,
                                              self.toolbar.frame.size.height)];
     
     spacerBarButton = [[UIBarButtonItem alloc]
@@ -105,7 +105,7 @@
     spacer2BarButton.width = -4;
     spacer3BarButton = [[UIBarButtonItem alloc]
                         initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
-    spacer3BarButton.width = -4;
+    spacer3BarButton.width = -10;
     
     UIImage *separatorImage = [UIImage imageNamed:@"bar-separator.png"];
     separatorBarButton = [UIBarButtonItem barItemWithImage:separatorImage target:nil action:nil];

media/ios/Classes/TrainerViewController.m

@@ -35,7 +35,6 @@
     [super viewDidLoad];
     self.appDelegate = [NewsBlurAppDelegate sharedAppDelegate];
     
-    navBar.tintColor = UIColorFromRGB(0x183353);
     [self hideGradientBackground:webView];
     [self.webView.scrollView setDelaysContentTouches:YES];
     [self.webView.scrollView setDecelerationRate:UIScrollViewDecelerationRateNormal];
@@ -58,7 +57,6 @@
                    nil]];
     
     UILabel *titleLabel = (UILabel *)[appDelegate makeFeedTitle:appDelegate.activeFeed];
-    titleLabel.shadowColor = UIColorFromRGB(0x306070);
     navBar.topItem.titleView = titleLabel;
     
     NSString *path = [[NSBundle mainBundle] bundlePath];

media/ios/Classes/UserProfileViewController.m

@@ -44,7 +44,6 @@
     self.contentSizeForViewInPopover = self.view.frame.size;
 
     self.view.backgroundColor = UIColorFromRGB(0xd7dadf);
-    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
     
     UITableView *profiles = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height) style:UITableViewStyleGrouped];
     self.profileTable = profiles;

media/ios/Classes/Utilities.m

@@ -42,7 +42,7 @@ static NSMutableDictionary *imageCache;
     
     // Save image to memory-based cache, for performance when reading.
 //    NSLog(@"Saving %@", [imageCache allKeys]);
-    if (image) {
+    if (image && [filename class] != [NSNull class]) {
         [imageCache setObject:image forKey:filename];
     } else {
 //        NSLog(@"%@ has no image!!!", filename);
@@ -57,7 +57,7 @@ static NSMutableDictionary *imageCache;
     UIImage *image;
     image = [imageCache objectForKey:filename];
     
-    if (!image) {
+    if (!image || [image class] == [NSNull class]) {
         // Image not in cache, search on disk.
         NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
         NSString *cacheDirectory = [paths objectAtIndex:0];

media/ios/NewsBlur.xcodeproj/project.pbxproj

@@ -329,6 +329,16 @@
 		FF85BF8516D6C2B7002D334D /* clock2.png in Resources */ = {isa = PBXBuildFile; fileRef = FF85BF8416D6C2B7002D334D /* clock2.png */; };
 		FFAD0BE71649EC1800EE33D0 /* StoryPageControl~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */; };
 		FFAD4971144A386100BA6919 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FFAD4970144A386100BA6919 /* libz.dylib */; };
+		FFCF51A316E020DD008C7C42 /* toolbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51A116E020DD008C7C42 /* toolbar_background.png */; };
+		FFCF51A416E020DD008C7C42 /* toolbar_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51A216E020DD008C7C42 /* toolbar_background@2x.png */; };
+		FFCF51A716E028B0008C7C42 /* navbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51A516E028B0008C7C42 /* navbar_background.png */; };
+		FFCF51A816E028B0008C7C42 /* navbar_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51A616E028B0008C7C42 /* navbar_background@2x.png */; };
+		FFCF51AB16E029E6008C7C42 /* navbar_landscape_background.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51A916E029E6008C7C42 /* navbar_landscape_background.png */; };
+		FFCF51AC16E029E6008C7C42 /* navbar_landscape_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51AA16E029E6008C7C42 /* navbar_landscape_background@2x.png */; };
+		FFCF51C516E0300F008C7C42 /* button_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51C116E0300F008C7C42 /* button_selected.png */; };
+		FFCF51C616E0300F008C7C42 /* button_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51C216E0300F008C7C42 /* button_selected@2x.png */; };
+		FFCF51C716E0300F008C7C42 /* button.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51C316E0300F008C7C42 /* button.png */; };
+		FFCF51C816E0300F008C7C42 /* button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFCF51C416E0300F008C7C42 /* button@2x.png */; };
 		FFD1D7311459B63500E46F89 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFD1D7301459B63500E46F89 /* BaseViewController.m */; };
 		FFD887F01445F1E800385399 /* AddSiteAutocompleteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FFD887EE1445F1E800385399 /* AddSiteAutocompleteCell.m */; };
 		FFDE35CC161B8F870034BFDE /* FolderTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = FFDE35CB161B8F870034BFDE /* FolderTitleView.m */; };
@@ -815,6 +825,16 @@
 		FF85BF8416D6C2B7002D334D /* clock2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = clock2.png; sourceTree = "<group>"; };
 		FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "StoryPageControl~ipad.xib"; path = "Resources-iPad/Classes/StoryPageControl~ipad.xib"; sourceTree = "<group>"; };
 		FFAD4970144A386100BA6919 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		FFCF51A116E020DD008C7C42 /* toolbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_background.png; sourceTree = "<group>"; };
+		FFCF51A216E020DD008C7C42 /* toolbar_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar_background@2x.png"; sourceTree = "<group>"; };
+		FFCF51A516E028B0008C7C42 /* navbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navbar_background.png; sourceTree = "<group>"; };
+		FFCF51A616E028B0008C7C42 /* navbar_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "navbar_background@2x.png"; sourceTree = "<group>"; };
+		FFCF51A916E029E6008C7C42 /* navbar_landscape_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navbar_landscape_background.png; sourceTree = "<group>"; };
+		FFCF51AA16E029E6008C7C42 /* navbar_landscape_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "navbar_landscape_background@2x.png"; sourceTree = "<group>"; };
+		FFCF51C116E0300F008C7C42 /* button_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button_selected.png; sourceTree = "<group>"; };
+		FFCF51C216E0300F008C7C42 /* button_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_selected@2x.png"; sourceTree = "<group>"; };
+		FFCF51C316E0300F008C7C42 /* button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button.png; sourceTree = "<group>"; };
+		FFCF51C416E0300F008C7C42 /* button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button@2x.png"; sourceTree = "<group>"; };
 		FFD1D72F1459B63500E46F89 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		FFD1D7301459B63500E46F89 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
 		FFD887ED1445F1E800385399 /* AddSiteAutocompleteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteAutocompleteCell.h; sourceTree = "<group>"; };
@@ -1087,6 +1107,16 @@
 		431B857615A132B600DCE497 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				FFCF51C116E0300F008C7C42 /* button_selected.png */,
+				FFCF51C216E0300F008C7C42 /* button_selected@2x.png */,
+				FFCF51C316E0300F008C7C42 /* button.png */,
+				FFCF51C416E0300F008C7C42 /* button@2x.png */,
+				FFCF51A916E029E6008C7C42 /* navbar_landscape_background.png */,
+				FFCF51AA16E029E6008C7C42 /* navbar_landscape_background@2x.png */,
+				FFCF51A516E028B0008C7C42 /* navbar_background.png */,
+				FFCF51A616E028B0008C7C42 /* navbar_background@2x.png */,
+				FFCF51A116E020DD008C7C42 /* toolbar_background.png */,
+				FFCF51A216E020DD008C7C42 /* toolbar_background@2x.png */,
 				FF4151E116DEF9960013E84B /* back_button_background.png */,
 				FF4151E216DEF9960013E84B /* back_button_background@2x.png */,
 				FF4151E316DEF9960013E84B /* back_button_landscape_background.png */,
@@ -1998,6 +2028,16 @@
 				FF4151EE16DEF9960013E84B /* back_button_landscape_selected_background@2x.png in Resources */,
 				FF4151EF16DEF9960013E84B /* back_button_selected_background.png in Resources */,
 				FF4151F016DEF9960013E84B /* back_button_selected_background@2x.png in Resources */,
+				FFCF51A316E020DD008C7C42 /* toolbar_background.png in Resources */,
+				FFCF51A416E020DD008C7C42 /* toolbar_background@2x.png in Resources */,
+				FFCF51A716E028B0008C7C42 /* navbar_background.png in Resources */,
+				FFCF51A816E028B0008C7C42 /* navbar_background@2x.png in Resources */,
+				FFCF51AB16E029E6008C7C42 /* navbar_landscape_background.png in Resources */,
+				FFCF51AC16E029E6008C7C42 /* navbar_landscape_background@2x.png in Resources */,
+				FFCF51C516E0300F008C7C42 /* button_selected.png in Resources */,
+				FFCF51C616E0300F008C7C42 /* button_selected@2x.png in Resources */,
+				FFCF51C716E0300F008C7C42 /* button.png in Resources */,
+				FFCF51C816E0300F008C7C42 /* button@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2237,6 +2277,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (G9HFWP68T7)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Samuel Clay (G9HFWP68T7)";
 				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -2259,6 +2300,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (G9HFWP68T7)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Samuel Clay (G9HFWP68T7)";
 				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;

media/ios/Resources-iPhone/NewsBlurViewController.xib

@@ -91,9 +91,10 @@
 							<object class="IBUISegmentedControl" id="117639116">
 								<reference key="NSNextResponder" ref="895374018"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{70, 8}, {180, 30}}</string>
+								<string key="NSFrame">{{64, 8}, {192, 30}}</string>
 								<reference key="NSSuperview" ref="895374018"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBSegmentControlStyle">2</int>
 								<int key="IBNumberOfSegments">3</int>
@@ -154,7 +155,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBUIBarButtonItem" id="816230383">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<float key="IBUIWidth">22</float>
+								<float key="IBUIWidth">34</float>
 								<reference key="IBUIToolbar" ref="895374018"/>
 							</object>
 							<object class="IBUIBarButtonItem" id="403674562">
@@ -174,7 +175,7 @@
 							</object>
 							<object class="IBUIBarButtonItem" id="934474311">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<float key="IBUIWidth">22</float>
+								<float key="IBUIWidth">34</float>
 								<reference key="IBUIToolbar" ref="895374018"/>
 							</object>
 						</object>
@@ -864,13 +865,11 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>doOpenMarkReadActionSheet:</string>
 							<string>doOpenSettingsActionSheet:</string>
-							<string>selectIntelligence</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -879,7 +878,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>doOpenMarkReadActionSheet:</string>
 							<string>doOpenSettingsActionSheet:</string>
-							<string>selectIntelligence</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -891,10 +889,6 @@
 								<string key="name">doOpenSettingsActionSheet:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">selectIntelligence</string>
-								<string key="candidateClassName">id</string>
-							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -903,19 +897,23 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
 							<string>feedMarkReadButton</string>
-							<string>feedScoreSlider</string>
+							<string>rightToolbar</string>
-							<string>feedViewToolbar</string>
+							<string>separatorBarButton</string>
-							<string>intelligenceControl</string>
+							<string>settingsBarButton</string>
-							<string>settingsButton</string>
+							<string>spacer2BarButton</string>
+							<string>spacer3BarButton</string>
+							<string>spacerBarButton</string>
 							<string>storyTitlesTable</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
 							<string>UIBarButtonItem</string>
-							<string>UISlider</string>
+							<string>TransparentToolbar</string>
-							<string>UIToolbar</string>
+							<string>UIBarButtonItem</string>
-							<string>UISegmentedControl</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
 							<string>UIBarButtonItem</string>
 							<string>UITableView</string>
 						</object>
@@ -926,10 +924,12 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
 							<string>feedMarkReadButton</string>
-							<string>feedScoreSlider</string>
+							<string>rightToolbar</string>
-							<string>feedViewToolbar</string>
+							<string>separatorBarButton</string>
-							<string>intelligenceControl</string>
+							<string>settingsBarButton</string>
-							<string>settingsButton</string>
+							<string>spacer2BarButton</string>
+							<string>spacer3BarButton</string>
+							<string>spacerBarButton</string>
 							<string>storyTitlesTable</string>
 						</object>
 						<object class="NSArray" key="dict.values">
@@ -943,19 +943,27 @@
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">feedScoreSlider</string>
+								<string key="name">rightToolbar</string>
-								<string key="candidateClassName">UISlider</string>
+								<string key="candidateClassName">TransparentToolbar</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">feedViewToolbar</string>
+								<string key="name">separatorBarButton</string>
-								<string key="candidateClassName">UIToolbar</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">intelligenceControl</string>
+								<string key="name">settingsBarButton</string>
-								<string key="candidateClassName">UISegmentedControl</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">settingsButton</string>
+								<string key="name">spacer2BarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacer3BarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacerBarButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
@@ -2708,7 +2716,12 @@
 							<string>pageControl</string>
 							<string>progressView</string>
 							<string>progressViewContainer</string>
+							<string>rightToolbar</string>
 							<string>scrollView</string>
+							<string>separatorBarButton</string>
+							<string>spacer2BarButton</string>
+							<string>spacer3BarButton</string>
+							<string>spacerBarButton</string>
 							<string>subscribeButton</string>
 							<string>toolbar</string>
 						</object>
@@ -2725,8 +2738,13 @@
 							<string>UIPageControl</string>
 							<string>UIProgressView</string>
 							<string>UIView</string>
+							<string>TransparentToolbar</string>
 							<string>UIScrollView</string>
 							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
 							<string>UIToolbar</string>
 						</object>
 					</object>
@@ -2745,7 +2763,12 @@
 							<string>pageControl</string>
 							<string>progressView</string>
 							<string>progressViewContainer</string>
+							<string>rightToolbar</string>
 							<string>scrollView</string>
+							<string>separatorBarButton</string>
+							<string>spacer2BarButton</string>
+							<string>spacer3BarButton</string>
+							<string>spacerBarButton</string>
 							<string>subscribeButton</string>
 							<string>toolbar</string>
 						</object>
@@ -2795,10 +2818,30 @@
 								<string key="name">progressViewContainer</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">rightToolbar</string>
+								<string key="candidateClassName">TransparentToolbar</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">scrollView</string>
 								<string key="candidateClassName">UIScrollView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">separatorBarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacer2BarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacer3BarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacerBarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">subscribeButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
@@ -2887,6 +2930,14 @@
 						<string key="minorKey">./Classes/TrainerWebView.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TransparentToolbar</string>
+					<string key="superclassName">UIToolbar</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TransparentToolbar.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UserProfileViewController</string>
 					<string key="superclassName">UIViewController</string>