merge with @pazguille
GH-971 fixed: when a shortcut without callback was called it throw a error in the console
GH-996 phone icon added
Merge with hmammana