diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..999a08c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+Sources/AppleMail.xcodeproj/project.xcworkspace
+Sources/AppleMail.xcodeproj/xcuserdata
+Sources/AppleMail.xcodeproj/xcshareddata
diff --git a/Release/com.elgato.applemail.streamDeckPlugin b/Release/com.elgato.applemail.streamDeckPlugin
index 043a1a4..c93ed7a 100644
Binary files a/Release/com.elgato.applemail.streamDeckPlugin and b/Release/com.elgato.applemail.streamDeckPlugin differ
diff --git a/Sources/MyStreamDeckPlugin.m b/Sources/MyStreamDeckPlugin.m
index 0c003de..3836fb0 100644
--- a/Sources/MyStreamDeckPlugin.m
+++ b/Sources/MyStreamDeckPlugin.m
@@ -160,6 +160,9 @@ @interface MyStreamDeckPlugin ()
 // The Mail icon with a badge encoded in base64
 @property (strong) NSString *base64MailBadgeIconString;
 
+// The Mail icon with a long badge encoded in base64
+@property (strong) NSString *base64MailLongBadgeIconString;
+
 @end
 
 
@@ -185,13 +188,18 @@ - (void)setupIfNeeded
 	
 	if(_base64MailIconString == nil)
 	{
-		_base64MailIconString = CreateBase64EncodedString(GetResourcePath(@"MailIcon.png"));
+		_base64MailIconString = CreateBase64EncodedString(GetResourcePath(@"mail.png"));
 	}
 	
 	if(_base64MailBadgeIconString == nil)
 	{
-		_base64MailBadgeIconString = CreateBase64EncodedString(GetResourcePath(@"MailBadgeIcon.png"));
+		_base64MailBadgeIconString = CreateBase64EncodedString(GetResourcePath(@"mail_unread.png"));
 	}
+    
+    if(self.base64MailLongBadgeIconString == nil)
+    {
+        self.base64MailLongBadgeIconString = CreateBase64EncodedString(GetResourcePath(@"mail_unread_long.png"));
+    }
 }
 
 
@@ -222,7 +230,12 @@ - (void)refreshUnreadCount
 	// Update each known context with the new value
 	for(NSString *context in self.knownContexts)
 	{
-		if(numberOfUnreadEmails > 0)
+        if(numberOfUnreadEmails > 9)
+        {
+            [self.connectionManager setImage:self.base64MailLongBadgeIconString withContext:context withTarget:kESDSDKTarget_HardwareAndSoftware];
+            [self.connectionManager setTitle:[NSString stringWithFormat:@"%d", numberOfUnreadEmails] withContext:context withTarget:kESDSDKTarget_HardwareAndSoftware];
+        }
+		else if(numberOfUnreadEmails > 0)
 		{
 			[self.connectionManager setImage:self.base64MailBadgeIconString withContext:context withTarget:kESDSDKTarget_HardwareAndSoftware];
 			[self.connectionManager setTitle:[NSString stringWithFormat:@"%d", numberOfUnreadEmails] withContext:context withTarget:kESDSDKTarget_HardwareAndSoftware];
diff --git a/Sources/com.elgato.applemail.sdPlugin/AppleMail b/Sources/com.elgato.applemail.sdPlugin/AppleMail
index dbede44..f43ff7b 100755
Binary files a/Sources/com.elgato.applemail.sdPlugin/AppleMail and b/Sources/com.elgato.applemail.sdPlugin/AppleMail differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/MailBadgeIcon.png b/Sources/com.elgato.applemail.sdPlugin/MailBadgeIcon.png
deleted file mode 100644
index f222856..0000000
Binary files a/Sources/com.elgato.applemail.sdPlugin/MailBadgeIcon.png and /dev/null differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/MailBadgeIcon@2x.png b/Sources/com.elgato.applemail.sdPlugin/MailBadgeIcon@2x.png
deleted file mode 100644
index b4e2854..0000000
Binary files a/Sources/com.elgato.applemail.sdPlugin/MailBadgeIcon@2x.png and /dev/null differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/MailIcon.png b/Sources/com.elgato.applemail.sdPlugin/MailIcon.png
deleted file mode 100644
index 9c447df..0000000
Binary files a/Sources/com.elgato.applemail.sdPlugin/MailIcon.png and /dev/null differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/MailIcon@2x.png b/Sources/com.elgato.applemail.sdPlugin/MailIcon@2x.png
deleted file mode 100644
index 085d260..0000000
Binary files a/Sources/com.elgato.applemail.sdPlugin/MailIcon@2x.png and /dev/null differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/mail.png b/Sources/com.elgato.applemail.sdPlugin/mail.png
new file mode 100644
index 0000000..b142981
Binary files /dev/null and b/Sources/com.elgato.applemail.sdPlugin/mail.png differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/mail@2x.png b/Sources/com.elgato.applemail.sdPlugin/mail@2x.png
new file mode 100644
index 0000000..b142981
Binary files /dev/null and b/Sources/com.elgato.applemail.sdPlugin/mail@2x.png differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/mail_unread.png b/Sources/com.elgato.applemail.sdPlugin/mail_unread.png
new file mode 100644
index 0000000..08bd6d1
Binary files /dev/null and b/Sources/com.elgato.applemail.sdPlugin/mail_unread.png differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/mail_unread_long.png b/Sources/com.elgato.applemail.sdPlugin/mail_unread_long.png
new file mode 100644
index 0000000..bb730e3
Binary files /dev/null and b/Sources/com.elgato.applemail.sdPlugin/mail_unread_long.png differ
diff --git a/Sources/com.elgato.applemail.sdPlugin/manifest.json b/Sources/com.elgato.applemail.sdPlugin/manifest.json
index b5024e0..c7a604f 100644
--- a/Sources/com.elgato.applemail.sdPlugin/manifest.json
+++ b/Sources/com.elgato.applemail.sdPlugin/manifest.json
@@ -1,11 +1,11 @@
 {
   "Actions": [
     {
-      "Icon": "MailIcon", 
+      "Icon": "Mail",
       "Name": "Apple Mail", 
       "States": [
         {
-          "Image": "MailIcon",
+          "Image": "mail",
           "FontSize": "18", 
           "FontStyle": "Bold", 
           "TitleAlignment": "middle", 
@@ -21,7 +21,7 @@
   "CodePath": "AppleMail", 
   "Description": "See how many unread emails you have.", 
   "Name": "Apple Mail", 
-  "Icon": "MailIcon", 
+  "Icon": "Mail", 
   "URL": "https://www.elgato.com/gaming/stream-deck", 
   "Version": "1.4.1",
   "OS": [