diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
index 770cab7e..a7123ea4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
@@ -47,6 +47,11 @@ public class AppNotificationType extends HashMap<String, NotificationType> {
         // Generic Calendar
         put("com.android.calendar", NotificationType.GENERIC_CALENDAR);
 
+        // Google
+        put("com.google.android.gm", NotificationType.GMAIL);
+        put("com.google.android.apps.inbox", NotificationType.GOOGLE_INBOX);
+        put("com.google.android.calendar", NotificationType.GENERIC_CALENDAR);
+
         // Conversations
         put("eu.siacs.conversations", NotificationType.CONVERSATIONS);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
index d5de714e..951da9de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
@@ -27,6 +27,8 @@ public enum NotificationType {
 
     CONVERSATIONS(PebbleIconID.NOTIFICATION_HIPCHAT, PebbleColor.Inchworm),
     GENERIC_EMAIL(PebbleIconID.GENERIC_EMAIL, PebbleColor.JaegerGreen),
+    GMAIL(PebbleIconID.NOTIFICATION_GMAIL, PebbleColor.Red),
+    GOOGLE_INBOX(PebbleIconID.NOTIFICATION_GOOGLE_INBOX, PebbleColor.Blue),
     GENERIC_NAVIGATION(PebbleIconID.LOCATION, PebbleColor.Orange),
     GENERIC_SMS(PebbleIconID.GENERIC_SMS, PebbleColor.VividViolet),
     GENERIC_CALENDAR(PebbleIconID.TIMELINE_CALENDAR, PebbleColor.Blue),
@@ -74,6 +76,9 @@ public enum NotificationType {
             case TELEGRAM:
             case WHATSAPP:
                 return "generic_chat";
+            case GMAIL:
+            case GOOGLE_INBOX:
+                return "generic_email";
             case UNKNOWN:
             default:
                 return "generic";