diff --git a/src/library/groupbydialog.ui b/src/library/groupbydialog.ui
index adceaccab..aa4f2f020 100644
--- a/src/library/groupbydialog.ui
+++ b/src/library/groupbydialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Library advanced grouping</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label_4">
@@ -217,7 +221,9 @@
   <tabstop>third</tabstop>
   <tabstop>button_box</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>button_box</sender>
diff --git a/src/radio/lastfmstationdialog.ui b/src/radio/lastfmstationdialog.ui
index 846390359..eab59c9f0 100644
--- a/src/radio/lastfmstationdialog.ui
+++ b/src/radio/lastfmstationdialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Play Artist or Tag</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/last.fm/as.png</normaloff>:/last.fm/as.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
@@ -70,7 +74,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/transcoder/transcodedialog.ui b/src/transcoder/transcodedialog.ui
index e4d307edd..29243460d 100644
--- a/src/transcoder/transcodedialog.ui
+++ b/src/transcoder/transcodedialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Transcode Music</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QGroupBox" name="input_group">
@@ -174,6 +178,8 @@
   <tabstop>destination</tabstop>
   <tabstop>button_box</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/transcoder/transcodelogdialog.ui b/src/transcoder/transcodelogdialog.ui
index 68137ff05..53f8f0304 100644
--- a/src/transcoder/transcodelogdialog.ui
+++ b/src/transcoder/transcodelogdialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Transcoder Log</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QPlainTextEdit" name="log">
@@ -30,7 +34,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/ui/about.ui b/src/ui/about.ui
index 4bf194ea7..955b96910 100644
--- a/src/ui/about.ui
+++ b/src/ui/about.ui
@@ -10,6 +10,10 @@
     <height>415</height>
    </rect>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <property name="styleSheet">
    <string notr="true">#line {
   color: lightgrey;
diff --git a/src/ui/addstreamdialog.ui b/src/ui/addstreamdialog.ui
index 486f73d89..87c3036b1 100644
--- a/src/ui/addstreamdialog.ui
+++ b/src/ui/addstreamdialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Add Stream</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
@@ -84,7 +88,9 @@
   <tabstop>name</tabstop>
   <tabstop>button_box</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>button_box</sender>
diff --git a/src/ui/albumcovermanager.ui b/src/ui/albumcovermanager.ui
index 1e5daa565..71d046b64 100644
--- a/src/ui/albumcovermanager.ui
+++ b/src/ui/albumcovermanager.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Cover Manager</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
     <number>0</number>
@@ -172,7 +176,9 @@
   <tabstop>fetch</tabstop>
   <tabstop>albums</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>clear</sender>
diff --git a/src/ui/edittagdialog.ui b/src/ui/edittagdialog.ui
index 1abcbeee4..4805c21d9 100644
--- a/src/ui/edittagdialog.ui
+++ b/src/ui/edittagdialog.ui
@@ -7,12 +7,16 @@
     <x>0</x>
     <y>0</y>
     <width>602</width>
-    <height>290</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Edit track information</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
@@ -211,7 +215,9 @@
   <tabstop>comment</tabstop>
   <tabstop>filename</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/ui/equalizer.ui b/src/ui/equalizer.ui
index 3b5c66518..166ebc014 100644
--- a/src/ui/equalizer.ui
+++ b/src/ui/equalizer.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Equalizer</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -83,6 +87,8 @@
   <tabstop>preset</tabstop>
   <tabstop>preset_save</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/ui/globalshortcutgrabber.ui b/src/ui/globalshortcutgrabber.ui
index 6f3074bc6..f60c41e41 100644
--- a/src/ui/globalshortcutgrabber.ui
+++ b/src/ui/globalshortcutgrabber.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Press a key</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
@@ -46,7 +50,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/ui/globalshortcutsdialog.ui b/src/ui/globalshortcutsdialog.ui
index 5c8cc31a6..5a5bad9cf 100644
--- a/src/ui/globalshortcutsdialog.ui
+++ b/src/ui/globalshortcutsdialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Configure Shortcuts</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QWidget" name="gnome_container" native="true">
@@ -151,7 +155,9 @@
   <tabstop>change</tabstop>
   <tabstop>button_box</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>button_box</sender>
diff --git a/src/ui/settingsdialog.ui b/src/ui/settingsdialog.ui
index 51aebc45a..c0ea8c15a 100644
--- a/src/ui/settingsdialog.ui
+++ b/src/ui/settingsdialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Settings</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>
     <widget class="QListWidget" name="list">
diff --git a/src/visualisations/visualisationselector.ui b/src/visualisations/visualisationselector.ui
index 89c4c8432..688642480 100644
--- a/src/visualisations/visualisationselector.ui
+++ b/src/visualisations/visualisationselector.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Select visualisations</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
@@ -96,7 +100,9 @@
   <tabstop>list</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/src/widgets/errordialog.ui b/src/widgets/errordialog.ui
index bc414c153..75c593ad0 100644
--- a/src/widgets/errordialog.ui
+++ b/src/widgets/errordialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Clementine Error</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -63,7 +67,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>