diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
index 8c0c2c0a8..fc67e3e5a 100644
--- a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
@@ -27,16 +27,22 @@
 	// This was added to the bundle's Info.plist to get it from the build system
 	NSString *teamIdentifierPrefix = [extBundle objectForInfoDictionaryKey:@"TeamIdentifierPrefix"];
 
-	[syncController setBadgeImage:[extBundle imageForResource:@"ok.icns"] label:nil forBadgeIdentifier:@"OK"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"sync.icns"] label:nil forBadgeIdentifier:@"SYNC"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"sync.icns"] label:nil forBadgeIdentifier:@"NEW"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"warning.icns"] label:nil forBadgeIdentifier:@"IGNORE"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"error.icns"] label:nil forBadgeIdentifier:@"ERROR"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"ok_swm.icns"] label:nil forBadgeIdentifier:@"OK+SWM"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"sync_swm.icns"] label:nil forBadgeIdentifier:@"SYNC+SWM"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"sync_swm.icns"] label:nil forBadgeIdentifier:@"NEW+SWM"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"warning_swm.icns"] label:nil forBadgeIdentifier:@"IGNORE+SWM"];
-	[syncController setBadgeImage:[extBundle imageForResource:@"error_swm.icns"] label:nil forBadgeIdentifier:@"ERROR+SWM"];
+	NSImage *ok = [extBundle imageForResource:@"ok.icns"];
+	NSImage *ok_swm = [extBundle imageForResource:@"ok_swm.icns"];
+	NSImage *sync = [extBundle imageForResource:@"sync.icns"];
+	NSImage *warning = [extBundle imageForResource:@"warning.icns"];
+	NSImage *error = [extBundle imageForResource:@"error.icns"];
+
+	[syncController setBadgeImage:ok label:nil forBadgeIdentifier:@"OK"];
+	[syncController setBadgeImage:sync label:nil forBadgeIdentifier:@"SYNC"];
+	[syncController setBadgeImage:sync label:nil forBadgeIdentifier:@"NEW"];
+	[syncController setBadgeImage:warning label:nil forBadgeIdentifier:@"IGNORE"];
+	[syncController setBadgeImage:error label:nil forBadgeIdentifier:@"ERROR"];
+	[syncController setBadgeImage:ok_swm label:nil forBadgeIdentifier:@"OK+SWM"];
+	[syncController setBadgeImage:sync label:nil forBadgeIdentifier:@"SYNC+SWM"];
+	[syncController setBadgeImage:sync label:nil forBadgeIdentifier:@"NEW+SWM"];
+	[syncController setBadgeImage:warning label:nil forBadgeIdentifier:@"IGNORE+SWM"];
+	[syncController setBadgeImage:error label:nil forBadgeIdentifier:@"ERROR+SWM"];
 	
 	// The Mach post name needs to be prefixed with the code signing Team ID
 	// https://developer.apple.com/library/mac/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW24
diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj b/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj
index 61aead9a2..3bed4ca08 100644
--- a/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj
@@ -12,13 +12,10 @@
 		C2B573DE1B1CD9CE00303B36 /* FinderSync.m in Sources */ = {isa = PBXBuildFile; fileRef = C2B573DD1B1CD9CE00303B36 /* FinderSync.m */; };
 		C2B573E21B1CD9CE00303B36 /* FinderSyncExt.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C2B573D71B1CD9CE00303B36 /* FinderSyncExt.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		C2B573E91B1DA1FB00303B36 /* SyncClientProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C2B573E81B1DA1FB00303B36 /* SyncClientProxy.m */; };
-		C2B573F21B1DAD6400303B36 /* error_swm.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573EA1B1DAD6400303B36 /* error_swm.iconset */; };
 		C2B573F31B1DAD6400303B36 /* error.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573EB1B1DAD6400303B36 /* error.iconset */; };
 		C2B573F41B1DAD6400303B36 /* ok_swm.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573EC1B1DAD6400303B36 /* ok_swm.iconset */; };
 		C2B573F51B1DAD6400303B36 /* ok.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573ED1B1DAD6400303B36 /* ok.iconset */; };
-		C2B573F61B1DAD6400303B36 /* sync_swm.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573EE1B1DAD6400303B36 /* sync_swm.iconset */; };
 		C2B573F71B1DAD6400303B36 /* sync.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573EF1B1DAD6400303B36 /* sync.iconset */; };
-		C2B573F81B1DAD6400303B36 /* warning_swm.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573F01B1DAD6400303B36 /* warning_swm.iconset */; };
 		C2B573F91B1DAD6400303B36 /* warning.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573F11B1DAD6400303B36 /* warning.iconset */; };
 /* End PBXBuildFile section */
 
@@ -57,13 +54,10 @@
 		C2B573DD1B1CD9CE00303B36 /* FinderSync.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FinderSync.m; sourceTree = "<group>"; };
 		C2B573E71B1DA1FB00303B36 /* SyncClientProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyncClientProxy.h; sourceTree = "<group>"; };
 		C2B573E81B1DA1FB00303B36 /* SyncClientProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyncClientProxy.m; sourceTree = "<group>"; };
-		C2B573EA1B1DAD6400303B36 /* error_swm.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = error_swm.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/error_swm.iconset; sourceTree = "<absolute>"; };
 		C2B573EB1B1DAD6400303B36 /* error.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = error.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/error.iconset; sourceTree = "<absolute>"; };
 		C2B573EC1B1DAD6400303B36 /* ok_swm.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = ok_swm.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/ok_swm.iconset; sourceTree = "<absolute>"; };
 		C2B573ED1B1DAD6400303B36 /* ok.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = ok.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/ok.iconset; sourceTree = "<absolute>"; };
-		C2B573EE1B1DAD6400303B36 /* sync_swm.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = sync_swm.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/sync_swm.iconset; sourceTree = "<absolute>"; };
 		C2B573EF1B1DAD6400303B36 /* sync.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = sync.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/sync.iconset; sourceTree = "<absolute>"; };
-		C2B573F01B1DAD6400303B36 /* warning_swm.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = warning_swm.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/warning_swm.iconset; sourceTree = "<absolute>"; };
 		C2B573F11B1DAD6400303B36 /* warning.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = warning.iconset; path = /Users/joce/dev/client/shell_integration/MacOSX/OwnCloudFinder/FinderSyncExt/../../../icons/nopadding/warning.iconset; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
@@ -134,13 +128,10 @@
 		C2B573D91B1CD9CE00303B36 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				C2B573EA1B1DAD6400303B36 /* error_swm.iconset */,
 				C2B573EB1B1DAD6400303B36 /* error.iconset */,
 				C2B573EC1B1DAD6400303B36 /* ok_swm.iconset */,
 				C2B573ED1B1DAD6400303B36 /* ok.iconset */,
-				C2B573EE1B1DAD6400303B36 /* sync_swm.iconset */,
 				C2B573EF1B1DAD6400303B36 /* sync.iconset */,
-				C2B573F01B1DAD6400303B36 /* warning_swm.iconset */,
 				C2B573F11B1DAD6400303B36 /* warning.iconset */,
 				C2B573DA1B1CD9CE00303B36 /* Info.plist */,
 				C2B573DB1B1CD9CE00303B36 /* FinderSyncExt.entitlements */,
@@ -254,12 +245,9 @@
 			files = (
 				C2B573F91B1DAD6400303B36 /* warning.iconset in Resources */,
 				C2B573F31B1DAD6400303B36 /* error.iconset in Resources */,
-				C2B573F81B1DAD6400303B36 /* warning_swm.iconset in Resources */,
-				C2B573F21B1DAD6400303B36 /* error_swm.iconset in Resources */,
 				C2B573F71B1DAD6400303B36 /* sync.iconset in Resources */,
 				C2B573F41B1DAD6400303B36 /* ok_swm.iconset in Resources */,
 				C2B573F51B1DAD6400303B36 /* ok.iconset in Resources */,
-				C2B573F61B1DAD6400303B36 /* sync_swm.iconset in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/shell_integration/icons/128x128/.DS_Store b/shell_integration/icons/128x128/.DS_Store
deleted file mode 100644
index 3604397ad..000000000
Binary files a/shell_integration/icons/128x128/.DS_Store and /dev/null differ
diff --git a/shell_integration/icons/32x32/.DS_Store b/shell_integration/icons/32x32/.DS_Store
deleted file mode 100644
index 5fb443d05..000000000
Binary files a/shell_integration/icons/32x32/.DS_Store and /dev/null differ
diff --git a/shell_integration/icons/512x512/.DS_Store b/shell_integration/icons/512x512/.DS_Store
deleted file mode 100644
index 1f45086b2..000000000
Binary files a/shell_integration/icons/512x512/.DS_Store and /dev/null differ
diff --git a/shell_integration/icons/nopadding/SVG/attention.svg b/shell_integration/icons/nopadding/SVG/attention.svg
new file mode 100755
index 000000000..067edc422
--- /dev/null
+++ b/shell_integration/icons/nopadding/SVG/attention.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Sync" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<circle fill="#E0D92D" cx="64" cy="64" r="61.9"/>
+			<path fill="#8E7409" d="M64,128C28.7,128,0,99.3,0,64S28.7,0,64,0s64,28.7,64,64S99.3,128,64,128z M64,4.1C31,4.1,4.1,31,4.1,64
+				c0,33,26.9,59.9,59.9,59.9c33,0,59.9-26.9,59.9-59.9C123.9,31,97,4.1,64,4.1z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M64,107.4c-5.6,0-10.2-4.6-10.2-10.2C53.8,91.6,58.4,87,64,87c5.6,0,10.2,4.6,10.2,10.2
+					C74.2,102.8,69.6,107.4,64,107.4z M64,81.3c-8.3,0-8.3-7.3-8.3-10.2L52,30.9v-0.1c0-5.6,5.4-10.2,12-10.2c6.6,0,12,4.6,12,10.2
+					v0.1l-3.7,40.3C72.3,74,72.3,81.3,64,81.3z"/>
+			</g>
+			<g>
+				<path fill="#8E7409" d="M64,21.9c5.9,0,10.7,4,10.7,8.8l-3.7,40.3c0,4.9-1.1,8.8-7,8.8c-5.9,0-6.9-4-6.9-8.8l-3.7-40.3
+					C53.3,25.9,58.1,21.9,64,21.9 M64,88.3c4.9,0,8.9,4,8.9,8.8c0,4.9-4,8.9-8.9,8.9c-4.9,0-8.9-4-8.9-8.9
+					C55.1,92.3,59.1,88.3,64,88.3 M64,19.2c-3.5,0-6.8,1.1-9.3,3.2c-2.7,2.2-4.1,5.2-4.1,8.4v0.1l0,0.1l3.7,40.1
+					c0,2.3,0.2,5.2,1.7,7.6c1.6,2.6,4.3,3.9,8,3.9c3.7,0,6.4-1.3,8-3.9c1.5-2.3,1.7-5.3,1.7-7.6L77.4,31l0-0.1v-0.1
+					c0-3.2-1.5-6.2-4.1-8.4C70.8,20.3,67.5,19.2,64,19.2L64,19.2z M64,85.6c-6.4,0-11.6,5.2-11.6,11.6c0,6.4,5.2,11.6,11.6,11.6
+					c6.4,0,11.6-5.2,11.6-11.6C75.6,90.8,70.4,85.6,64,85.6L64,85.6z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/shell_integration/icons/nopadding/SVG/error.svg b/shell_integration/icons/nopadding/SVG/error.svg
new file mode 100755
index 000000000..8aa5003c5
--- /dev/null
+++ b/shell_integration/icons/nopadding/SVG/error.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Sync" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<circle fill="#B23015" cx="64" cy="64" r="61.9"/>
+			<path fill="#981D05" d="M64,128C28.7,128,0,99.3,0,64S28.7,0,64,0s64,28.7,64,64S99.3,128,64,128z M64,4.1C31,4.1,4.1,31,4.1,64
+				S31,123.9,64,123.9c33,0,59.9-26.9,59.9-59.9S97,4.1,64,4.1z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M41.8,95.2c-2.4,0-4.4-0.9-6.2-2.6c-1.7-1.7-2.7-3.9-2.8-6.4c-0.1-2.6,0.7-4.8,2.5-6.8L50.8,64L35.4,48.6
+				c-1.9-1.9-2.7-4-2.5-6.5c0.2-2.3,1.1-4.5,2.7-6.3l0,0l0,0c1.9-1.9,4-2.9,6.3-2.9c0.2,0,0.4,0,0.6,0c2.4,0.2,4.5,1.1,6.4,2.8l0,0
+				L64,50.7l15.4-15.2c1.8-1.8,3.9-2.7,6.3-2.7c0.1,0,0.1,0,0.2,0c2.4,0.1,4.6,1,6.5,2.8l0,0c1.7,1.7,2.6,3.9,2.6,6.5
+				c0,2.6-0.9,4.8-2.6,6.6L77.4,64l15.1,15.2c1.7,1.7,2.6,3.9,2.7,6.5c0.1,2.6-0.8,5-2.7,6.9c-1.7,1.7-4,2.6-6.6,2.6
+				c-2.6,0-4.9-1-6.8-3L64,77.4L48.9,92.6l0,0c-1.7,1.5-3.8,2.4-6.4,2.6C42.3,95.2,42,95.2,41.8,95.2z"/>
+		</g>
+		<g>
+			<path fill="#981D05" d="M41.9,34.1c0.2,0,0.3,0,0.5,0c2,0.2,3.9,1,5.5,2.5l16,16l16.4-16.2c1.5-1.5,3.3-2.3,5.3-2.3
+				c0.1,0,0.1,0,0.2,0c2.1,0,4,0.8,5.6,2.4c1.5,1.5,2.2,3.3,2.2,5.6c0,2.2-0.7,4.1-2.2,5.7L75.4,64l16,16.2c1.5,1.5,2.3,3.3,2.3,5.6
+				c0.1,2.3-0.7,4.2-2.3,5.9c-1.5,1.5-3.3,2.2-5.6,2.2c-2.3,0-4.2-0.9-5.9-2.6L64,75.5l-16,16.2c-1.5,1.3-3.3,2.1-5.5,2.2
+				c-0.2,0-0.4,0-0.6,0c-2,0-3.7-0.7-5.2-2.2c-1.5-1.5-2.3-3.3-2.4-5.5c-0.1-2.2,0.6-4.1,2.2-5.7L52.7,64L36.3,47.6
+				c-1.6-1.6-2.3-3.4-2.1-5.4c0.2-2.1,0.9-3.9,2.3-5.6C38.3,35,40,34.1,41.9,34.1 M41.9,31.4c-2.6,0-5,1.1-7.2,3.3l-0.1,0.1
+				l-0.1,0.1c-1.8,2.1-2.8,4.5-3,7.1c-0.2,2.9,0.8,5.5,2.9,7.6L48.9,64L34.4,78.5l0,0l0,0c-2.1,2.2-3.1,4.8-2.9,7.8
+				c0.2,2.9,1.2,5.3,3.2,7.3c2,2,4.4,3,7.2,3c0.3,0,0.5,0,0.8,0c2.8-0.2,5.2-1.2,7.2-2.9l0.1-0.1l0.1-0.1L64,79.4L78,93.2
+				c2.2,2.3,4.8,3.4,7.8,3.4c3,0,5.6-1,7.6-3c2.2-2.2,3.3-4.9,3.1-7.9c-0.1-3-1.2-5.5-3.1-7.5L79.3,64l14.1-14.2l0,0l0,0
+				c2-2.1,3-4.6,3-7.6c0-3-1-5.5-3-7.5l0,0l0,0c-2.2-2-4.7-3.1-7.4-3.2c-0.1,0-0.1,0-0.2,0c-2.8,0-5.2,1-7.3,3.1L64,48.8L49.9,34.7
+				l0-0.1l-0.1-0.1c-2.1-1.9-4.5-2.9-7.2-3.2C42.4,31.4,42.1,31.4,41.9,31.4L41.9,31.4z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/shell_integration/icons/nopadding/SVG/ok.svg b/shell_integration/icons/nopadding/SVG/ok.svg
new file mode 100755
index 000000000..8e5a24b1c
--- /dev/null
+++ b/shell_integration/icons/nopadding/SVG/ok.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Sync" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#5EB220" d="M64,2.1c34.2,0,61.9,27.7,61.9,61.9S98.2,125.9,64,125.9C29.8,125.9,2.1,98.2,2.1,64S29.8,2.1,64,2.1z"/>
+		<path fill="#3A9804" d="M64,128C28.7,128,0,99.3,0,64S28.7,0,64,0s64,28.7,64,64S99.3,128,64,128z M64,4.1C31,4.1,4.1,31,4.1,64
+			S31,123.9,64,123.9c33,0,59.9-26.9,59.9-59.9S97,4.1,64,4.1z"/>
+	</g>
+	<g>
+		<g>
+			<polygon fill="#FFFFFF" points="25.7,76.8 35.9,63.8 53,77.3 87.1,31 100.3,40.7 61.3,93.9 56.2,100.7 			"/>
+		</g>
+		<g>
+			<path fill="#3A9804" d="M87.3,32.4L98.9,41l-4.3,5.8L60.4,93.2l-4.4,6l-5.8-4.6L32.8,81.1l-5.7-4.4L36,65.3l5.7,4.4l11.5,9
+				L83,38.2L87.3,32.4 M86.8,29.5l-1.2,1.7L81.3,37L52.8,75.8L43,68.1l-5.7-4.4l-1.6-1.3L34.4,64l-8.9,11.4L24.3,77l1.6,1.3l5.7,4.4
+				l17.4,13.6l5.8,4.6l1.7,1.3l1.3-1.7l4.4-6L96.3,48l4.3-5.8l1.2-1.7l-1.7-1.2l-11.6-8.5L86.8,29.5L86.8,29.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/shell_integration/icons/nopadding/SVG/shared.svg b/shell_integration/icons/nopadding/SVG/shared.svg
new file mode 100755
index 000000000..319303761
--- /dev/null
+++ b/shell_integration/icons/nopadding/SVG/shared.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Sync" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<g>
+				<path fill="#5EB220" d="M64,2.1c34.2,0,61.9,27.7,61.9,61.9S98.2,125.9,64,125.9C29.8,125.9,2.1,98.2,2.1,64S29.8,2.1,64,2.1z"
+					/>
+			</g>
+			<g>
+				<path fill="#3A9804" d="M64,128C28.7,128,0,99.3,0,64S28.7,0,64,0s64,28.7,64,64S99.3,128,64,128z M64,4.1C31,4.1,4.1,31,4.1,64
+					S31,123.9,64,123.9c33,0,59.9-26.9,59.9-59.9S97,4.1,64,4.1z"/>
+			</g>
+		</g>
+	</g>
+	<g transform="translate(0 -1036.4)">
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M83.9,1059.9c-7.9,0-14.2,6.4-14.2,14.2c0,0.4,0,0.9,0.1,1.3l-27.4,14c-2.5-2.1-5.7-3.4-9.2-3.4
+					c-7.9,0-14.2,6.4-14.2,14.2c0,7.9,6.4,14.2,14.2,14.2c3.2,0,6.1-1,8.5-2.8l28.2,14.3c0,0.2-0.1,0.5-0.1,0.8
+					c0,7.9,6.4,14.2,14.2,14.2c7.8,0,14.2-6.4,14.2-14.2c0-7.9-6.4-14.2-14.2-14.2c-3.7,0-7.1,1.4-9.6,3.7l-27.2-13.9
+					c0.1-0.7,0.2-1.4,0.2-2.2c0-0.4-0.1-0.8-0.1-1.2l27.5-14c2.5,2.1,5.7,3.4,9.2,3.4c7.9,0,14.2-6.4,14.2-14.2
+					C98.1,1066.2,91.7,1059.8,83.9,1059.9L83.9,1059.9z"/>
+				<path fill="#3A9804" d="M83.9,1141.9c-8.4,0-15.2-6.8-15.2-15.1c0-0.1,0-0.2,0-0.2l-27.1-13.8c-2.5,1.7-5.4,2.6-8.5,2.6
+					c-8.3,0-15.1-6.8-15.1-15.1c0-8.3,6.8-15.1,15.1-15.1c3.4,0,6.7,1.1,9.4,3.2l26.3-13.4c0-0.3,0-0.5,0-0.8
+					c0-8,6.2-14.6,14.1-15.1l0,0l1-0.1c8.3,0,15.1,6.8,15.1,15.1c0,8.4-6.8,15.2-15.1,15.2c-3.4,0-6.7-1.1-9.3-3.2l-26.4,13.4
+					c0,0.2,0,0.5,0,0.7c0,0.6-0.1,1.1-0.1,1.7l26.1,13.3c2.7-2.3,6.2-3.5,9.7-3.5c8.3,0,15.1,6.8,15.1,15.2
+					C99,1135.1,92.2,1141.9,83.9,1141.9z M41.4,1110.6l29.2,14.9l-0.1,0.9c0,0.1,0,0.3,0,0.4c0,7.3,6,13.3,13.3,13.3
+					c7.3,0,13.3-6,13.3-13.3c0-7.3-6-13.3-13.3-13.3c-3.3,0-6.5,1.2-9,3.5l-0.5,0.4l-28.3-14.5l0.1-0.6c0.1-0.7,0.2-1.4,0.2-2.1
+					c0-0.3,0-0.5,0-0.8l-0.1-1l28.5-14.5l0.5,0.4c2.4,2,5.5,3.2,8.6,3.2c7.3,0,13.3-6,13.3-13.3c0-7.1-5.6-12.9-12.6-13.3l-0.7,0
+					c-7.3,0-13.3,6-13.3,13.3c0,0.4,0,0.7,0.1,1.1l0.1,0.6l-0.5,0.4l-28,14.3l-0.5-0.4c-2.4-2-5.5-3.2-8.6-3.2
+					c-7.3,0-13.3,6-13.3,13.3c0,7.3,6,13.3,13.3,13.3c2.9,0,5.6-0.9,7.9-2.6L41.4,1110.6z"/>
+			</g>
+			<g>
+				<path fill="#FFFFFF" d="M83.9,1141.2c-8,0-14.4-6.5-14.4-14.4c0-0.2,0-0.3,0-0.5c0-0.1,0-0.1,0-0.2l-28-14.2
+					c-2.4,1.8-5.4,2.7-8.5,2.7c-7.9,0-14.4-6.5-14.4-14.4c0-7.9,6.5-14.4,14.4-14.4c3.4,0,6.7,1.2,9.3,3.4l27.2-13.9l0-0.1
+					c0-0.4-0.1-0.7-0.1-1.1c0-7.9,6.4-14.3,14.2-14.4l0-0.1h0.2c7.9,0,14.4,6.5,14.4,14.4c0,8-6.5,14.4-14.4,14.4
+					c-3.4,0-6.6-1.2-9.2-3.3L47.4,1099l0,0.2c0,0.3,0.1,0.6,0.1,0.9c0,0.7-0.1,1.4-0.2,2.1l27,13.8c2.6-2.4,6.1-3.7,9.6-3.7
+					c7.9,0,14.4,6.5,14.4,14.4C98.3,1134.7,91.8,1141.2,83.9,1141.2z M41.5,1111.4L41.5,1111.4l28.4,14.4l0,0.1c0,0.1,0,0.2,0,0.3
+					c0,0.2,0,0.3,0,0.5c0,7.7,6.3,14,14.1,14c7.7,0,14-6.3,14-14c0-7.8-6.3-14.1-14-14.1c-3.5,0-6.9,1.3-9.5,3.7l-0.1,0.1l-0.1-0.1
+					l-27.3-14l0-0.1c0.1-0.7,0.2-1.4,0.2-2.2c0-0.3,0-0.6-0.1-0.9c0-0.1,0-0.2,0-0.3l0-0.1l0.1-0.1l27.6-14l0.1,0.1
+					c2.5,2.1,5.8,3.3,9.1,3.3c7.7,0,14-6.3,14-14.1c0-7.7-6.2-13.9-13.8-14l0,0.1h-0.2c-7.8,0-14.1,6.3-14.1,14c0,0.4,0,0.7,0.1,1
+					l0,0.3l-0.1,0.1l-27.5,14l-0.1-0.1c-2.5-2.2-5.8-3.3-9.1-3.3c-7.7,0-14,6.3-14,14c0,7.7,6.3,14,14,14
+					C36.1,1114.2,39,1113.3,41.5,1111.4L41.5,1111.4z"/>
+				<path fill="#3A9804" d="M83.9,1142.1c-8.5,0-15.3-6.9-15.3-15.3c0,0,0-0.1,0-0.1l-26.9-13.7c-2.5,1.7-5.5,2.6-8.6,2.6
+					c-8.4,0-15.3-6.9-15.3-15.3c0-8.4,6.9-15.3,15.3-15.3c3.4,0,6.7,1.1,9.4,3.2l26.1-13.3c0-0.2,0-0.4,0-0.7
+					c0-8,6.2-14.6,14.1-15.3l0,0l1-0.1c8.6,0,15.5,6.9,15.5,15.3c0,8.5-6.9,15.3-15.3,15.3c-3.4,0-6.7-1.1-9.3-3.2l-26.2,13.3
+					c0,0.2,0,0.4,0,0.6c0,0.5,0,1-0.1,1.6l25.8,13.2c2.7-2.3,6.2-3.5,9.7-3.5c8.4,0,15.3,6.9,15.3,15.3
+					C99.2,1135.2,92.3,1142.1,83.9,1142.1z M41.3,1110.4l0.7,0.3l28.8,14.7l-0.1,1.1c0,0.1,0,0.2,0,0.4c0,7.2,5.9,13.1,13.1,13.1
+					c7.2,0,13.1-5.9,13.1-13.1c0-7.2-5.9-13.1-13.1-13.1c-3.3,0-6.4,1.2-8.8,3.4l-0.5,0.4l-0.6-0.2l-28-14.3l0.1-0.6
+					c0.1-0.8,0.2-1.5,0.2-2.2c0-0.3,0-0.5,0-0.8l-0.1-1l0.5-0.4l28.2-14.4l0.5,0.4c2.5,2.1,5.5,3.2,8.6,3.2
+					c7.2,0,13.1-5.9,13.1-13.1c0-6.9-5.5-12.7-12.3-13.1l-0.6,0c-7.5,0-13.4,5.9-13.4,13.1c0,0.3,0,0.7,0.1,1l0.1,1l-0.5,0.3
+					l-28.2,14.4l-0.5-0.4c-2.4-2.1-5.5-3.2-8.6-3.2c-7.2,0-13.1,5.9-13.1,13.1c0,7.2,5.9,13.1,13.1,13.1c2.9,0,5.6-0.9,7.8-2.5
+					L41.3,1110.4z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/shell_integration/icons/nopadding/SVG/sync.svg b/shell_integration/icons/nopadding/SVG/sync.svg
new file mode 100755
index 000000000..bfbaddad1
--- /dev/null
+++ b/shell_integration/icons/nopadding/SVG/sync.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Sync" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g>
+	<g>
+		<circle fill="#2268AB" cx="64" cy="64" r="61.934"/>
+		<path fill="#114999" d="M64,128C28.711,128,0,99.289,0,64S28.711,0,64,0s64,28.711,64,64S99.289,128,64,128z M64,4.132
+			C30.989,4.132,4.132,30.987,4.132,64S30.989,123.868,64,123.868S123.868,97.013,123.868,64S97.011,4.132,64,4.132z"/>
+	</g>
+	<g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M85.311,53.564c-3.957-8.111-12.221-13.307-21.264-13.307c-1.375,0-2.764,0.121-4.125,0.364
+					c-8.236,1.448-15.172,7.237-18.111,15.105l-0.264,0.705l-14.818,2.616l0.346-1.871c2.836-15.363,15.068-27.507,30.436-30.216
+					c2.164-0.38,4.361-0.575,6.543-0.575c12.025,0,23.222,5.73,30.3,15.411l4.771-6.193l1.889,21.721l0.325,1.479l-0.046,0.004
+					v0.007l-23.129,4.048L85.311,53.564z"/>
+			</g>
+			<g>
+				<path fill="#114999" d="M64.053,27.711c12.314,0,23.643,6.318,30.25,16.325l3.8-4.938l1.6,18.411
+					c0.007,0.048,0.025,0.111,0.036,0.159l-0.025,0.003l0.014,0.074l-18.446,3.232l5.568-7.243
+					c-3.996-8.916-12.936-14.798-22.803-14.798c-1.436,0-2.889,0.125-4.353,0.38c-9.054,1.595-16.114,7.893-19.121,15.948
+					l-12.197,2.152c2.672-14.457,14.061-26.452,29.368-29.152C59.861,27.891,61.971,27.711,64.053,27.711 M64.053,25.064
+					c-2.257,0-4.536,0.2-6.768,0.595c-7.957,1.405-15.164,5.177-20.846,10.911c-5.55,5.605-9.239,12.65-10.664,20.368l-0.693,3.745
+					l3.754-0.661l12.196-2.152l1.49-0.264l0.528-1.415c1.343-3.602,3.6-6.819,6.525-9.307c3.014-2.557,6.668-4.273,10.575-4.962
+					c1.289-0.225,2.596-0.343,3.896-0.343c8.264,0,15.839,4.602,19.704,11.845l-4.564,5.941l-4.143,5.386l6.697-1.168l18.443-3.232
+					l1.371-0.24l1.393-0.173l-0.625-2.82l-1.582-18.248l-0.593-6.761l-4.143,5.377l-1.65,2.145
+					c-3.222-3.998-7.236-7.363-11.775-9.832C76.9,26.702,70.489,25.064,64.053,25.064L64.053,25.064z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M64.032,101.541c-11.982,0-23.157-5.701-30.254-15.341l-4.825,6.289l-1.918-21.98
+					c-0.007-0.032-0.011-0.063-0.014-0.087l-0.147-1.245l13.597-2.398l0.018,0.096l9.422-1.653l-7.093,9.234
+					c3.979,8.048,12.221,13.207,21.211,13.207c1.368,0,2.761-0.12,4.125-0.362c8.154-1.439,15.068-7.148,18.036-14.902l0.268-0.704
+					l14.857-2.62l-0.361,1.884C99.543,78.37,95.968,85.127,90.618,90.5c-5.475,5.498-12.411,9.121-20.057,10.466
+					C68.404,101.348,66.207,101.541,64.032,101.541z"/>
+			</g>
+			<g>
+				<path fill="#114999" d="M46.793,67.111l-5.518,7.182c4.021,8.855,12.918,14.691,22.754,14.691c1.432,0,2.89-0.123,4.353-0.384
+					c8.975-1.581,15.997-7.784,19.043-15.732l12.232-2.159c-2.743,14.366-14.086,26.268-29.325,28.957
+					c-2.118,0.37-4.221,0.554-6.3,0.554c-12.278,0-23.582-6.291-30.204-16.255l-3.85,5.019l-1.632-18.652
+					c-0.007-0.025-0.007-0.052-0.011-0.073l11.054-1.948c0.004,0.029,0.018,0.059,0.025,0.095L46.793,67.111 M53.032,63.332
+					l-6.697,1.173l-4.764,0.834l-0.014-0.093l-2.629,0.463l-11.05,1.948l-2.471,0.432l0.304,2.487
+					c0.004,0.029,0.007,0.059,0.011,0.095l1.622,18.545l0.589,6.779l4.143-5.398l1.711-2.23c3.225,3.986,7.239,7.329,11.761,9.784
+					c5.675,3.084,12.068,4.713,18.486,4.713c2.25,0,4.525-0.2,6.761-0.591c7.914-1.398,15.097-5.145,20.765-10.841
+					c5.535-5.559,9.232-12.555,10.696-20.223l0.718-3.768l-3.775,0.668l-12.232,2.156l-1.475,0.259l-0.536,1.402
+					c-1.361,3.55-3.618,6.723-6.529,9.173c-2.996,2.522-6.629,4.218-10.503,4.902c-1.29,0.225-2.6,0.343-3.893,0.343
+					c-8.214,0-15.764-4.564-19.65-11.746l4.511-5.872L53.032,63.332L53.032,63.332z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_128x128.png b/shell_integration/icons/nopadding/error.iconset/icon_128x128.png
new file mode 100755
index 000000000..566682b95
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_128x128.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_128x128@2x.png b/shell_integration/icons/nopadding/error.iconset/icon_128x128@2x.png
new file mode 100755
index 000000000..3a6504f7f
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_128x128@2x.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_16x16.png b/shell_integration/icons/nopadding/error.iconset/icon_16x16.png
new file mode 100755
index 000000000..ad4033da1
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_16x16.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_16x16@2x.png b/shell_integration/icons/nopadding/error.iconset/icon_16x16@2x.png
new file mode 100755
index 000000000..4ff59ee25
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_16x16@2x.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_256x256.png b/shell_integration/icons/nopadding/error.iconset/icon_256x256.png
new file mode 100755
index 000000000..db345f6f1
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_256x256.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_256x256@2x.png b/shell_integration/icons/nopadding/error.iconset/icon_256x256@2x.png
new file mode 100755
index 000000000..ab25f4315
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_256x256@2x.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_32x32.png b/shell_integration/icons/nopadding/error.iconset/icon_32x32.png
old mode 100644
new mode 100755
index 9541677c5..f53cb6d88
Binary files a/shell_integration/icons/nopadding/error.iconset/icon_32x32.png and b/shell_integration/icons/nopadding/error.iconset/icon_32x32.png differ
diff --git a/shell_integration/icons/nopadding/error.iconset/icon_32x32@2x.png b/shell_integration/icons/nopadding/error.iconset/icon_32x32@2x.png
new file mode 100755
index 000000000..f9938e510
Binary files /dev/null and b/shell_integration/icons/nopadding/error.iconset/icon_32x32@2x.png differ
diff --git a/shell_integration/icons/nopadding/error_swm.iconset/icon_32x32.png b/shell_integration/icons/nopadding/error_swm.iconset/icon_32x32.png
deleted file mode 100644
index 4c9166213..000000000
Binary files a/shell_integration/icons/nopadding/error_swm.iconset/icon_32x32.png and /dev/null differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_128x128.png b/shell_integration/icons/nopadding/ok.iconset/icon_128x128.png
new file mode 100755
index 000000000..787303f63
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_128x128.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_128x128@2x.png b/shell_integration/icons/nopadding/ok.iconset/icon_128x128@2x.png
new file mode 100755
index 000000000..932ef7c5e
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_128x128@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_16x16.png b/shell_integration/icons/nopadding/ok.iconset/icon_16x16.png
new file mode 100755
index 000000000..576d1d9c6
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_16x16.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_16x16@2x.png b/shell_integration/icons/nopadding/ok.iconset/icon_16x16@2x.png
new file mode 100755
index 000000000..11ba28b92
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_16x16@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_256x256.png b/shell_integration/icons/nopadding/ok.iconset/icon_256x256.png
new file mode 100755
index 000000000..7ddb08de2
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_256x256.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_256x256@2x.png b/shell_integration/icons/nopadding/ok.iconset/icon_256x256@2x.png
new file mode 100755
index 000000000..ca2b2c4bc
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_256x256@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_32x32.png b/shell_integration/icons/nopadding/ok.iconset/icon_32x32.png
old mode 100644
new mode 100755
index 5565e57c9..11ba28b92
Binary files a/shell_integration/icons/nopadding/ok.iconset/icon_32x32.png and b/shell_integration/icons/nopadding/ok.iconset/icon_32x32.png differ
diff --git a/shell_integration/icons/nopadding/ok.iconset/icon_32x32@2x.png b/shell_integration/icons/nopadding/ok.iconset/icon_32x32@2x.png
new file mode 100755
index 000000000..f1eb1b267
Binary files /dev/null and b/shell_integration/icons/nopadding/ok.iconset/icon_32x32@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_128x128.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_128x128.png
new file mode 100755
index 000000000..123b15dc1
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_128x128.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_128x128@2x.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_128x128@2x.png
new file mode 100755
index 000000000..2b86262ad
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_128x128@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_16x16.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_16x16.png
new file mode 100755
index 000000000..d3acdd01d
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_16x16.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_16x16@2x.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_16x16@2x.png
new file mode 100755
index 000000000..4d5da8c47
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_16x16@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_256x256.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_256x256.png
new file mode 100755
index 000000000..0f0ad4853
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_256x256.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_256x256@2x.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_256x256@2x.png
new file mode 100755
index 000000000..27bd08587
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_256x256@2x.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32.png
old mode 100644
new mode 100755
index f2cc4b9e3..7c0013e83
Binary files a/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32.png and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32.png differ
diff --git a/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32@2x.png b/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32@2x.png
new file mode 100755
index 000000000..388f75ea9
Binary files /dev/null and b/shell_integration/icons/nopadding/ok_swm.iconset/icon_32x32@2x.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_128x128.png b/shell_integration/icons/nopadding/sync.iconset/icon_128x128.png
new file mode 100755
index 000000000..63fcd4ab3
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_128x128.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_128x128@2x.png b/shell_integration/icons/nopadding/sync.iconset/icon_128x128@2x.png
new file mode 100755
index 000000000..ad0129603
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_128x128@2x.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_16x16.png b/shell_integration/icons/nopadding/sync.iconset/icon_16x16.png
new file mode 100755
index 000000000..09fcf5a68
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_16x16.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_16x16@2x.png b/shell_integration/icons/nopadding/sync.iconset/icon_16x16@2x.png
new file mode 100755
index 000000000..c204ba962
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_16x16@2x.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_256x256.png b/shell_integration/icons/nopadding/sync.iconset/icon_256x256.png
new file mode 100755
index 000000000..ad0129603
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_256x256.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_256x256@2x.png b/shell_integration/icons/nopadding/sync.iconset/icon_256x256@2x.png
new file mode 100755
index 000000000..188dbb585
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_256x256@2x.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_32x32.png b/shell_integration/icons/nopadding/sync.iconset/icon_32x32.png
old mode 100644
new mode 100755
index 7066c546b..aac7d47a7
Binary files a/shell_integration/icons/nopadding/sync.iconset/icon_32x32.png and b/shell_integration/icons/nopadding/sync.iconset/icon_32x32.png differ
diff --git a/shell_integration/icons/nopadding/sync.iconset/icon_32x32@2x.png b/shell_integration/icons/nopadding/sync.iconset/icon_32x32@2x.png
new file mode 100755
index 000000000..fec9f890c
Binary files /dev/null and b/shell_integration/icons/nopadding/sync.iconset/icon_32x32@2x.png differ
diff --git a/shell_integration/icons/nopadding/sync_swm.iconset/icon_32x32.png b/shell_integration/icons/nopadding/sync_swm.iconset/icon_32x32.png
deleted file mode 100644
index e3c5db599..000000000
Binary files a/shell_integration/icons/nopadding/sync_swm.iconset/icon_32x32.png and /dev/null differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_128x128.png b/shell_integration/icons/nopadding/warning.iconset/icon_128x128.png
new file mode 100755
index 000000000..e3bd13c92
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_128x128.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_128x128@2x.png b/shell_integration/icons/nopadding/warning.iconset/icon_128x128@2x.png
new file mode 100755
index 000000000..f43f5fe17
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_128x128@2x.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_16x16.png b/shell_integration/icons/nopadding/warning.iconset/icon_16x16.png
new file mode 100755
index 000000000..32711ed09
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_16x16.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_16x16@2x.png b/shell_integration/icons/nopadding/warning.iconset/icon_16x16@2x.png
new file mode 100755
index 000000000..c09f8558f
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_16x16@2x.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_256x256.png b/shell_integration/icons/nopadding/warning.iconset/icon_256x256.png
new file mode 100755
index 000000000..f43f5fe17
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_256x256.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_256x256@2x.png b/shell_integration/icons/nopadding/warning.iconset/icon_256x256@2x.png
new file mode 100755
index 000000000..e6c5ad1e8
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_256x256@2x.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_32x32.png b/shell_integration/icons/nopadding/warning.iconset/icon_32x32.png
old mode 100644
new mode 100755
index 8766b93c0..c09f8558f
Binary files a/shell_integration/icons/nopadding/warning.iconset/icon_32x32.png and b/shell_integration/icons/nopadding/warning.iconset/icon_32x32.png differ
diff --git a/shell_integration/icons/nopadding/warning.iconset/icon_32x32@2x.png b/shell_integration/icons/nopadding/warning.iconset/icon_32x32@2x.png
new file mode 100755
index 000000000..082881a25
Binary files /dev/null and b/shell_integration/icons/nopadding/warning.iconset/icon_32x32@2x.png differ
diff --git a/shell_integration/icons/nopadding/warning_swm.iconset/icon_32x32.png b/shell_integration/icons/nopadding/warning_swm.iconset/icon_32x32.png
deleted file mode 100644
index e25e383b6..000000000
Binary files a/shell_integration/icons/nopadding/warning_swm.iconset/icon_32x32.png and /dev/null differ