Updated with better icon images