From 0f5a91211d4510bd46cc59a3f77d0639f7af3333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ce=CC=81lio=20Cidral=20Junior?= <ccidral@gmail.com>
Date: Tue, 5 Nov 2013 20:55:23 -0200
Subject: [PATCH] Fixed bad looking icons on Mavericks.

Oddly enough I had to manually set the size of all icons before
assigning them to their respective menu items and status bar item,
otherwise the icons look all messed up on Mavericks. This was not
needed in order to work on Mountain Lion though.
---
 src/Tomighty.xcodeproj/project.pbxproj |  14 +-
 src/Tomighty/AppDelegate.m             |  11 +-
 src/Tomighty/ImageLoader.h             |  16 ++
 src/Tomighty/ImageLoader.m             |  32 ++++
 src/Tomighty/PreferencesWindow.xib     | 249 ++++++++++---------------
 src/Tomighty/StatusIcon.m              |  15 +-
 src/Tomighty/en.lproj/MainMenu.xib     |  39 +---
 7 files changed, 183 insertions(+), 193 deletions(-)
 create mode 100644 src/Tomighty/ImageLoader.h
 create mode 100644 src/Tomighty/ImageLoader.m

diff --git a/src/Tomighty.xcodeproj/project.pbxproj b/src/Tomighty.xcodeproj/project.pbxproj
index 642aad2..a848044 100644
--- a/src/Tomighty.xcodeproj/project.pbxproj
+++ b/src/Tomighty.xcodeproj/project.pbxproj
@@ -21,7 +21,8 @@
 		301ABD0C17A602E800F19F3C /* Sounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 301ABD0B17A602E800F19F3C /* Sounds.m */; };
 		3025F55717A7299000970DA9 /* Tomighty.m in Sources */ = {isa = PBXBuildFile; fileRef = 3025F55617A7299000970DA9 /* Tomighty.m */; };
 		3025F55A17A74A6100970DA9 /* TimerContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 3025F55917A74A6100970DA9 /* TimerContext.m */; };
-		30429410179F2CD3008CB481 /* status-normal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3042940E179F2CD3008CB481 /* status-normal.tiff */; };
+		3055C8C718297D540040918A /* status-normal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3055C8C618297D540040918A /* status-normal.tiff */; };
+		3055C8CA1829A4F30040918A /* ImageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 3055C8C91829A4F30040918A /* ImageLoader.m */; };
 		30AA857217A154C400F4ADC6 /* tomighty.icns in Resources */ = {isa = PBXBuildFile; fileRef = 30AA857117A154C400F4ADC6 /* tomighty.icns */; };
 		30B829CF17A0AC1500DFC201 /* Timer.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B829CE17A0AC1500DFC201 /* Timer.m */; };
 		30B829D417A0CCD000DFC201 /* status-white.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 30B829D317A0CCD000DFC201 /* status-white.tiff */; };
@@ -57,7 +58,9 @@
 		3025F55617A7299000970DA9 /* Tomighty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tomighty.m; sourceTree = "<group>"; };
 		3025F55817A74A6100970DA9 /* TimerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerContext.h; sourceTree = "<group>"; };
 		3025F55917A74A6100970DA9 /* TimerContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimerContext.m; sourceTree = "<group>"; };
-		3042940E179F2CD3008CB481 /* status-normal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "status-normal.tiff"; sourceTree = "<group>"; };
+		3055C8C618297D540040918A /* status-normal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "status-normal.tiff"; sourceTree = "<group>"; };
+		3055C8C81829A4F30040918A /* ImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageLoader.h; sourceTree = "<group>"; };
+		3055C8C91829A4F30040918A /* ImageLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageLoader.m; sourceTree = "<group>"; };
 		30AA857117A154C400F4ADC6 /* tomighty.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tomighty.icns; sourceTree = "<group>"; };
 		30B829CD17A0AC1500DFC201 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
 		30B829CE17A0AC1500DFC201 /* Timer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Timer.m; sourceTree = "<group>"; };
@@ -98,6 +101,7 @@
 		301ABCF317A5A53300F19F3C /* Icons */ = {
 			isa = PBXGroup;
 			children = (
+				3055C8C618297D540040918A /* status-normal.tiff */,
 				301ABCF117A5999400F19F3C /* clock.tiff */,
 				301ABCED17A593AA00F19F3C /* start-pomodoro.tiff */,
 				301ABCEE17A593AA00F19F3C /* status-pomodoro.tiff */,
@@ -107,7 +111,6 @@
 				30FA9D9B17A586A0005D0A80 /* start-long-break.tiff */,
 				30FA9D9D17A586A0005D0A80 /* start-short-break.tiff */,
 				30B829D317A0CCD000DFC201 /* status-white.tiff */,
-				3042940E179F2CD3008CB481 /* status-normal.tiff */,
 			);
 			name = Icons;
 			sourceTree = "<group>";
@@ -128,6 +131,8 @@
 				3025F55617A7299000970DA9 /* Tomighty.m */,
 				3025F55817A74A6100970DA9 /* TimerContext.h */,
 				3025F55917A74A6100970DA9 /* TimerContext.m */,
+				3055C8C81829A4F30040918A /* ImageLoader.h */,
+				3055C8C91829A4F30040918A /* ImageLoader.m */,
 			);
 			name = Core;
 			sourceTree = "<group>";
@@ -262,7 +267,6 @@
 				30F01B06179EC3F00061D183 /* InfoPlist.strings in Resources */,
 				30F01B0C179EC3F00061D183 /* Credits.rtf in Resources */,
 				30F01B12179EC3F10061D183 /* MainMenu.xib in Resources */,
-				30429410179F2CD3008CB481 /* status-normal.tiff in Resources */,
 				30B829D417A0CCD000DFC201 /* status-white.tiff in Resources */,
 				30AA857217A154C400F4ADC6 /* tomighty.icns in Resources */,
 				30FA9D9F17A586A0005D0A80 /* start-long-break.tiff in Resources */,
@@ -271,6 +275,7 @@
 				301ABCE617A5910C00F19F3C /* status-long-break.tiff in Resources */,
 				301ABCE817A5910C00F19F3C /* status-short-break.tiff in Resources */,
 				301ABCEF17A593AA00F19F3C /* start-pomodoro.tiff in Resources */,
+				3055C8C718297D540040918A /* status-normal.tiff in Resources */,
 				301ABCF017A593AA00F19F3C /* status-pomodoro.tiff in Resources */,
 				301ABCF217A5999400F19F3C /* clock.tiff in Resources */,
 				301ABCFC17A5A8E100F19F3C /* PreferencesWindow.xib in Resources */,
@@ -295,6 +300,7 @@
 				301ABD0217A5C48500F19F3C /* Preferences.m in Sources */,
 				301ABD0C17A602E800F19F3C /* Sounds.m in Sources */,
 				3025F55717A7299000970DA9 /* Tomighty.m in Sources */,
+				3055C8CA1829A4F30040918A /* ImageLoader.m in Sources */,
 				3025F55A17A74A6100970DA9 /* TimerContext.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/src/Tomighty/AppDelegate.m b/src/Tomighty/AppDelegate.m
index fe5ac4c..5e2fa68 100644
--- a/src/Tomighty/AppDelegate.m
+++ b/src/Tomighty/AppDelegate.m
@@ -7,6 +7,7 @@
 //
 
 #import "AppDelegate.h"
+#import "ImageLoader.h"
 #import "Preferences.h"
 #import "PreferencesWindowController.h"
 #import "Sounds.h"
@@ -35,8 +36,16 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     shortBreakContext = [[TimerContext alloc] initWithName:@"Short break"];
     longBreakContext = [[TimerContext alloc] initWithName:@"Long break"];
     
+    [self initMenuItemsIcons];
     [self updateRemainingTime:0];
-    
+}
+
+- (void)initMenuItemsIcons {
+    [self.remainingTimeMenuItem setImage:[ImageLoader loadIcon:@"clock"]];
+    [self.stopTimerMenuItem setImage:[ImageLoader loadIcon:@"stop"]];
+    [self.startPomodoroMenuItem setImage:[ImageLoader loadIcon:@"start-pomodoro"]];
+    [self.startShortBreakMenuItem setImage:[ImageLoader loadIcon:@"start-short-break"]];
+    [self.startLongBreakMenuItem setImage:[ImageLoader loadIcon:@"start-long-break"]];
 }
 
 - (IBAction)showPreferences:(id)sender {
diff --git a/src/Tomighty/ImageLoader.h b/src/Tomighty/ImageLoader.h
new file mode 100644
index 0000000..461ea1b
--- /dev/null
+++ b/src/Tomighty/ImageLoader.h
@@ -0,0 +1,16 @@
+//
+//  ImageFactory.h
+//  Tomighty
+//
+//  Created by Célio Cidral Jr on 05/11/13.
+//  Copyright (c) 2013 Célio Cidral Jr. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface ImageLoader : NSObject
+
++ (NSImage*) loadIcon:(NSString*)name;
++ (NSImage*) loadTiffImage:(NSString*)name withSize:(int)size;
+
+@end
diff --git a/src/Tomighty/ImageLoader.m b/src/Tomighty/ImageLoader.m
new file mode 100644
index 0000000..5e7ac04
--- /dev/null
+++ b/src/Tomighty/ImageLoader.m
@@ -0,0 +1,32 @@
+//
+//  ImageFactory.m
+//  Tomighty
+//
+//  Created by Célio Cidral Jr on 05/11/13.
+//  Copyright (c) 2013 Célio Cidral Jr. All rights reserved.
+//
+
+#import "ImageLoader.h"
+
+@implementation ImageLoader
+
+int const ICON_SIZE = 16;
+
++ (NSImage*) loadIcon:(NSString*)name {
+    return [self loadTiffImage:name withSize:ICON_SIZE];
+}
+
++ (NSImage*) loadTiffImage:(NSString*)name withSize:(int)widthAndHeight {
+    NSString* fileName = [NSString stringWithFormat:@"%@.tiff", name];
+    NSImage* image = [NSImage imageNamed:fileName];
+    
+    NSSize size;
+    size.width = widthAndHeight;
+    size.height = widthAndHeight;
+    
+    [image setSize:size];
+    
+    return image;
+}
+
+@end
diff --git a/src/Tomighty/PreferencesWindow.xib b/src/Tomighty/PreferencesWindow.xib
index 5d79535..1743012 100644
--- a/src/Tomighty/PreferencesWindow.xib
+++ b/src/Tomighty/PreferencesWindow.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">13A603</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
+		<string key="IBDocument.AppKitVersion">1265</string>
+		<string key="IBDocument.HIToolboxVersion">695.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4514</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
@@ -51,30 +51,27 @@
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="745608048">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSTabView" id="993267522">
 							<reference key="NSNextResponder" ref="745608048"/>
-							<int key="NSvFlags">12</int>
+							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{13, 10}, {296, 200}}</string>
 							<reference key="NSSuperview" ref="745608048"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="884018859"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="309429693">
 									<string key="NSIdentifier">1</string>
 									<object class="NSView" key="NSView" id="884018859">
 										<reference key="NSNextResponder" ref="993267522"/>
-										<int key="NSvFlags">256</int>
+										<int key="NSvFlags">274</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSTextField" id="672563935">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{48, 132}, {73, 17}}</string>
+												<string key="NSFrame">{{49, 132}, {73, 17}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="391387079"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -83,7 +80,7 @@
 													<int key="NSCellFlags2">272630784</int>
 													<string key="NSContents">Pomodoro:</string>
 													<object class="NSFont" key="NSSupport" id="174098107">
-														<string key="NSName">LucidaGrande</string>
+														<string key="NSName">.LucidaGrandeUI</string>
 														<double key="NSSize">13</double>
 														<int key="NSfFlags">1044</int>
 													</object>
@@ -109,14 +106,14 @@
 													</object>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="391387079">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
 												<array class="NSMutableArray" key="NSSubviews"/>
-												<string key="NSFrame">{{126, 129}, {50, 22}}</string>
+												<string key="NSFrame">{{128, 129}, {50, 22}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="610782967"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -184,13 +181,13 @@
 													</object>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="720800770">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{40, 102}, {81, 17}}</string>
+												<string key="NSFrame">{{41, 102}, {81, 17}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="71629732"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -205,13 +202,13 @@
 													<reference key="NSTextColor" ref="736888912"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="604068839">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{42, 72}, {79, 17}}</string>
+												<string key="NSFrame">{{43, 72}, {79, 17}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="196908237"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -226,13 +223,13 @@
 													<reference key="NSTextColor" ref="736888912"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="71629732">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{126, 99}, {50, 22}}</string>
+												<string key="NSFrame">{{128, 99}, {50, 22}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="58743228"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -285,13 +282,13 @@
 													<reference key="NSTextColor" ref="867676336"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="196908237">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{126, 69}, {50, 22}}</string>
+												<string key="NSFrame">{{128, 69}, {50, 22}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="182394051"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
@@ -344,13 +341,13 @@
 													<reference key="NSTextColor" ref="867676336"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="610782967">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{181, 132}, {55, 17}}</string>
+												<string key="NSFrame">{{184, 132}, {55, 17}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="720800770"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -365,13 +362,13 @@
 													<reference key="NSTextColor" ref="736888912"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="58743228">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{181, 102}, {55, 17}}</string>
+												<string key="NSFrame">{{184, 102}, {55, 17}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="604068839"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -386,13 +383,13 @@
 													<reference key="NSTextColor" ref="736888912"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSTextField" id="182394051">
 												<reference key="NSNextResponder" ref="884018859"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{181, 72}, {55, 17}}</string>
+												<string key="NSFrame">{{184, 72}, {55, 17}}</string>
 												<reference key="NSSuperview" ref="884018859"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="993267522"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
 												<bool key="NSEnabled">YES</bool>
@@ -407,11 +404,11 @@
 													<reference key="NSTextColor" ref="736888912"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {276, 154}}</string>
 										<reference key="NSSuperview" ref="993267522"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="672563935"/>
 										<string key="NSReuseIdentifierKey">_NS:11</string>
 									</object>
@@ -428,7 +425,7 @@
 											<object class="NSButton" id="613652213">
 												<reference key="NSNextResponder" ref="842547147"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{15, 135}, {229, 18}}</string>
+												<string key="NSFrame">{{15, 135}, {227, 18}}</string>
 												<reference key="NSSuperview" ref="842547147"/>
 												<reference key="NSNextKeyView" ref="196918119"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -459,7 +456,7 @@
 											<object class="NSButton" id="196918119">
 												<reference key="NSNextResponder" ref="842547147"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{15, 115}, {245, 18}}</string>
+												<string key="NSFrame">{{15, 115}, {244, 18}}</string>
 												<reference key="NSSuperview" ref="842547147"/>
 												<reference key="NSNextKeyView" ref="864988419"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -485,7 +482,7 @@
 											<object class="NSTextField" id="864988419">
 												<reference key="NSNextResponder" ref="842547147"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{17, 82}, {168, 17}}</string>
+												<string key="NSFrame">{{18, 82}, {167, 17}}</string>
 												<reference key="NSSuperview" ref="842547147"/>
 												<reference key="NSNextKeyView" ref="924699905"/>
 												<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -501,6 +498,7 @@
 													<reference key="NSTextColor" ref="736888912"/>
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+												<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 											</object>
 											<object class="NSBox" id="924699905">
 												<reference key="NSNextResponder" ref="842547147"/>
@@ -513,7 +511,7 @@
 															<object class="NSButton" id="612580210">
 																<reference key="NSNextResponder" ref="1029824700"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{16, 32}, {94, 18}}</string>
+																<string key="NSFrame">{{16, 32}, {93, 18}}</string>
 																<reference key="NSSuperview" ref="1029824700"/>
 																<reference key="NSNextKeyView" ref="226010198"/>
 																<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -539,7 +537,7 @@
 															<object class="NSButton" id="226010198">
 																<reference key="NSNextResponder" ref="1029824700"/>
 																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{16, 12}, {64, 18}}</string>
+																<string key="NSFrame">{{16, 12}, {63, 18}}</string>
 																<reference key="NSSuperview" ref="1029824700"/>
 																<reference key="NSNextKeyView" ref="993267522"/>
 																<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -563,13 +561,13 @@
 																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 															</object>
 														</array>
-														<string key="NSFrame">{{1, 1}, {242, 58}}</string>
+														<string key="NSFrame">{{1, 1}, {241, 58}}</string>
 														<reference key="NSSuperview" ref="924699905"/>
 														<reference key="NSNextKeyView" ref="612580210"/>
 														<string key="NSReuseIdentifierKey">_NS:11</string>
 													</object>
 												</array>
-												<string key="NSFrame">{{17, 17}, {244, 74}}</string>
+												<string key="NSFrame">{{17, 17}, {243, 74}}</string>
 												<reference key="NSSuperview" ref="842547147"/>
 												<reference key="NSNextKeyView" ref="1029824700"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -579,7 +577,7 @@
 													<int key="NSCellFlags2">0</int>
 													<string key="NSContents"/>
 													<object class="NSFont" key="NSSupport">
-														<string key="NSName">LucidaGrande</string>
+														<string key="NSName">.LucidaGrandeUI</string>
 														<double key="NSSize">11</double>
 														<int key="NSfFlags">3100</int>
 													</object>
@@ -616,8 +614,6 @@
 						</object>
 					</array>
 					<string key="NSFrameSize">{322, 216}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="993267522"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
@@ -808,9 +804,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="745608048"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="321586296">
 								<reference key="firstItem" ref="745608048"/>
@@ -824,9 +821,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="745608048"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="194053366">
 								<reference key="firstItem" ref="993267522"/>
@@ -840,9 +838,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="745608048"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="498345904">
 								<reference key="firstItem" ref="993267522"/>
@@ -856,9 +855,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="745608048"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="993267522"/>
 						</array>
@@ -908,6 +908,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="86314702">
 								<reference key="firstItem" ref="924699905"/>
@@ -924,6 +925,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="291632118">
 								<reference key="firstItem" ref="924699905"/>
@@ -940,6 +942,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="901441367">
 								<reference key="firstItem" ref="864988419"/>
@@ -956,6 +959,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="582845434">
 								<reference key="firstItem" ref="864988419"/>
@@ -972,6 +976,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="403096463">
 								<reference key="firstItem" ref="196918119"/>
@@ -988,6 +993,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="273418738">
 								<reference key="firstItem" ref="196918119"/>
@@ -1001,9 +1007,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="842547147"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="864258077">
 								<reference key="firstItem" ref="613652213"/>
@@ -1017,9 +1024,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="842547147"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="47409540">
 								<reference key="firstItem" ref="613652213"/>
@@ -1033,9 +1041,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="842547147"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="613652213"/>
 							<reference ref="196918119"/>
@@ -1063,6 +1072,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="68998307">
 								<reference key="firstItem" ref="58743228"/>
@@ -1079,6 +1089,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="311886935">
 								<reference key="firstItem" ref="58743228"/>
@@ -1095,6 +1106,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="591805338">
 								<reference key="firstItem" ref="58743228"/>
@@ -1111,6 +1123,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="564321870">
 								<reference key="firstItem" ref="58743228"/>
@@ -1127,6 +1140,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="228792875">
 								<reference key="firstItem" ref="610782967"/>
@@ -1143,6 +1157,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="915954774">
 								<reference key="firstItem" ref="610782967"/>
@@ -1159,6 +1174,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="577211093">
 								<reference key="firstItem" ref="610782967"/>
@@ -1175,6 +1191,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="808389579">
 								<reference key="firstItem" ref="196908237"/>
@@ -1191,6 +1208,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="418517838">
 								<reference key="firstItem" ref="196908237"/>
@@ -1207,6 +1225,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="568059762">
 								<reference key="firstItem" ref="196908237"/>
@@ -1223,6 +1242,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="503822195">
 								<reference key="firstItem" ref="196908237"/>
@@ -1239,6 +1259,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="1013301995">
 								<reference key="firstItem" ref="71629732"/>
@@ -1255,6 +1276,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="309107057">
 								<reference key="firstItem" ref="71629732"/>
@@ -1271,6 +1293,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="540303732">
 								<reference key="firstItem" ref="71629732"/>
@@ -1287,6 +1310,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="494705526">
 								<reference key="firstItem" ref="71629732"/>
@@ -1303,6 +1327,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="265915426">
 								<reference key="firstItem" ref="391387079"/>
@@ -1316,9 +1341,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="884018859"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="824893178">
 								<reference key="firstItem" ref="391387079"/>
@@ -1335,6 +1361,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="324060821">
 								<reference key="firstItem" ref="604068839"/>
@@ -1351,6 +1378,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="1036262156">
 								<reference key="firstItem" ref="720800770"/>
@@ -1367,6 +1395,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="672563935"/>
 							<reference ref="391387079"/>
@@ -1422,6 +1451,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="383481454"/>
 						</array>
@@ -1743,9 +1773,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="924699905"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="404785456">
 								<reference key="firstItem" ref="226010198"/>
@@ -1759,9 +1790,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="924699905"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="978431287">
 								<reference key="firstItem" ref="226010198"/>
@@ -1778,6 +1810,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="983823752">
 								<reference key="firstItem" ref="612580210"/>
@@ -1791,9 +1824,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="924699905"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="410372525">
 								<reference key="firstItem" ref="612580210"/>
@@ -1807,9 +1841,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="924699905"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="226010198"/>
 						</array>
@@ -2049,106 +2084,18 @@
 			<nil key="sourceID"/>
 			<int key="maxID">370</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PreferencesWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="save_sound_play_on_timer_finish:">id</string>
-						<string key="save_sound_play_on_timer_start:">id</string>
-						<string key="save_sound_play_tictac_during_break:">id</string>
-						<string key="save_sound_play_tictac_during_pomodoro:">id</string>
-						<string key="save_time_longBreak:">id</string>
-						<string key="save_time_pomodoro:">id</string>
-						<string key="save_time_shortBreak:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="save_sound_play_on_timer_finish:">
-							<string key="name">save_sound_play_on_timer_finish:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="save_sound_play_on_timer_start:">
-							<string key="name">save_sound_play_on_timer_start:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="save_sound_play_tictac_during_break:">
-							<string key="name">save_sound_play_tictac_during_break:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="save_sound_play_tictac_during_pomodoro:">
-							<string key="name">save_sound_play_tictac_during_pomodoro:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="save_time_longBreak:">
-							<string key="name">save_time_longBreak:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="save_time_pomodoro:">
-							<string key="name">save_time_pomodoro:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="save_time_shortBreak:">
-							<string key="name">save_time_shortBreak:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="sound_on_timer_finish">NSButton</string>
-						<string key="sound_on_timer_start">NSButton</string>
-						<string key="sound_tictac_during_break">NSButton</string>
-						<string key="sound_tictac_during_pomodoro">NSButton</string>
-						<string key="time_longBreak">NSTextField</string>
-						<string key="time_pomodoro">NSTextField</string>
-						<string key="time_shortBreak">NSTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="sound_on_timer_finish">
-							<string key="name">sound_on_timer_finish</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sound_on_timer_start">
-							<string key="name">sound_on_timer_start</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sound_tictac_during_break">
-							<string key="name">sound_tictac_during_break</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sound_tictac_during_pomodoro">
-							<string key="name">sound_tictac_during_pomodoro</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="time_longBreak">
-							<string key="name">time_longBreak</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="time_pomodoro">
-							<string key="name">time_pomodoro</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="time_shortBreak">
-							<string key="name">time_shortBreak</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PreferencesWindowController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
diff --git a/src/Tomighty/StatusIcon.m b/src/Tomighty/StatusIcon.m
index 518d0c2..d81c635 100644
--- a/src/Tomighty/StatusIcon.m
+++ b/src/Tomighty/StatusIcon.m
@@ -7,6 +7,7 @@
 //
 
 #import "StatusIcon.h"
+#import "ImageLoader.h"
 
 @implementation StatusIcon
 {
@@ -22,17 +23,21 @@ - (id)initWithStatusMenu:(NSMenu *)statusMenu {
     self = [super init];
     
     if(self) {
-        blackIcon = [NSImage imageNamed:@"status-normal.tiff"];
-        whiteIcon = [NSImage imageNamed:@"status-white.tiff"];
-        redIcon = [NSImage imageNamed:@"status-pomodoro.tiff"];
-        greenIcon = [NSImage imageNamed:@"status-short-break.tiff"];
-        blueIcon = [NSImage imageNamed:@"status-long-break.tiff"];
+        [self createIcons];
         [self createStatusItem:statusMenu];
     }
     
     return self;
 }
 
+- (void)createIcons {
+    blackIcon = [ImageLoader loadIcon:@"status-normal"];
+    whiteIcon = [ImageLoader loadIcon:@"status-white"];
+    redIcon = [ImageLoader loadIcon:@"status-pomodoro"];
+    greenIcon = [ImageLoader loadIcon:@"status-short-break"];
+    blueIcon = [ImageLoader loadIcon:@"status-long-break"];
+}
+
 - (void)normal {
     [statusItem setImage:blackIcon];
 }
diff --git a/src/Tomighty/en.lproj/MainMenu.xib b/src/Tomighty/en.lproj/MainMenu.xib
index 8253a60..8f23463 100644
--- a/src/Tomighty/en.lproj/MainMenu.xib
+++ b/src/Tomighty/en.lproj/MainMenu.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12F45</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4510</string>
-		<string key="IBDocument.AppKitVersion">1187.40</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">13A603</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
+		<string key="IBDocument.AppKitVersion">1265</string>
+		<string key="IBDocument.HIToolboxVersion">695.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4510</string>
+			<string key="NS.object.0">4514</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSCustomObject</string>
@@ -47,10 +47,6 @@
 						<string key="NSTitle">00:00</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">clock</string>
-						</object>
 						<object class="NSCustomResource" key="NSOnImage" id="453957225">
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">NSMenuCheckmark</string>
@@ -69,10 +65,6 @@
 						<string key="NSTitle">Stop</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">stop</string>
-						</object>
 						<reference key="NSOnImage" ref="453957225"/>
 						<reference key="NSMixedImage" ref="113192098"/>
 					</object>
@@ -119,10 +111,6 @@
 						<string key="NSTitle">Pomodoro</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">start-pomodoro</string>
-						</object>
 						<reference key="NSOnImage" ref="453957225"/>
 						<reference key="NSMixedImage" ref="113192098"/>
 					</object>
@@ -131,10 +119,6 @@
 						<string key="NSTitle">Short break</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">start-short-break</string>
-						</object>
 						<reference key="NSOnImage" ref="453957225"/>
 						<reference key="NSMixedImage" ref="113192098"/>
 					</object>
@@ -143,10 +127,6 @@
 						<string key="NSTitle">Long break</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">start-long-break</string>
-						</object>
 						<reference key="NSOnImage" ref="453957225"/>
 						<reference key="NSMixedImage" ref="113192098"/>
 					</object>
@@ -590,7 +570,7 @@
 		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1080" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -601,11 +581,6 @@
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NSMenuCheckmark">{11, 11}</string>
 			<string key="NSMenuMixedState">{10, 3}</string>
-			<string key="clock">{16, 16}</string>
-			<string key="start-long-break">{16, 16}</string>
-			<string key="start-pomodoro">{16, 16}</string>
-			<string key="start-short-break">{16, 16}</string>
-			<string key="stop">{16, 16}</string>
 		</dictionary>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>