Tweaks to buttons and icons