More tweaks to Relaunch toolbar button.