minor tweaks and icons