9 files changed, 5 insertions, 4 deletions
diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
index 2db2b1c7..24c81d35 100644
--- a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -41,8 +41,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "ZeroTierIcon512x512.png",
       "scale" : "1x"
     },
     {
diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
new file mode 100644
index 00000000..d225c2e3
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
index ab75ef9a..3213cbe1 100644
--- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
+++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
@@ -2,12 +2,12 @@
   "images" : [
     {
       "idiom" : "mac",
-      "filename" : "MenuBarIconMac.png",
+      "filename" : "MenuBar.png",
       "scale" : "1x"
     },
     {
       "idiom" : "mac",
-      "filename" : "MenuBarIconMac@2x.png",
+      "filename" : "MenuBar@2x.png",
       "scale" : "2x"
     }
   ],
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png
new file mode 100644
index 00000000..2734f6b6
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar.png
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
new file mode 100644
index 00000000..08afad40
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png
deleted file mode 100644
index 74e59fe7..00000000
--- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png
+++ /dev/null
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png
deleted file mode 100644
index 1c99f851..00000000
--- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png
+++ /dev/null
diff --git a/ZeroTier One/Info.plist b/ZeroTier One/Info.plist
index 87cfc3f6..80b0c466 100644
--- a/ZeroTier One/Info.plist
+++ b/ZeroTier One/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconFile</key>
-	<string></string>
+	<string>ZeroTierIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/ZeroTier One/ZeroTierIcon.icns b/ZeroTier One/ZeroTierIcon.icns
new file mode 100644
index 00000000..17e60d58
--- /dev/null
+++ b/ZeroTier One/ZeroTierIcon.icns