Clean up how the device is shown when connected to the simulator

Currently, when you connect a device to the simulator, the icon on the sidebar is misplaced. This pull request intent fix this.