Added Icons & changed default behaviour to show device type icon; now shows device icon