diff --git a/src/core/iconloader.cpp b/src/core/iconloader.cpp
index c423d221..c88dd404 100644
--- a/src/core/iconloader.cpp
+++ b/src/core/iconloader.cpp
@@ -63,7 +63,7 @@ QIcon IconLoader::Load(const QString &name, const int fixed_size, const int min_
 
   QList<int> sizes;
   if (fixed_size == 0) {
-    sizes << 22 << 32 << 48 << 64;
+    sizes << 22 << 32 << 48 << 64 << 128;
   }
   else {
     sizes << fixed_size;
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 402ebf8f..2ec49191 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -346,6 +346,8 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
   // Initialize the UI
   ui_->setupUi(this);
 
+  setWindowIcon(IconLoader::Load("strawberry"));
+
   album_cover_choice_controller_->Init(app);
 
   ui_->multi_loading_indicator->SetTaskManager(app_->task_manager());
diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui
index f9e2aa83..302538bf 100644
--- a/src/core/mainwindow.ui
+++ b/src/core/mainwindow.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../../data/icons.qrc">
-    <normaloff>:/icons/64x64/strawberry.png</normaloff>:/icons/64x64/strawberry.png</iconset>
+    <normaloff>:/icons/128x128/strawberry.png</normaloff>:/icons/128x128/strawberry.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="layout_centralWidget">
@@ -749,9 +749,9 @@
    </property>
   </action>
   <action name="action_save_all_playlists">
-    <property name="text">
-      <string>&amp;Save all playlists</string>
-    </property>
+   <property name="text">
+    <string>&amp;Save all playlists</string>
+   </property>
   </action>
   <action name="action_next_playlist">
    <property name="text">
diff --git a/src/main.cpp b/src/main.cpp
index 3dfd3784..6a01f385 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -193,6 +193,7 @@ int main(int argc, char *argv[]) {
     return 0;
   }
   QGuiApplication::setQuitOnLastWindowClosed(false);
+  QGuiApplication::setWindowIcon(IconLoader::Load("strawberry"));
 
 #if defined(USE_BUNDLE) && (defined(Q_OS_LINUX) || defined(Q_OS_MACOS))
   qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;