Merge branch 'flameshot-org-master' into merge-from-upstream

# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp

src/utils/screenshotsaver.cpp

@@ -116,8 +116,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
             QString msg = QObject::tr("Error trying to save as ") + savePath;
             QMessageBox saveErrBox(
               QMessageBox::Warning, QObject::tr("Save Error"), msg);
-            saveErrBox.setWindowIcon(
-              QIcon(":img/app/org.flameshot.Flameshot.svg"));
+            saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg"));
             saveErrBox.exec();
         }
     }