Fixes to icons and admin area