diff --git a/resources/images/devices/galaxy_s3.png b/resources/images/devices/galaxy_s3.png
deleted file mode 100644
index 1aef78e20d..0000000000
Binary files a/resources/images/devices/galaxy_s3.png and /dev/null differ
diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 558f382dca..1931d68b82 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -171,10 +171,10 @@ class SDBook(Book):
 
 class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     name = 'SmartDevice App Interface'
-    gui_name = gui_name_base = _('Wireless Device')
+    gui_name = _('Wireless Device')
     gui_name_template = '%s: %s'
 
-    icon = I('devices/galaxy_s3.png')
+    icon = I('devices/tablet.png')
     description = _('Communicate with Smart Device apps')
     supported_platforms = ['windows', 'osx', 'linux']
     author = 'Charles Haley'
@@ -1056,12 +1056,10 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
     def eject(self):
         self._debug()
         self._close_device_socket()
-        self.gui_name = self.gui_name_base
 
     @synchronous('sync_lock')
     def post_yank_cleanup(self):
         self._debug()
-        self.gui_name = self.gui_name_base
 
     @synchronous('sync_lock')
     def upload_books(self, files, names, on_card=None, end_session=True,
diff --git a/src/calibre/gui2/device_drivers/mtp_folder_browser.py b/src/calibre/gui2/device_drivers/mtp_folder_browser.py
index 960f821b57..1e108ff117 100644
--- a/src/calibre/gui2/device_drivers/mtp_folder_browser.py
+++ b/src/calibre/gui2/device_drivers/mtp_folder_browser.py
@@ -89,7 +89,7 @@ class Browser(QDialog):
         self.setMinimumSize(QSize(500, 500))
         self.folders.selected.connect(self.accept)
         self.setWindowTitle(_('Choose folder on device'))
-        self.setWindowIcon(QIcon(I('devices/galaxy_s3.png')))
+        self.setWindowIcon(QIcon(I('devices/tablet.png')))
 
     @property
     def current_item(self):
diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui
index cd4eb650a0..132b7d0dc2 100644
--- a/src/calibre/gui2/dialogs/smartdevice.ui
+++ b/src/calibre/gui2/dialogs/smartdevice.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../../../../resources/images.qrc">
-    <normaloff>:/images/devices/galaxy_s3.png</normaloff>:/images/devices/galaxy_s3.png</iconset>
+    <normaloff>:/images/devices/tablet.png</normaloff>:/images/devices/tablet.png</iconset>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0" colspan="3">