diff --git a/Buildasaur.xcodeproj/project.pbxproj b/Buildasaur.xcodeproj/project.pbxproj
index d77d1ee..3e0b0d8 100644
--- a/Buildasaur.xcodeproj/project.pbxproj
+++ b/Buildasaur.xcodeproj/project.pbxproj
@@ -834,6 +834,7 @@
 		3A5687681A3B93BD0066DB2B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = "Honza Dvorsky";
 				TargetAttributes = {
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Contents.json b/Buildasaur/Images.xcassets/AppIcon.appiconset/Contents.json
index fe5d19d..d48713d 100644
--- a/Buildasaur/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Buildasaur/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -3,59 +3,61 @@
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "builda_icon@16x.png",
+      "filename" : "Icon_16.png",
       "scale" : "1x"
     },
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "builda_icon@32x-2.png",
+      "filename" : "Icon_16@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "builda_icon@32x.png",
+      "filename" : "Icon_32.png",
       "scale" : "1x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "builda_icon@64x.png",
+      "filename" : "Icon_32@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "builda_icon@128x.png",
+      "filename" : "Icon_128.png",
       "scale" : "1x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "builda_icon@256x-2.png",
+      "filename" : "Icon_128@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "builda_icon@256x.png",
+      "filename" : "Icon_256.png",
       "scale" : "1x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "builda_icon@512x.png",
+      "filename" : "Icon_256@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "Icon_512.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "Icon_512@2x.png",
       "scale" : "2x"
     }
   ],
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_128.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_128.png
new file mode 100644
index 0000000..ed34b64
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_128.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_128@2x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_128@2x.png
new file mode 100644
index 0000000..9bae885
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_128@2x.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_16.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_16.png
new file mode 100644
index 0000000..15f021e
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_16.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_16@2x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_16@2x.png
new file mode 100644
index 0000000..7843408
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_16@2x.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_256.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_256.png
new file mode 100644
index 0000000..9bae885
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_256.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_256@2x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_256@2x.png
new file mode 100644
index 0000000..fd8d887
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_256@2x.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_32.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_32.png
new file mode 100644
index 0000000..7843408
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_32.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_32@2x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_32@2x.png
new file mode 100644
index 0000000..da76efd
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_32@2x.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_512.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_512.png
new file mode 100644
index 0000000..fd8d887
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_512.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_512@2x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_512@2x.png
new file mode 100644
index 0000000..035558a
Binary files /dev/null and b/Buildasaur/Images.xcassets/AppIcon.appiconset/Icon_512@2x.png differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@128x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@128x.png
deleted file mode 100644
index d25f203..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@128x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@16x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@16x.png
deleted file mode 100644
index 46c5440..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@16x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@256x-2.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@256x-2.png
deleted file mode 100644
index ec11012..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@256x-2.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@256x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@256x.png
deleted file mode 100644
index ec11012..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@256x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@32x-2.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@32x-2.png
deleted file mode 100644
index 461fe37..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@32x-2.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@32x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@32x.png
deleted file mode 100644
index 461fe37..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@32x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@512x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@512x.png
deleted file mode 100644
index 136bef0..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@512x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@64x.png b/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@64x.png
deleted file mode 100644
index 2d10454..0000000
Binary files a/Buildasaur/Images.xcassets/AppIcon.appiconset/builda_icon@64x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/icon.imageset/Contents.json b/Buildasaur/Images.xcassets/icon.imageset/Contents.json
index 61ecd6d..389f760 100644
--- a/Buildasaur/Images.xcassets/icon.imageset/Contents.json
+++ b/Buildasaur/Images.xcassets/icon.imageset/Contents.json
@@ -3,20 +3,22 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "builda_menu@0.12x.png"
+      "filename" : "Icon_mono_16.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "builda_menu@0.25x.png"
+      "filename" : "Icon_mono_16@2x.png"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "Icon_mono_16@3x.png"
     }
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16.png b/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16.png
new file mode 100644
index 0000000..0c84b24
Binary files /dev/null and b/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16.png differ
diff --git a/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16@2x.png b/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16@2x.png
new file mode 100644
index 0000000..fd38139
Binary files /dev/null and b/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16@2x.png differ
diff --git a/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16@3x.png b/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16@3x.png
new file mode 100644
index 0000000..537bfc8
Binary files /dev/null and b/Buildasaur/Images.xcassets/icon.imageset/Icon_mono_16@3x.png differ
diff --git a/Buildasaur/Images.xcassets/icon.imageset/builda_menu@0.12x.png b/Buildasaur/Images.xcassets/icon.imageset/builda_menu@0.12x.png
deleted file mode 100644
index 14f1b2f..0000000
Binary files a/Buildasaur/Images.xcassets/icon.imageset/builda_menu@0.12x.png and /dev/null differ
diff --git a/Buildasaur/Images.xcassets/icon.imageset/builda_menu@0.25x.png b/Buildasaur/Images.xcassets/icon.imageset/builda_menu@0.25x.png
deleted file mode 100644
index 49f8b2c..0000000
Binary files a/Buildasaur/Images.xcassets/icon.imageset/builda_menu@0.25x.png and /dev/null differ
diff --git a/Buildasaur/MenuItemManager.swift b/Buildasaur/MenuItemManager.swift
index 63ac95b..4296b86 100644
--- a/Buildasaur/MenuItemManager.swift
+++ b/Buildasaur/MenuItemManager.swift
@@ -19,13 +19,12 @@ class MenuItemManager : NSObject, NSMenuDelegate {
         
         let statusItem = statusBar.statusItemWithLength(32)
         statusItem.title = ""
-        let image = NSImage(named: "icon")
-        image?.setTemplate(true)
-        statusItem.image = image
+        statusItem.image = NSImage(named: "icon")
         statusItem.highlightMode = true
         
         var menu = NSMenu()
         menu.addItemWithTitle("Open Buildasaur", action: "showMainWindow", keyEquivalent: "")
+        menu.addItemWithTitle("Quit Buildasaur", action: "terminate:", keyEquivalent: "")
         menu.addItem(NSMenuItem.separatorItem())
         self.firstIndexLastSyncedMenuItem = menu.numberOfItems