diff --git a/cmake/apple/CMakeLists.txt b/cmake/apple/CMakeLists.txt
index ff1a8ea4607..835d886b9b6 100644
--- a/cmake/apple/CMakeLists.txt
+++ b/cmake/apple/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(MACOSX_BUNDLE_ICON_FILE "lmms.icns")
+SET(MACOSX_BUNDLE_ICON_FILE "icon.icns")
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_NAME_UCASE}")
SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
SET(MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME_UCASE}")
diff --git a/cmake/apple/icon.icns b/cmake/apple/icon.icns
new file mode 100644
index 00000000000..3ee7857f44f
Binary files /dev/null and b/cmake/apple/icon.icns differ
diff --git a/cmake/apple/lmms.icns b/cmake/apple/lmms.icns
deleted file mode 100644
index e54187b5cee..00000000000
Binary files a/cmake/apple/lmms.icns and /dev/null differ
diff --git a/cmake/apple/project.icns b/cmake/apple/project.icns
index 930afc21792..9ae58d7fba6 100644
Binary files a/cmake/apple/project.icns and b/cmake/apple/project.icns differ
diff --git a/cmake/linux/CMakeLists.txt b/cmake/linux/CMakeLists.txt
index 87f4194057b..24cc859c3d3 100644
--- a/cmake/linux/CMakeLists.txt
+++ b/cmake/linux/CMakeLists.txt
@@ -1,5 +1,4 @@
-INSTALL(FILES lmms.svg DESTINATION "${DATA_DIR}/icons/hicolor/scalable/apps")
-INSTALL(FILES project.svg DESTINATION "${DATA_DIR}/icons/hicolor/scalable/mimetypes/" RENAME "application-x-lmms-project.svg")
+INSTALL(DIRECTORY icons/ DESTINATION "${DATA_DIR}/icons/hicolor")
INSTALL(FILES lmms.desktop DESTINATION "${DATA_DIR}/applications")
INSTALL(FILES lmms.xml DESTINATION "${DATA_DIR}/mime/packages")
diff --git a/cmake/linux/icons/128x128/apps/lmms.png b/cmake/linux/icons/128x128/apps/lmms.png
new file mode 100644
index 00000000000..7bad96f98ff
Binary files /dev/null and b/cmake/linux/icons/128x128/apps/lmms.png differ
diff --git a/cmake/linux/icons/128x128/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/128x128/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..7a016d0eddc
Binary files /dev/null and b/cmake/linux/icons/128x128/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/128x128@2/apps/lmms.png b/cmake/linux/icons/128x128@2/apps/lmms.png
new file mode 100644
index 00000000000..a75f1b23792
Binary files /dev/null and b/cmake/linux/icons/128x128@2/apps/lmms.png differ
diff --git a/cmake/linux/icons/128x128@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/128x128@2/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..e7dbe591fee
Binary files /dev/null and b/cmake/linux/icons/128x128@2/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/16x16/apps/lmms.png b/cmake/linux/icons/16x16/apps/lmms.png
new file mode 100644
index 00000000000..7148c9373ba
Binary files /dev/null and b/cmake/linux/icons/16x16/apps/lmms.png differ
diff --git a/cmake/linux/icons/16x16/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/16x16/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..b3ef2151ef5
Binary files /dev/null and b/cmake/linux/icons/16x16/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/16x16@2/apps/lmms.png b/cmake/linux/icons/16x16@2/apps/lmms.png
new file mode 100644
index 00000000000..f6ca1cb292b
Binary files /dev/null and b/cmake/linux/icons/16x16@2/apps/lmms.png differ
diff --git a/cmake/linux/icons/16x16@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/16x16@2/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..d4b20ae01ae
Binary files /dev/null and b/cmake/linux/icons/16x16@2/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/24x24/apps/lmms.png b/cmake/linux/icons/24x24/apps/lmms.png
new file mode 100644
index 00000000000..988da8872cf
Binary files /dev/null and b/cmake/linux/icons/24x24/apps/lmms.png differ
diff --git a/cmake/linux/icons/24x24/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/24x24/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..548660bb222
Binary files /dev/null and b/cmake/linux/icons/24x24/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/24x24@2/apps/lmms.png b/cmake/linux/icons/24x24@2/apps/lmms.png
new file mode 100644
index 00000000000..76d9e5b9bb1
Binary files /dev/null and b/cmake/linux/icons/24x24@2/apps/lmms.png differ
diff --git a/cmake/linux/icons/24x24@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/24x24@2/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..a8bbf9d01ef
Binary files /dev/null and b/cmake/linux/icons/24x24@2/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/32x32/apps/lmms.png b/cmake/linux/icons/32x32/apps/lmms.png
new file mode 100644
index 00000000000..5f67ceb1d12
Binary files /dev/null and b/cmake/linux/icons/32x32/apps/lmms.png differ
diff --git a/cmake/linux/icons/32x32/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/32x32/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..9aabbde8211
Binary files /dev/null and b/cmake/linux/icons/32x32/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/32x32@2/apps/lmms.png b/cmake/linux/icons/32x32@2/apps/lmms.png
new file mode 100644
index 00000000000..4504c4a66fb
Binary files /dev/null and b/cmake/linux/icons/32x32@2/apps/lmms.png differ
diff --git a/cmake/linux/icons/32x32@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/32x32@2/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..87ca938aab8
Binary files /dev/null and b/cmake/linux/icons/32x32@2/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/48x48/apps/lmms.png b/cmake/linux/icons/48x48/apps/lmms.png
new file mode 100644
index 00000000000..4b2c9fc875d
Binary files /dev/null and b/cmake/linux/icons/48x48/apps/lmms.png differ
diff --git a/cmake/linux/icons/48x48/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/48x48/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..4ea287a9b1f
Binary files /dev/null and b/cmake/linux/icons/48x48/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/48x48@2/apps/lmms.png b/cmake/linux/icons/48x48@2/apps/lmms.png
new file mode 100644
index 00000000000..af2c5eda26f
Binary files /dev/null and b/cmake/linux/icons/48x48@2/apps/lmms.png differ
diff --git a/cmake/linux/icons/48x48@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/48x48@2/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..c583535d647
Binary files /dev/null and b/cmake/linux/icons/48x48@2/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/64x64/apps/lmms.png b/cmake/linux/icons/64x64/apps/lmms.png
new file mode 100644
index 00000000000..52b25564fd1
Binary files /dev/null and b/cmake/linux/icons/64x64/apps/lmms.png differ
diff --git a/cmake/linux/icons/64x64/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/64x64/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..96bfae222ca
Binary files /dev/null and b/cmake/linux/icons/64x64/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/64x64@2/apps/lmms.png b/cmake/linux/icons/64x64@2/apps/lmms.png
new file mode 100644
index 00000000000..9e9403a222a
Binary files /dev/null and b/cmake/linux/icons/64x64@2/apps/lmms.png differ
diff --git a/cmake/linux/icons/64x64@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/64x64@2/mimetypes/application-x-lmms-project.png
new file mode 100644
index 00000000000..7a016d0eddc
Binary files /dev/null and b/cmake/linux/icons/64x64@2/mimetypes/application-x-lmms-project.png differ
diff --git a/cmake/linux/icons/scalable/apps/lmms.svg b/cmake/linux/icons/scalable/apps/lmms.svg
new file mode 100644
index 00000000000..fc0867aa650
--- /dev/null
+++ b/cmake/linux/icons/scalable/apps/lmms.svg
@@ -0,0 +1,142 @@
+
+
+
+
diff --git a/cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg b/cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg
new file mode 100644
index 00000000000..29697ece862
--- /dev/null
+++ b/cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg
@@ -0,0 +1,173 @@
+
+
+
+
diff --git a/cmake/linux/lmms.png b/cmake/linux/lmms.png
deleted file mode 100644
index ae9fe6a2a9f..00000000000
Binary files a/cmake/linux/lmms.png and /dev/null differ
diff --git a/cmake/linux/lmms.svg b/cmake/linux/lmms.svg
deleted file mode 100644
index ffe6976ce96..00000000000
--- a/cmake/linux/lmms.svg
+++ /dev/null
@@ -1,1540 +0,0 @@
-
-
-
-
diff --git a/cmake/linux/project.svg b/cmake/linux/project.svg
deleted file mode 100644
index 62888e277a2..00000000000
--- a/cmake/linux/project.svg
+++ /dev/null
@@ -1,1912 +0,0 @@
-
-
-
-
diff --git a/cmake/nsis/CMakeLists.txt b/cmake/nsis/CMakeLists.txt
index b21c920e5c3..eb9868bf52c 100644
--- a/cmake/nsis/CMakeLists.txt
+++ b/cmake/nsis/CMakeLists.txt
@@ -1,5 +1,5 @@
SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
-SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lmms.ico")
+SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/icon.ico")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_PROJECT_NAME}.exe" PARENT_SCOPE)
SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
SET(CPACK_NSIS_HELP_LINK "${PROJECT_URL}" PARENT_SCOPE)
@@ -71,3 +71,5 @@ IF(LMMS_HAVE_STK)
ENDIF()
INSTALL(FILES "lmms.exe.manifest" DESTINATION .)
+INSTALL(FILES "lmms.VisualElementsManifest.xml" DESTINATION .)
+INSTALL(DIRECTORY "assets" DESTINATION .)
diff --git a/cmake/nsis/FileAssociation.nsh b/cmake/nsis/FileAssociation.nsh
index 061df6c4fb8..2ae4305043c 100644
--- a/cmake/nsis/FileAssociation.nsh
+++ b/cmake/nsis/FileAssociation.nsh
@@ -129,6 +129,7 @@ NoBackup:
WriteRegStr HKCR "$R0" "" "$R0"
WriteRegStr HKCR "$R0\shell" "" "open"
Skip:
+ WriteRegStr HKCR "$R0\DefaultIcon" "" "$R2,1"
WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'
diff --git a/cmake/nsis/assets/Logo.png b/cmake/nsis/assets/Logo.png
new file mode 100644
index 00000000000..e1566b218f7
Binary files /dev/null and b/cmake/nsis/assets/Logo.png differ
diff --git a/cmake/nsis/assets/SmallLogo.png b/cmake/nsis/assets/SmallLogo.png
new file mode 100644
index 00000000000..23d44ee283e
Binary files /dev/null and b/cmake/nsis/assets/SmallLogo.png differ
diff --git a/cmake/nsis/icon.ico b/cmake/nsis/icon.ico
new file mode 100644
index 00000000000..96125a1bb8b
Binary files /dev/null and b/cmake/nsis/icon.ico differ
diff --git a/cmake/nsis/lmms.VisualElementsManifest.xml b/cmake/nsis/lmms.VisualElementsManifest.xml
new file mode 100644
index 00000000000..6bda439b003
--- /dev/null
+++ b/cmake/nsis/lmms.VisualElementsManifest.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/cmake/nsis/lmms.ico b/cmake/nsis/lmms.ico
deleted file mode 100644
index 9ee65b86d9c..00000000000
Binary files a/cmake/nsis/lmms.ico and /dev/null differ
diff --git a/cmake/nsis/lmms.rc.in b/cmake/nsis/lmms.rc.in
index f153ee2356a..a3723b20d45 100644
--- a/cmake/nsis/lmms.rc.in
+++ b/cmake/nsis/lmms.rc.in
@@ -1,4 +1,5 @@
-lmmsicon ICON cmake/nsis/lmms.ico
+lmmsicon ICON cmake/nsis/icon.ico
+lmmsprojecticon ICON cmake/nsis/project.ico
#include
VS_VERSION_INFO VERSIONINFO
diff --git a/cmake/nsis/nsis_branding.bmp b/cmake/nsis/nsis_branding.bmp
index a7e75e3c1a7..939f2ebabf0 100644
Binary files a/cmake/nsis/nsis_branding.bmp and b/cmake/nsis/nsis_branding.bmp differ
diff --git a/cmake/nsis/project.ico b/cmake/nsis/project.ico
new file mode 100644
index 00000000000..4b994f3215b
Binary files /dev/null and b/cmake/nsis/project.ico differ
diff --git a/data/themes/classic/icon_small.png b/data/themes/classic/icon_small.png
new file mode 100644
index 00000000000..522290061cd
Binary files /dev/null and b/data/themes/classic/icon_small.png differ
diff --git a/data/themes/default/icon.png b/data/themes/default/icon.png
index ae9fe6a2a9f..ec881aacfba 100644
Binary files a/data/themes/default/icon.png and b/data/themes/default/icon.png differ
diff --git a/data/themes/default/icon_small.png b/data/themes/default/icon_small.png
new file mode 100644
index 00000000000..fd74011f9db
Binary files /dev/null and b/data/themes/default/icon_small.png differ
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 721f834792a..4a6654a5d8f 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -791,7 +791,7 @@ int main( int argc, char * * argv )
) );
mb.setIcon( QMessageBox::Warning );
- mb.setWindowIcon( embed::getIconPixmap( "icon" ) );
+ mb.setWindowIcon( embed::getIconPixmap( "icon_small" ) );
mb.setWindowFlags( Qt::WindowCloseButtonHint );
QPushButton * recover;
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index d82d5befe3d..6be2770954f 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -257,7 +257,7 @@ MainWindow::~MainWindow()
void MainWindow::finalize()
{
resetWindowTitle();
- setWindowIcon( embed::getIconPixmap( "icon" ) );
+ setWindowIcon( embed::getIconPixmap( "icon_small" ) );
// project-popup-menu
@@ -408,7 +408,7 @@ void MainWindow::finalize()
#if !(defined(LMMS_BUILD_APPLE) && (QT_VERSION >= 0x050000) && (QT_VERSION < 0x050600))
help_menu->addSeparator();
#endif
- help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ),
+ help_menu->addAction( embed::getIconPixmap( "icon_small" ), tr( "About" ),
this, SLOT( aboutLMMS() ) );
// create tool-buttons