diff --git a/apps/messageicons/ChangeLog b/apps/messageicons/ChangeLog
index 4e8972f7a8..ede1699143 100644
--- a/apps/messageicons/ChangeLog
+++ b/apps/messageicons/ChangeLog
@@ -6,3 +6,4 @@
 0.05: Add message icon for 'jira'
 0.06: Add message icon for 'molly' and 'threema libre'
 0.07: Minor code improvements
+0.08: Add more icons including GMail, Google Messages, Google Agenda
\ No newline at end of file
diff --git a/apps/messageicons/icons.img b/apps/messageicons/icons.img
index 66ecb53f8e..bb74d05d96 100644
Binary files a/apps/messageicons/icons.img and b/apps/messageicons/icons.img differ
diff --git a/apps/messageicons/icons/agenda.png b/apps/messageicons/icons/agenda.png
new file mode 100644
index 0000000000..f9328faccd
Binary files /dev/null and b/apps/messageicons/icons/agenda.png differ
diff --git a/apps/messageicons/icons/generate.js b/apps/messageicons/icons/generate.js
index 854e041435..a07b7af447 100755
--- a/apps/messageicons/icons/generate.js
+++ b/apps/messageicons/icons/generate.js
@@ -91,6 +91,7 @@ exports.getColor = function(msg,options) {
   const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   return {
     /* generic colors, using B2-safe colors */ ${ /* DO NOT USE BLACK OR WHITE HERE, just leave the declaration out and then the theme's fg color will be used */"" }
+    "agenda": "#206cd5",
     "airbnb": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/
     "mail": "#ff0",
     "music": "#f0f",
@@ -111,8 +112,10 @@ exports.getColor = function(msg,options) {
 // "home assistant": "#41bdf5", // ha-blue is #41bdf5, but that's the background
     "instagram": "#ff0069", // https://about.instagram.com/brand/gradient
     "jira": "#0052cc", //https://atlassian.design/resources/logo-library
+    "leboncoin": "#fa7321",
     "lieferando": "#ff8000",
     "linkedin": "#0a66c2", // https://brand.linkedin.com/
+    "messages": "#0a5cce",
     "messenger": "#0078ff",
     "mastodon": "#563acc", // https://www.joinmastodon.org/branding
     "mattermost": "#00f",
diff --git a/apps/messageicons/icons/gmail.png b/apps/messageicons/icons/gmail.png
new file mode 100644
index 0000000000..b96465db18
Binary files /dev/null and b/apps/messageicons/icons/gmail.png differ
diff --git a/apps/messageicons/icons/icon_names.json b/apps/messageicons/icons/icon_names.json
index de8be9e989..89f81be081 100644
--- a/apps/messageicons/icons/icon_names.json
+++ b/apps/messageicons/icons/icon_names.json
@@ -1,6 +1,7 @@
 [
   { "app":"default", "icon":"default.png" },
   { "app":"airbnb", "icon":"airbnb.png" },
+  { "app":"agenda", "icon":"agenda.png" },
   { "app":"alarm", "icon":"alarm.png" },
 	{ "app":"alarmclockreceiver", "icon":"alarm.png" },
   { "app":"amazon shopping", "icon":"amazon.png" },
@@ -36,6 +37,7 @@
 	{ "app":"aurora droid", "icon":"security.png" },
   { "app":"github", "icon":"github.png" },
   { "app":"gitlab", "icon":"gitlab.png" },
+  { "app":"gmail", "icon":"gmail.png" },
   { "app":"gmx", "icon":"gmx.png" },
   { "app":"google", "icon":"google.png" },
   { "app":"google home", "icon":"google home.png" },
@@ -45,6 +47,7 @@
   { "app":"jira", "icon":"jira.png" },
   { "app":"kalender", "icon":"kalender.png" },
   { "app":"keep notes", "icon":"google keep.png" },
+  { "app":"leboncoin", "icon":"leboncoin.png" },
   { "app":"lieferando", "icon":"lieferando.png" },
   { "app":"linkedin", "icon":"linkedin.png" },
   { "app":"maps", "icon":"map.png" },
@@ -55,6 +58,7 @@
 	{ "app":"tooot", "icon":"mastodon.png" },
 	{ "app":"tusky", "icon":"mastodon.png" },
   { "app":"mattermost", "icon":"mattermost.png" },
+  { "app":"messages", "icon":"messages.png" },
   { "app":"n26", "icon":"n26.png" },
   { "app":"netflix", "icon":"netflix.png" },
   { "app":"news", "icon":"news.png" },
@@ -110,6 +114,5 @@
 	{ "app":"meet", "icon":"videoconf.png" },
   { "app":"music", "icon":"music.png" },
   { "app":"sms message", "icon":"default.png" },
-	{ "app":"mail", "icon":"default.png" },
-	{ "app":"gmail", "icon":"default.png" }
+	{ "app":"mail", "icon":"default.png" }
 ]
diff --git a/apps/messageicons/icons/leboncoin.png b/apps/messageicons/icons/leboncoin.png
new file mode 100644
index 0000000000..fb41bf03f1
Binary files /dev/null and b/apps/messageicons/icons/leboncoin.png differ
diff --git a/apps/messageicons/icons/messages.png b/apps/messageicons/icons/messages.png
new file mode 100644
index 0000000000..9d89da001f
Binary files /dev/null and b/apps/messageicons/icons/messages.png differ
diff --git a/apps/messageicons/lib.js b/apps/messageicons/lib.js
index b3ff2d9ffb..9c070a03ea 100644
--- a/apps/messageicons/lib.js
+++ b/apps/messageicons/lib.js
@@ -4,7 +4,7 @@ exports.getImage = function(msg) {
   if (msg.img) return atob(msg.img);
   let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   if (msg.id=="music") s="music";
-  let match = ",default|0,airbnb|1,alarm|2,alarmclockreceiver|2,amazon shopping|3,bibel|4,bitwarden|5,1password|5,lastpass|5,dashlane|5,bring|6,calendar|7,etar|7,chat|8,chrome|9,clock|2,corona-warn|10,bmo|11,desjardins|11,rbc mobile|11,nbc|11,rabobank|11,scotiabank|11,td (canada)|11,discord|12,drive|13,element|14,facebook|15,messenger|16,firefox|17,firefox beta|17,firefox nightly|17,f-droid|5,neo store|5,aurora droid|5,github|18,gitlab|19,gmx|20,google|21,google home|22,google play store|23,home assistant|24,instagram|25,jira|26,kalender|27,keep notes|28,lieferando|29,linkedin|30,maps|31,organic maps|31,osmand|31,mastodon|32,fedilab|32,tooot|32,tusky|32,mattermost|33,n26|34,netflix|35,news|36,cbc news|36,rc info|36,reuters|36,ap news|36,la presse|36,nbc news|36,nextbike|37,nina|38,outlook mail|39,paypal|40,phone|41,plex|42,pocket|43,post & dhl|44,proton mail|45,reddit|46,sync pro|46,sync dev|46,boost|46,infinity|46,slide|46,signal|47,molly|47,skype|48,slack|49,snapchat|50,starbucks|51,steam|52,teams|53,telegram|54,telegram foss|54,threema|55,threema libre|55,tiktok|56,to do|57,opentasks|57,tasks|57,transit|58,twitch|59,twitter|60,uber|61,lyft|61,vlc|62,warnapp|63,whatsapp|64,wordfeud|65,youtube|66,newpipe|66,zoom|67,meet|67,music|68,sms message|0,mail|0,gmail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
+  let match = ",default|0,airbnb|1,agenda|2,alarm|3,alarmclockreceiver|3,amazon shopping|4,bibel|5,bitwarden|6,1password|6,lastpass|6,dashlane|6,bring|7,calendar|8,etar|8,chat|9,chrome|10,clock|3,corona-warn|11,bmo|12,desjardins|12,rbc mobile|12,nbc|12,rabobank|12,scotiabank|12,td (canada)|12,discord|13,drive|14,element|15,facebook|16,messenger|17,firefox|18,firefox beta|18,firefox nightly|18,f-droid|6,neo store|6,aurora droid|6,github|19,gitlab|20,gmail|21,gmx|22,google|23,google home|24,google play store|25,home assistant|26,instagram|27,jira|28,kalender|29,keep notes|30,leboncoin|31,lieferando|32,linkedin|33,maps|34,organic maps|34,osmand|34,mastodon|35,fedilab|35,tooot|35,tusky|35,mattermost|36,messages|37,n26|38,netflix|39,news|40,cbc news|40,rc info|40,reuters|40,ap news|40,la presse|40,nbc news|40,nextbike|41,nina|42,outlook mail|43,paypal|44,phone|45,plex|46,pocket|47,post & dhl|48,proton mail|49,reddit|50,sync pro|50,sync dev|50,boost|50,infinity|50,slide|50,signal|51,molly|51,skype|52,slack|53,snapchat|54,starbucks|55,steam|56,teams|57,telegram|58,telegram foss|58,threema|59,threema libre|59,tiktok|60,to do|61,opentasks|61,tasks|61,transit|62,twitch|63,twitter|64,uber|65,lyft|65,vlc|66,warnapp|67,whatsapp|68,wordfeud|69,youtube|70,newpipe|70,zoom|71,meet|71,music|72,sms message|0,mail|0,".match(new RegExp(`,${s}\\|(\\d+)`))
   return require("Storage").read("messageicons.img", (match===null)?0:match[1]*76, 76);
 };
 
@@ -16,6 +16,7 @@ exports.getColor = function(msg,options) {
   const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase();
   return {
     /* generic colors, using B2-safe colors */ 
+    "agenda": "#206cd5",
     "airbnb": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/
     "mail": "#ff0",
     "music": "#f0f",
@@ -33,8 +34,10 @@ exports.getColor = function(msg,options) {
 // "home assistant": "#41bdf5", // ha-blue is #41bdf5, but that's the background
     "instagram": "#ff0069", // https://about.instagram.com/brand/gradient
     "jira": "#0052cc", //https://atlassian.design/resources/logo-library
+    "leboncoin": "#fa7321",
     "lieferando": "#ff8000",
     "linkedin": "#0a66c2", // https://brand.linkedin.com/
+    "messages": "#0a5cce",
     "messenger": "#0078ff",
     "mastodon": "#563acc", // https://www.joinmastodon.org/branding
     "mattermost": "#00f",
diff --git a/apps/messageicons/metadata.json b/apps/messageicons/metadata.json
index 13ae5f232f..356eeba791 100644
--- a/apps/messageicons/metadata.json
+++ b/apps/messageicons/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messageicons",
   "name": "Message Icons",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Library containing a list of icons and colors for apps",
   "icon": "app.png",
   "type": "module",