diff --git a/apps/ios/boot.js b/apps/ios/boot.js
index 7b00b7a9e..8ccfb617d 100644
--- a/apps/ios/boot.js
+++ b/apps/ios/boot.js
@@ -125,18 +125,12 @@ E.on('notify',msg=>{
 
 // Apple media service
 E.on('AMS',a=>{
-  function format_song_time(song_seconds) {
-    var minutes = (new Array(3).join("0")+(Math.floor(song_seconds / 60))).slice(-2);
-    var seconds = (new Array(3).join("0")+(parseInt(song_seconds) - minutes * 60)).slice(-2);
-    return minutes + ":" + seconds;
-  }
-
   function push(m) {
     var msg = { t : "modify", id : "music", title:"Music" };
     if (a.id=="artist")  msg.artist = m;
     else if (a.id=="album")  msg.album = m;
     else if (a.id=="title")  msg.track = m;
-    else if (a.id=="duration")  msg.dur = format_song_time(m);
+    else if (a.id=="duration")  msg.dur = m;
     else return;
     require("messages").pushMessage(msg);
   }
diff --git a/apps/messages/app-icon.js b/apps/messages/app-icon.js
index 6d6f684f8..6ed3c1141 100644
--- a/apps/messages/app-icon.js
+++ b/apps/messages/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEw4cA///ueLn/Hz/nr+G3Wtiv/v/fHc8CpMkyQCCpARJydt23bAQVJCBEEBwYCCtMgCJWkzVJmwFBCJEGEY1tkg1PCJRoDAQg1I0gPE2/S0gRNpu+y4RKNIIRBtRHKg2lTgMkyY6FAQNACIeuTgMkzc2CAtKCImkzYKB7YRD7IRI3VJk3fCIWkydkCI4uBm36CIMlndstgRJRgIRBkM7ttMCJCMCCIW7CJVt+m7CImMCI+Tt/3NYUhkmdCJGbv75BCIMpWoONCI/b9M2PoUNCIOpCI2m79L2x9CpwRB2OyCIoOBrp9DYwYRFgs36Xt32TUIW0zahGgs+y59BdIjXHgt0zdv0rpEfY8FfAN9lwRMg2uPoXbk3bIgNbtu26QRE+x9C7dUyVMyAkDCAQ1Bmx9BCINt+oRBwAODCIc7qWt6n9t2lpmECJU9zXpvnVpskCAwRBvd/lva6Po6hEBCJElIgO276yBtQRIdIIRC/RmCCJOkOoWtNoQRIgiGDAQgjIGgQCECL3SCJkECI8gCJYCDtIRIgGTCItJCBEAgR9FpARJAD4A="))
\ No newline at end of file
+require("heatshrink").decompress(atob("mEw4UA///rkcAYP9ohL/ABMBqoAEoALDioLFqgLDBQoABERIkEBZcFBY9QBed61QAC1oLF7wLD24LF24LD7wLF1vqBQOrvQLFA4IuC9QLFD4IuC1QLGGAQOBBYwgBEwQLHvQBBEZHVq4jI7wWBHY5TLNZaDLTZazLffMBBY9ABZsABY4KCgEVBQtUBYYkGEQYA/AAwA="))
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 05a594c6a..965c50b85 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -66,14 +66,11 @@ function getBackImage() {
   return atob("FhYBAAAAEAAAwAAHAAA//wH//wf//g///BwB+DAB4EAHwAAPAAA8AADwAAPAAB4AAHgAB+AH/wA/+AD/wAH8AA==");
 }
 function getNotificationImage() {
-  return atob("FBSBAH//7//////////////////////////////////////////////3//4PgADgAA4AAAAA");
+  return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A==");
 }
 function getFBIcon() {
   return atob("GBiBAAAAAAAAAAAYAAD/AAP/wAf/4A/48A/g8B/g+B/j+B/n+D/n/D8A/B8A+B+B+B/n+A/n8A/n8Afn4APnwADnAAAAAAAAAAAAAA==");
 }
-function getMailIcon() {
-  return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A==");
-}
 function getPosImage() {
   return atob("GRSBAAAAAYAAAcAAAeAAAfAAAfAAAfAAAfAAAfAAAfBgAfA4AfAeAfAPgfAD4fAA+fAAP/AAD/AAA/AAAPAAADAAAA==");
 }
@@ -87,15 +84,15 @@ function getMessageImage(msg) {
   if (s=="facebook") return getFBIcon();
   if (s=="hangouts") return atob("FBaBAAH4AH/gD/8B//g//8P//H5n58Y+fGPnxj5+d+fmfj//4//8H//B//gH/4A/8AA+AAHAABgAAAA=");
   if (s=="instagram") return atob("GBiBAf////////////////wAP/n/n/P/z/f/b/eB7/c87/d+7/d+7/d+7/d+7/c87/eB7/f/7/P/z/n/n/wAP////////////////w==");
-  if (s=="gmail") return getMailIcon();
+  if (s=="gmail") return getNotificationImage();
   if (s=="google home") return atob("GBiCAAAAAAAAAAAAAAAAAAAAAoAAAAAACqAAAAAAKqwAAAAAqroAAAACquqAAAAKq+qgAAAqr/qoAACqv/6qAAKq//+qgA6r///qsAqr///6sAqv///6sAqv///6sAqv///6sA6v///6sA6v///qsA6qqqqqsA6qqqqqsA6qqqqqsAP7///vwAAAAAAAAAAAAAAAAA==");
-  if (s=="mail") return getMailIcon();
+  if (s=="mail") return getNotificationImage();
   if (s=="messenger") return getFBIcon();
-  if (s=="outlook mail") return getMailIcon();
+  if (s=="outlook mail") return getNotificationImage();
   if (s=="phone") return atob("FxeBABgAAPgAAfAAB/AAD+AAH+AAP8AAP4AAfgAA/AAA+AAA+AAA+AAB+AAB+AAB+OAB//AB//gB//gA//AA/8AAf4AAPAA=");
   if (s=="skype") return atob("GhoBB8AAB//AA//+Af//wH//+D///w/8D+P8Afz/DD8/j4/H4fP5/A/+f4B/n/gP5//B+fj8fj4/H8+DB/PwA/x/A/8P///B///gP//4B//8AD/+AAA+AA==");
   if (s=="slack") return atob("GBiBAAAAAAAAAABAAAHvAAHvAADvAAAPAB/PMB/veD/veB/mcAAAABzH8B3v+B3v+B3n8AHgAAHuAAHvAAHvAADGAAAAAAAAAAAAAA==");
-  if (s=="sms message") return getMailIcon();
+  if (s=="sms message") return getNotificationImage();
   if (s=="twitter") return atob("GhYBAABgAAB+JgA/8cAf/ngH/5+B/8P8f+D///h///4f//+D///g///wD//8B//+AP//gD//wAP/8AB/+AB/+AH//AAf/AAAYAAA");
   if (s=="telegram") return atob("GBiBAAAAAAAAAAAAAAAAAwAAHwAA/wAD/wAf3gD/Pgf+fh/4/v/z/P/H/D8P/Acf/AM//AF/+AF/+AH/+ADz+ADh+ADAcAAAMAAAAA==");
   if (s=="whatsapp") return atob("GBiBAAB+AAP/wAf/4A//8B//+D///H9//n5//nw//vw///x///5///4///8e//+EP3/APn/wPn/+/j///H//+H//8H//4H//wMB+AA==");
@@ -146,7 +143,7 @@ function showMapMessage(msg) {
 function showMusicMessage(msg) {
   function fmtTime(s) {
     var m = Math.floor(s/60);
-    s = (s%60).toString().padStart(2,0);
+    s = (parseInt(s%60)).toString().padStart(2,0);
     return m+":"+s;
   }
 
@@ -271,7 +268,7 @@ function checkMessages(options) {
   if (!MESSAGES.length) {
     if (!options.clockIfNoMsg) return E.showPrompt("No Messages",{
       title:"Messages",
-      img:require("heatshrink").decompress(atob("k0swQEB1QAC1AND1f/AAWgBAUrBAf+wAIBgW//2uCoP4CQUvCQYcDCQIID/QSClQ4D1QSDDYn+EpHgCQ4lDCQfqFAeiBAX7FAgSDIoniCQn61QSH3/vCQ3rBQISF/wMCCQoaBCQ+qCQ+vAIISFBQInBCQpDB94SFKgJVBCQv+YAJeG/RxHQiAZCAgSqE1Y5CwS9E3+AaA379DQD/fv9++3TQEQQP79T2IcY4ABCRkqeQeqErBwCCQcrAwLEB/5nCgSKEM4UAhQJDDYYJBIIYbCgA")),
+      img:require("heatshrink").decompress(atob("kkk4UBrkc/4AC/tEqtACQkBqtUDg0VqAIGgoZFDYQIIM1sD1QAD4AIBhnqA4WrmAIBhc6BAWs8AIBhXOBAWz0AIC2YIC5wID1gkB1c6BAYFBEQPqBAYXBEQOqBAnDAIQaEnkAngaEEAPDFgo+IKA5iIOhCGIAFb7RqAIGgtUBA0VqobFgNVA")),
       buttons : {"Ok":1}
     }).then(() => { load() });
     return load();
diff --git a/apps/messages/app.png b/apps/messages/app.png
index 831467a8d..c9177692e 100644
Binary files a/apps/messages/app.png and b/apps/messages/app.png differ