Added button prompt icons and other tweaks