Updated with icons and fixes