Add device-icons to demo

Clean up a few icons