UI, small fixes, and some added icons
Settings icon added