diff --git a/ACCodeSnippetRepository.xcodeproj/project.pbxproj b/ACCodeSnippetRepository.xcodeproj/project.pbxproj
index b052723..9e21f90 100644
--- a/ACCodeSnippetRepository.xcodeproj/project.pbxproj
+++ b/ACCodeSnippetRepository.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		012836131B11EC41007236B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 012836121B11EC41007236B8 /* Images.xcassets */; };
+		012836141B11EC41007236B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 012836121B11EC41007236B8 /* Images.xcassets */; };
 		51010E0218AC5CB1000AA1F1 /* ACGitRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = 51010E0118AC5CB1000AA1F1 /* ACGitRepository.m */; };
 		51010E0318AC5CB1000AA1F1 /* ACGitRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = 51010E0118AC5CB1000AA1F1 /* ACGitRepository.m */; };
 		5105B22718AC59520066728E /* NSTask+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 5105B22618AC59520066728E /* NSTask+Extras.m */; };
@@ -18,9 +20,6 @@
 		5153BAAC18B3410C00C1E75B /* NSDictionary+MergeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5153BAAB18B3410C00C1E75B /* NSDictionary+MergeTests.m */; };
 		5154068518AC4B500065CA33 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5154068418AC4B500065CA33 /* SenTestingKit.framework */; };
 		5154068B18AC4B500065CA33 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5154068918AC4B500065CA33 /* InfoPlist.strings */; };
-		515CE9DA18B1DCAA000962EA /* GitHub-Mark-120px-plus.png in Resources */ = {isa = PBXBuildFile; fileRef = 515CE9D718B1DCAA000962EA /* GitHub-Mark-120px-plus.png */; };
-		515CE9DB18B1DCAA000962EA /* GitHub-Mark-32px.png in Resources */ = {isa = PBXBuildFile; fileRef = 515CE9D818B1DCAA000962EA /* GitHub-Mark-32px.png */; };
-		515CE9DC18B1DCAA000962EA /* GitHub-Mark-64px.png in Resources */ = {isa = PBXBuildFile; fileRef = 515CE9D918B1DCAA000962EA /* GitHub-Mark-64px.png */; };
 		5162AC2A18AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5162AC2818AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.m */; };
 		5162AC2B18AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5162AC2918AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.xib */; };
 		517DF2A618AC4BF1008980B3 /* IDECodeSnippetRepositorySwizzler.m in Sources */ = {isa = PBXBuildFile; fileRef = 517DF2A318AC4BF1008980B3 /* IDECodeSnippetRepositorySwizzler.m */; };
@@ -51,6 +50,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		012836121B11EC41007236B8 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		51010E0018AC5CB1000AA1F1 /* ACGitRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ACGitRepository.h; sourceTree = "<group>"; };
 		51010E0118AC5CB1000AA1F1 /* ACGitRepository.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ACGitRepository.m; sourceTree = "<group>"; };
 		5105B22518AC59520066728E /* NSTask+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTask+Extras.h"; sourceTree = "<group>"; };
@@ -65,9 +65,6 @@
 		5154068818AC4B500065CA33 /* ACCodeSnippetRepository Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ACCodeSnippetRepository Tests-Info.plist"; sourceTree = "<group>"; };
 		5154068A18AC4B500065CA33 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5154068E18AC4B500065CA33 /* ACCodeSnippetRepository Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ACCodeSnippetRepository Tests-Prefix.pch"; sourceTree = "<group>"; };
-		515CE9D718B1DCAA000962EA /* GitHub-Mark-120px-plus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "GitHub-Mark-120px-plus.png"; sourceTree = "<group>"; };
-		515CE9D818B1DCAA000962EA /* GitHub-Mark-32px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "GitHub-Mark-32px.png"; sourceTree = "<group>"; };
-		515CE9D918B1DCAA000962EA /* GitHub-Mark-64px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "GitHub-Mark-64px.png"; sourceTree = "<group>"; };
 		5162AC2718AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ACCodeSnippetRepositoryConfigurationWindowController.h; sourceTree = "<group>"; };
 		5162AC2818AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ACCodeSnippetRepositoryConfigurationWindowController.m; sourceTree = "<group>"; };
 		5162AC2918AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ACCodeSnippetRepositoryConfigurationWindowController.xib; sourceTree = "<group>"; };
@@ -145,21 +142,11 @@
 		515CE9D518B1DCAA000962EA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				515CE9D618B1DCAA000962EA /* Images */,
+				012836121B11EC41007236B8 /* Images.xcassets */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
 		};
-		515CE9D618B1DCAA000962EA /* Images */ = {
-			isa = PBXGroup;
-			children = (
-				515CE9D718B1DCAA000962EA /* GitHub-Mark-120px-plus.png */,
-				515CE9D818B1DCAA000962EA /* GitHub-Mark-32px.png */,
-				515CE9D918B1DCAA000962EA /* GitHub-Mark-64px.png */,
-			);
-			path = Images;
-			sourceTree = "<group>";
-		};
 		5162AC2618AD9FB4000109C9 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -376,6 +363,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5154068B18AC4B500065CA33 /* InfoPlist.strings in Resources */,
+				012836141B11EC41007236B8 /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -383,11 +371,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				515CE9DC18B1DCAA000962EA /* GitHub-Mark-64px.png in Resources */,
-				515CE9DB18B1DCAA000962EA /* GitHub-Mark-32px.png in Resources */,
 				5162AC2B18AD9FD0000109C9 /* ACCodeSnippetRepositoryConfigurationWindowController.xib in Resources */,
+				012836131B11EC41007236B8 /* Images.xcassets in Resources */,
 				518E69AB18AC4A8900C57456 /* InfoPlist.strings in Resources */,
-				515CE9DA18B1DCAA000962EA /* GitHub-Mark-120px-plus.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ACCodeSnippetRepository/Controllers/ACCodeSnippetRepositoryConfigurationWindowController.xib b/ACCodeSnippetRepository/Controllers/ACCodeSnippetRepositoryConfigurationWindowController.xib
index f87b810..7eb3334 100644
--- a/ACCodeSnippetRepository/Controllers/ACCodeSnippetRepositoryConfigurationWindowController.xib
+++ b/ACCodeSnippetRepository/Controllers/ACCodeSnippetRepositoryConfigurationWindowController.xib
@@ -129,7 +129,7 @@ https://github.com/acoomans/ACCodeSnippetRepositoryPlugin</string>
                             <constraint firstAttribute="width" constant="32" id="BhJ-tv-NyN"/>
                             <constraint firstAttribute="height" constant="32" id="GYx-uL-RWW"/>
                         </constraints>
-                        <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="GitHub-Mark-64px" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="Ot1-5p-hiQ">
+                        <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="GitHubImage" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="Ot1-5p-hiQ">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -257,6 +257,6 @@ https://github.com/acoomans/ACCodeSnippetRepositoryPlugin</string>
         </window>
     </objects>
     <resources>
-        <image name="GitHub-Mark-64px" width="64" height="64"/>
+        <image name="GitHubImage" width="32" height="32"/>
     </resources>
 </document>
diff --git a/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/Contents.json b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/Contents.json
new file mode 100644
index 0000000..6d811ad
--- /dev/null
+++ b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "GitHub-Mark-32px.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "GitHub-Mark-64px.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "GitHub-Mark-120px-plus.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-120px-plus.png b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-120px-plus.png
new file mode 100644
index 0000000..ea6ff54
Binary files /dev/null and b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-120px-plus.png differ
diff --git a/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-32px.png b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-32px.png
new file mode 100644
index 0000000..8b25551
Binary files /dev/null and b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-32px.png differ
diff --git a/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-64px.png b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-64px.png
new file mode 100644
index 0000000..182a1a3
Binary files /dev/null and b/ACCodeSnippetRepository/Resources/Images.xcassets/GitHubImage.imageset/GitHub-Mark-64px.png differ