diff --git a/src/calibre/gui2/dialogs/conversion_error.ui b/src/calibre/gui2/dialogs/conversion_error.ui
index 28272b7c6e..6521cb8c59 100644
--- a/src/calibre/gui2/dialogs/conversion_error.ui
+++ b/src/calibre/gui2/dialogs/conversion_error.ui
@@ -14,7 +14,7 @@
   </property>
   <property name="windowIcon" >
    <iconset resource="../../../../resources/images.qrc" >
-    <normaloff>:/library</normaloff>:/library</iconset>
+    <normaloff>:/images/library.png</normaloff>:/images/library.png</iconset>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index d023851f15..4db6f4c1fb 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -146,7 +146,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         self.device_connected = False
         self.viewers = collections.deque()
         self.content_server = None
-        self.system_tray_icon = QSystemTrayIcon(QIcon(':/library'), self)
+        self.system_tray_icon = QSystemTrayIcon(QIcon(':/images/library.png'), self)
         self.system_tray_icon.setToolTip('calibre')
         if not config['systray_icon']:
             self.system_tray_icon.hide()
@@ -1826,7 +1826,7 @@ def init_qt(args):
     QCoreApplication.setApplicationName(APP_UID)
     app = Application(args)
     actions = tuple(Main.create_application_menubar())
-    app.setWindowIcon(QIcon(':/library'))
+    app.setWindowIcon(QIcon(':/images/library.png'))
     return app, opts, args, actions
 
 def run_gui(opts, args, actions, listener, app):
diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui
index 6273d275fd..0be1df12df 100644
--- a/src/calibre/gui2/main.ui
+++ b/src/calibre/gui2/main.ui
@@ -25,7 +25,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../../../resources/images.qrc">
-    <normaloff>:/library</normaloff>:/library</iconset>
+    <normaloff>:/images/library.png</normaloff>:/images/library.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 9b5780d0b8..d2a24ddebc 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -159,7 +159,7 @@ class LocationModel(QAbstractListModel):
 
     def __init__(self, parent):
         QAbstractListModel.__init__(self, parent)
-        self.icons = [QVariant(QIcon(':/library')),
+        self.icons = [QVariant(QIcon(':/images/library.png')),
                       QVariant(QIcon(':/images/reader.svg')),
                       QVariant(QIcon(':/images/sd.svg')),
                       QVariant(QIcon(':/images/sd.svg'))]