Updated to the latest code
Added Icons!