Updated with new icon and fixes