diff --git a/ico/windows_icon/application-x-qet-element.ico b/ico/windows_icon/application-x-qet-element.ico
new file mode 100644
index 000000000..0e7baf4b5
Binary files /dev/null and b/ico/windows_icon/application-x-qet-element.ico differ
diff --git a/ico/windows_icon/application-x-qet-project.ico b/ico/windows_icon/application-x-qet-project.ico
new file mode 100644
index 000000000..b7109d7c8
Binary files /dev/null and b/ico/windows_icon/application-x-qet-project.ico differ
diff --git a/ico/windows_icon/application_icon/qet-16.png b/ico/windows_icon/application_icon/qet-16.png
deleted file mode 100644
index 7bfc3a5fa..000000000
Binary files a/ico/windows_icon/application_icon/qet-16.png and /dev/null differ
diff --git a/ico/windows_icon/application_icon/qet-248.png b/ico/windows_icon/application_icon/qet-248.png
deleted file mode 100644
index 11a479eca..000000000
Binary files a/ico/windows_icon/application_icon/qet-248.png and /dev/null differ
diff --git a/ico/windows_icon/application_icon/qet-32.png b/ico/windows_icon/application_icon/qet-32.png
deleted file mode 100644
index 9fc6f7b7b..000000000
Binary files a/ico/windows_icon/application_icon/qet-32.png and /dev/null differ
diff --git a/ico/windows_icon/application_icon/qet-48.png b/ico/windows_icon/application_icon/qet-48.png
deleted file mode 100644
index 9cacd1550..000000000
Binary files a/ico/windows_icon/application_icon/qet-48.png and /dev/null differ
diff --git a/ico/windows_icon/application_icon/qet.ico b/ico/windows_icon/application_icon/qet.ico
deleted file mode 100644
index 9cf740315..000000000
Binary files a/ico/windows_icon/application_icon/qet.ico and /dev/null differ
diff --git a/ico/windows_icon/diagram_icon/qet-16.png b/ico/windows_icon/diagram_icon/qet-16.png
deleted file mode 100644
index 75f177d2f..000000000
Binary files a/ico/windows_icon/diagram_icon/qet-16.png and /dev/null differ
diff --git a/ico/windows_icon/diagram_icon/qet-32.png b/ico/windows_icon/diagram_icon/qet-32.png
deleted file mode 100644
index 8973f9d8e..000000000
Binary files a/ico/windows_icon/diagram_icon/qet-32.png and /dev/null differ
diff --git a/ico/windows_icon/diagram_icon/qet-48.png b/ico/windows_icon/diagram_icon/qet-48.png
deleted file mode 100644
index 18e986dae..000000000
Binary files a/ico/windows_icon/diagram_icon/qet-48.png and /dev/null differ
diff --git a/ico/windows_icon/diagram_icon/qet-diagram.ico b/ico/windows_icon/diagram_icon/qet-diagram.ico
deleted file mode 100644
index 54c2d49c1..000000000
Binary files a/ico/windows_icon/diagram_icon/qet-diagram.ico and /dev/null differ
diff --git a/ico/windows_icon/element_icon/qet-16.png b/ico/windows_icon/element_icon/qet-16.png
deleted file mode 100644
index 40b70853c..000000000
Binary files a/ico/windows_icon/element_icon/qet-16.png and /dev/null differ
diff --git a/ico/windows_icon/element_icon/qet-32.png b/ico/windows_icon/element_icon/qet-32.png
deleted file mode 100644
index 296dd1840..000000000
Binary files a/ico/windows_icon/element_icon/qet-32.png and /dev/null differ
diff --git a/ico/windows_icon/element_icon/qet-48.png b/ico/windows_icon/element_icon/qet-48.png
deleted file mode 100644
index d1b8ec627..000000000
Binary files a/ico/windows_icon/element_icon/qet-48.png and /dev/null differ
diff --git a/ico/windows_icon/element_icon/qet-element.ico b/ico/windows_icon/element_icon/qet-element.ico
deleted file mode 100644
index cfdc8c5bf..000000000
Binary files a/ico/windows_icon/element_icon/qet-element.ico and /dev/null differ
diff --git a/ico/windows_icon/generate_windows_icons.sh b/ico/windows_icon/generate_windows_icons.sh
new file mode 100755
index 000000000..f71f134f7
--- /dev/null
+++ b/ico/windows_icon/generate_windows_icons.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Dependance : png2ico
+PNG_DIR="../oxygen-icons"
+
+if [ -z "$(which png2ico 2> /dev/null)" ]; then
+	echo "Error: png2ico not found."
+	exit 1
+fi
+
+function generateIcon {
+	echo "Generating icon from files ${1}.png in ${PNG_DIR}."
+	png2ico "${1}.ico" $(find "${PNG_DIR}" -name "${1}.png" | grep -v 2[25])
+}
+
+generateIcon qelectrotech
+generateIcon application-x-qet-element
+generateIcon application-x-qet-project
+
diff --git a/ico/windows_icon/qelectrotech.ico b/ico/windows_icon/qelectrotech.ico
new file mode 100644
index 000000000..76020ed60
Binary files /dev/null and b/ico/windows_icon/qelectrotech.ico differ
diff --git a/ico/windows_icon/application_icon/qelectrotech.rc b/ico/windows_icon/qelectrotech.rc
similarity index 69%
rename from ico/windows_icon/application_icon/qelectrotech.rc
rename to ico/windows_icon/qelectrotech.rc
index 787207f00..364eaf0ab 100644
--- a/ico/windows_icon/application_icon/qelectrotech.rc
+++ b/ico/windows_icon/qelectrotech.rc
@@ -1 +1 @@
-IDI_ICON1               ICON    DISCARDABLE     "ico/windows_icon/application_icon/qet.ico"
+IDI_ICON1               ICON    DISCARDABLE     "ico/windows_icon/qelectrotech.ico"
diff --git a/qelectrotech.pro b/qelectrotech.pro
index 20990c091..1361ac44f 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -257,7 +257,7 @@ SOURCES += sources/aboutqet.cpp \
 RESOURCES += qelectrotech.qrc
 TRANSLATIONS += lang/qet_en.ts lang/qet_es.ts lang/qet_fr.ts
 TRANSLATIONS +=                lang/qt_es.ts  lang/qt_fr.ts
-RC_FILE = ico/windows_icon/application_icon/qelectrotech.rc
+RC_FILE = ico/windows_icon/qelectrotech.rc
 QT += xml svg network
 CONFIG += debug_and_release warn_on
 TARGET = qelectrotech