Add icon and UI tweaks