Fixes and enhancements

1. Added icons for Device Types