Added icons and new alarms