Improved Icons

Almost ready