diff --git a/Icon.iconset/_icon_16x16.png b/Icon.iconset/_icon_16x16.png
new file mode 100644
index 00000000..375968aa
Binary files /dev/null and b/Icon.iconset/_icon_16x16.png differ
diff --git a/Icon.iconset/_icon_32x32.png b/Icon.iconset/_icon_32x32.png
new file mode 100644
index 00000000..4588ac69
Binary files /dev/null and b/Icon.iconset/_icon_32x32.png differ
diff --git a/Icon.iconset/icon.psd b/Icon.iconset/icon.psd
new file mode 100644
index 00000000..2d511de0
Binary files /dev/null and b/Icon.iconset/icon.psd differ
diff --git a/Icon.iconset/icon_128x128.png b/Icon.iconset/icon_128x128.png
new file mode 100644
index 00000000..4f003f36
Binary files /dev/null and b/Icon.iconset/icon_128x128.png differ
diff --git a/Icon.iconset/icon_256x256.png b/Icon.iconset/icon_256x256.png
new file mode 100644
index 00000000..1271c178
Binary files /dev/null and b/Icon.iconset/icon_256x256.png differ
diff --git a/Icon.iconset/icon_512x512.png b/Icon.iconset/icon_512x512.png
new file mode 100644
index 00000000..e55fe5fe
Binary files /dev/null and b/Icon.iconset/icon_512x512.png differ
diff --git a/Icon.iconset/icon_64x64.png b/Icon.iconset/icon_64x64.png
new file mode 100644
index 00000000..21e10f4b
Binary files /dev/null and b/Icon.iconset/icon_64x64.png differ
diff --git a/google-music-mac.xcodeproj/project.pbxproj b/google-music-mac.xcodeproj/project.pbxproj
index 20e3034b..226c3fee 100644
--- a/google-music-mac.xcodeproj/project.pbxproj
+++ b/google-music-mac.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		1A7B685317453E40001E509E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A7B685217453E40001E509E /* AppDelegate.m */; };
 		1A7B685617453E40001E509E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A7B685417453E40001E509E /* MainMenu.xib */; };
 		1A7B687417453E4C001E509E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A7B687317453E4C001E509E /* WebKit.framework */; };
-		1A7B68811745ABBD001E509E /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1A7B68801745ABBD001E509E /* icon.icns */; };
 		2B8FC1C018C9CB0E006D04FF /* google-music-mac.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */; };
 		2B8FC1C318C9CB16006D04FF /* RadiantPlayerScriptCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */; };
 		38D0C36DAD0F40F5A7254224 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BABD1B4DDCC34CB291C66033 /* libPods.a */; };
@@ -33,6 +32,7 @@
 		D343CDF518C69DF4002F9DB3 /* NavigationPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D343CDF418C69DF4002F9DB3 /* NavigationPreferencesViewController.m */; };
 		D34DC2BC18C295A700C27596 /* LastFmService.m in Sources */ = {isa = PBXBuildFile; fileRef = D34DC2BB18C295A700C27596 /* LastFmService.m */; };
 		D35788BD18C2F820006AF859 /* GeneralPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35788BC18C2F820006AF859 /* GeneralPreferencesViewController.m */; };
+		D369FEFE18E3FB6B004CB1C6 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D369FEFD18E3FB6B004CB1C6 /* icon.icns */; };
 		D370E8E018E21ABC007B5450 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D370E8DF18E21ABC007B5450 /* QuartzCore.framework */; };
 		D370E8E318E2BFE1007B5450 /* ExpandHoverView.m in Sources */ = {isa = PBXBuildFile; fileRef = D370E8E218E2BFE1007B5450 /* ExpandHoverView.m */; };
 		D3B1668318BB0E43003FCE6B /* DummyWebViewPolicyDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D3B1668218BB0E43003FCE6B /* DummyWebViewPolicyDelegate.m */; };
@@ -63,7 +63,6 @@
 		1A7B685217453E40001E509E /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		1A7B685517453E40001E509E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		1A7B687317453E4C001E509E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
-		1A7B68801745ABBD001E509E /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
 		2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "google-music-mac.sdef"; sourceTree = "<group>"; };
 		2B8FC1C118C9CB16006D04FF /* RadiantPlayerScriptCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadiantPlayerScriptCommand.h; sourceTree = "<group>"; };
 		2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RadiantPlayerScriptCommand.m; sourceTree = "<group>"; };
@@ -94,6 +93,7 @@
 		D34DC2BB18C295A700C27596 /* LastFmService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LastFmService.m; sourceTree = "<group>"; };
 		D35788BB18C2F820006AF859 /* GeneralPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneralPreferencesViewController.h; sourceTree = "<group>"; };
 		D35788BC18C2F820006AF859 /* GeneralPreferencesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneralPreferencesViewController.m; sourceTree = "<group>"; };
+		D369FEFD18E3FB6B004CB1C6 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
 		D370E8DF18E21ABC007B5450 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		D370E8E118E2BFE1007B5450 /* ExpandHoverView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExpandHoverView.h; sourceTree = "<group>"; };
 		D370E8E218E2BFE1007B5450 /* ExpandHoverView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExpandHoverView.m; sourceTree = "<group>"; };
@@ -133,7 +133,7 @@
 		1A7B683317453E40001E509E = {
 			isa = PBXGroup;
 			children = (
-				1A7B68801745ABBD001E509E /* icon.icns */,
+				D369FEFD18E3FB6B004CB1C6 /* icon.icns */,
 				1A7B684517453E40001E509E /* google-music-mac */,
 				1A7B683E17453E40001E509E /* Frameworks */,
 				1A7B683D17453E40001E509E /* Products */,
@@ -341,11 +341,11 @@
 				2B8FC1C018C9CB0E006D04FF /* google-music-mac.sdef in Resources */,
 				D302E13418B561E100CCD18E /* Preferences.plist in Resources */,
 				1A7B684A17453E40001E509E /* InfoPlist.strings in Resources */,
+				D369FEFE18E3FB6B004CB1C6 /* icon.icns in Resources */,
 				D3DB8FF018BD253A00ABE93B /* images in Resources */,
 				1A7B685017453E40001E509E /* Credits.rtf in Resources */,
 				1A7B685617453E40001E509E /* MainMenu.xib in Resources */,
 				D3B71C3818C2F0F20041358B /* PreferencesWindowController.xib in Resources */,
-				1A7B68811745ABBD001E509E /* icon.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/google-music-mac/en.lproj/MainMenu.xib b/google-music-mac/en.lproj/MainMenu.xib
index 5e5d92ad..0fa18181 100644
--- a/google-music-mac/en.lproj/MainMenu.xib
+++ b/google-music-mac/en.lproj/MainMenu.xib
@@ -394,7 +394,7 @@
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tIi-oI-kZX">
                         <rect key="frame" x="18" y="207" width="261" height="13"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="for Google Play Music" id="SKF-de-dBn">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="for Google Play Music™" id="SKF-de-dBn">
                             <font key="font" metaFont="system" size="10"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/icon.icns b/icon.icns
index 2f2d9924..8710010b 100644
Binary files a/icon.icns and b/icon.icns differ
diff --git a/icon.png b/icon.png
deleted file mode 100644
index d21a2481..00000000
Binary files a/icon.png and /dev/null differ