Fix some oversights.
Add icons for devices.