More tweaks and icon changes