diff --git a/Makefile b/Makefile
index 39cee91..019ded9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ DEFAULT_BACKGROUND=desktop-background
 
 INSTALL=install -m 0644
 BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg backgrounds/*.tga backgrounds/*.xml)
-EMBLEMS=$(wildcard emblems/*png emblems/*icon)
 SPLASH=$(wildcard splash/*.png splash/*.svg)
 PIXMAPS=$(wildcard pixmaps/*.png)
 DESKTOPFILES=$(wildcard *.desktop)
@@ -20,7 +19,13 @@ install:
 	$(INSTALL) $(SPLASH) $(DESTDIR)/usr/share/images/desktop-base
 	# emblems
 	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/36x36/emblems
-	$(INSTALL) $(EMBLEMS) $(DESTDIR)/usr/share/icons/hicolor/36x36/emblems/
+	$(INSTALL) $(wildcard icons/36x36/emblems/*) $(DESTDIR)/usr/share/icons/hicolor/36x36/emblems
+	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/64x64/emblems
+	$(INSTALL) $(wildcard icons/64x64/emblems/*) $(DESTDIR)/usr/share/icons/hicolor/64x64/emblems
+	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/128x128/emblems
+	$(INSTALL) $(wildcard icons/128x128/emblems/*) $(DESTDIR)/usr/share/icons/hicolor/128x128/emblems
+	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/emblems
+	$(INSTALL) $(wildcard icons/scalable/emblems/*) $(DESTDIR)/usr/share/icons/hicolor/scalable/emblems
 	# desktop files
 	mkdir -p $(DESTDIR)/usr/share/desktop-base
 	$(INSTALL) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/
diff --git a/debian-homepage.desktop b/debian-homepage.desktop
index 384bd14..9af512a 100644
--- a/debian-homepage.desktop
+++ b/debian-homepage.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Debian Home Page
 Comment=The offical web site of the Debian Project
-Icon=/usr/share/pixmaps/debian-official-logo-small.png
+Icon=emblem-debian
 Type=Link
 URL=http://www.debian.org
 
diff --git a/debian-reference.desktop b/debian-reference.desktop
index 36a7992..e688e4e 100644
--- a/debian-reference.desktop
+++ b/debian-reference.desktop
@@ -3,6 +3,6 @@ Version=1.0
 Encoding=UTF-8
 Name=Debian Reference Manual
 Comment=An introduction and reference manual for Debian
-Icon=/usr/share/pixmaps/debian-official-logo-small.png
+Icon=emblem-debian
 Type=Link
 URL=http://www.debian.org/doc/manuals/reference/
diff --git a/debian/changelog b/debian/changelog
index 79ba59c..f74fa04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ desktop-base (8.0.0~exp2) UNRELEASED; urgency=medium
     - Add QML Lines theme for ksplash and make it default for new users.
     - Add widescreen alternative for grub background.
     - Add KDE wallpaper.
+  * Fix incorrect icon references in desktop files.
+    (Closes: #607838, #628116, #628146)
 
  -- Aurélien COUDERC <zecoucou@free.fr>  Wed, 03 Dec 2014 10:37:16 +0100
 
diff --git a/emblems/emblem-debian.png b/emblems/emblem-debian.png
deleted file mode 100644
index a8c4575..0000000
Binary files a/emblems/emblem-debian.png and /dev/null differ
diff --git a/emblems/emblem-debian.icon b/icons/128x128/emblems/emblem-debian.icon
similarity index 100%
rename from emblems/emblem-debian.icon
rename to icons/128x128/emblems/emblem-debian.icon
diff --git a/icons/128x128/emblems/emblem-debian.png b/icons/128x128/emblems/emblem-debian.png
new file mode 100644
index 0000000..e3310a9
Binary files /dev/null and b/icons/128x128/emblems/emblem-debian.png differ
diff --git a/icons/36x36/emblems/emblem-debian.icon b/icons/36x36/emblems/emblem-debian.icon
new file mode 100644
index 0000000..2fbbb0a
--- /dev/null
+++ b/icons/36x36/emblems/emblem-debian.icon
@@ -0,0 +1,2 @@
+[Icon Data]
+DisplayName=Debian
diff --git a/icons/36x36/emblems/emblem-debian.png b/icons/36x36/emblems/emblem-debian.png
new file mode 100644
index 0000000..4e97afd
Binary files /dev/null and b/icons/36x36/emblems/emblem-debian.png differ
diff --git a/icons/64x64/emblems/emblem-debian.icon b/icons/64x64/emblems/emblem-debian.icon
new file mode 100644
index 0000000..2fbbb0a
--- /dev/null
+++ b/icons/64x64/emblems/emblem-debian.icon
@@ -0,0 +1,2 @@
+[Icon Data]
+DisplayName=Debian
diff --git a/icons/64x64/emblems/emblem-debian.png b/icons/64x64/emblems/emblem-debian.png
new file mode 100644
index 0000000..070975a
Binary files /dev/null and b/icons/64x64/emblems/emblem-debian.png differ
diff --git a/icons/scalable/emblems/emblem-debian.icon b/icons/scalable/emblems/emblem-debian.icon
new file mode 100644
index 0000000..2fbbb0a
--- /dev/null
+++ b/icons/scalable/emblems/emblem-debian.icon
@@ -0,0 +1,2 @@
+[Icon Data]
+DisplayName=Debian
diff --git a/icons/scalable/emblems/emblem-debian.svg b/icons/scalable/emblems/emblem-debian.svg
new file mode 100644
index 0000000..ea39f26
--- /dev/null
+++ b/icons/scalable/emblems/emblem-debian.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+
+<svg
+   xmlns:ns4="http://ns.adobe.com/SaveForWeb/1.0/"
+   xmlns:ns3="http://ns.adobe.com/Variables/1.0/"
+   xmlns:ns2="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   ns2:viewOrigin="262 450"
+   ns2:rulerOrigin="0 0"
+   ns2:pageBounds="0 792 612 0"
+   width="130"
+   height="130"
+   viewBox="0 0 130 130"
+   overflow="visible"
+   enable-background="new 0 0 87.041 108.445"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="emblem-debian.svg"
+   style="overflow:visible"
+   inkscape:export-filename="/tmp/emblem-debian.png"
+   inkscape:export-xdpi="88.620003"
+   inkscape:export-ydpi="88.620003"><defs
+     id="defs35" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1340"
+     inkscape:window-height="902"
+     id="namedview33"
+     showgrid="false"
+     inkscape:zoom="2.1762184"
+     inkscape:cx="-82.536734"
+     inkscape:cy="54.2225"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><metadata
+     id="metadata4"><ns3:variableSets><ns3:variableSet
+         varSetName="binding1"
+         locked="none"><ns3:variables /><ns3:sampleDataSets /></ns3:variableSet></ns3:variableSets><ns4:sfw><ns4:slices /><ns4:sliceSourceBounds
+         y="341.555"
+         x="262"
+         width="87.041"
+         height="108.445"
+         bottomLeftOrigin="true" /></ns4:sfw><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><g
+     id="Layer_1"
+     ns2:layer="yes"
+     ns2:dimmedPercent="50"
+     ns2:rgbTrio="#4F008000FFFF"
+     transform="translate(21.519555,10.7755)"><g
+       id="g7"><path
+         ns2:knockout="Off"
+         d="m 51.986,57.297 c -1.797,0.025 0.34,0.926 2.686,1.287 0.648,-0.506 1.236,-1.018 1.76,-1.516 -1.461,0.358 -2.948,0.366 -4.446,0.229"
+         id="path9"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 61.631,54.893 c 1.07,-1.477 1.85,-3.094 2.125,-4.766 -0.24,1.192 -0.887,2.221 -1.496,3.307 -3.359,2.115 -0.316,-1.256 -0.002,-2.537 -3.612,4.546 -0.496,2.726 -0.627,3.996"
+         id="path11"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 65.191,45.629 c 0.217,-3.236 -0.637,-2.213 -0.924,-0.978 0.335,0.174 0.6,2.281 0.924,0.978"
+         id="path13"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 45.172,1.399 c 0.959,0.172 2.072,0.304 1.916,0.533 1.049,-0.23 1.287,-0.442 -1.916,-0.533"
+         id="path15"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="M 47.088,1.932 46.41,2.072 47.041,2.016 47.088,1.932"
+         id="path17"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 76.992,46.856 c 0.107,2.906 -0.85,4.316 -1.713,6.812 l -1.553,0.776 c -1.271,2.468 0.123,1.567 -0.787,3.53 -1.984,1.764 -6.021,5.52 -7.313,5.863 -0.943,-0.021 0.639,-1.113 0.846,-1.541 -2.656,1.824 -2.131,2.738 -6.193,3.846 L 60.16,65.878 C 50.142,70.591 36.226,61.251 36.409,48.507 c -0.107,0.809 -0.304,0.607 -0.526,0.934 -0.517,-6.557 3.028,-13.143 9.007,-15.832 5.848,-2.895 12.704,-1.707 16.893,2.197 -2.301,-3.014 -6.881,-6.209 -12.309,-5.91 -5.317,0.084 -10.291,3.463 -11.951,7.131 -2.724,1.715 -3.04,6.611 -4.227,7.507 -1.597,11.737 3.004,16.808 10.787,22.773 1.225,0.826 0.345,0.951 0.511,1.58 -2.586,-1.211 -4.954,-3.039 -6.901,-5.277 1.033,1.512 2.148,2.982 3.589,4.137 -2.438,-0.826 -5.695,-5.908 -6.646,-6.115 4.203,7.525 17.052,13.197 23.78,10.383 -3.113,0.115 -7.068,0.064 -10.566,-1.229 -1.469,-0.756 -3.467,-2.322 -3.11,-2.615 9.182,3.43 18.667,2.598 26.612,-3.771 2.021,-1.574 4.229,-4.252 4.867,-4.289 -0.961,1.445 0.164,0.695 -0.574,1.971 2.014,-3.248 -0.875,-1.322 2.082,-5.609 l 1.092,1.504 c -0.406,-2.696 3.348,-5.97 2.967,-10.234 0.861,-1.304 0.961,1.403 0.047,4.403 1.268,-3.328 0.334,-3.863 0.66,-6.609 0.352,0.923 0.814,1.904 1.051,2.878 -0.826,-3.216 0.848,-5.416 1.262,-7.285 -0.408,-0.181 -1.275,1.422 -1.473,-2.377 0.029,-1.65 0.459,-0.865 0.625,-1.271 -0.324,-0.186 -1.174,-1.451 -1.691,-3.877 0.375,-0.57 1.002,1.478 1.512,1.562 -0.328,-1.929 -0.893,-3.4 -0.916,-4.88 -1.49,-3.114 -0.527,0.415 -1.736,-1.337 -1.586,-4.947 1.316,-1.148 1.512,-3.396 2.404,3.483 3.775,8.881 4.404,11.117 -0.48,-2.726 -1.256,-5.367 -2.203,-7.922 0.73,0.307 -1.176,-5.609 0.949,-1.691 C 83.519,18.706 76.074,10.902 69.225,7.24 70.063,8.007 71.121,8.97 70.741,9.121 67.335,7.093 67.934,6.935 67.446,6.078 64.671,4.949 64.489,6.169 62.651,6.08 57.421,3.306 56.413,3.601 51.6,1.863 l 0.219,1.023 c -3.465,-1.154 -4.037,0.438 -7.782,0.004 -0.228,-0.178 1.2,-0.644 2.375,-0.815 -3.35,0.442 -3.193,-0.66 -6.471,0.122 0.808,-0.567 1.662,-0.942 2.524,-1.424 -2.732,0.166 -6.522,1.59 -5.352,0.295 -4.456,1.988 -12.37,4.779 -16.811,8.943 l -0.14,-0.933 c -2.035,2.443 -8.874,7.296 -9.419,10.46 l -0.544,0.127 c -1.059,1.793 -1.744,3.825 -2.584,5.67 -1.385,2.36 -2.03,0.908 -1.833,1.278 -2.724,5.523 -4.077,10.164 -5.246,13.97 0.833,1.245 0.02,7.495 0.335,12.497 -1.368,24.704 17.338,48.69 37.785,54.228 2.997,1.072 7.454,1.031 11.245,1.141 -4.473,-1.279 -5.051,-0.678 -9.408,-2.197 -3.143,-1.48 -3.832,-3.17 -6.058,-5.102 l 0.881,1.557 c -4.366,-1.545 -2.539,-1.912 -6.091,-3.037 l 0.941,-1.229 C 28.751,98.334 26.418,96.056 25.78,94.795 l -1.548,0.061 c -1.86,-2.295 -2.851,-3.949 -2.779,-5.23 l -0.5,0.891 c -0.567,-0.973 -6.843,-8.607 -3.587,-6.83 -0.605,-0.553 -1.409,-0.9 -2.281,-2.484 l 0.663,-0.758 c -1.567,-2.016 -2.884,-4.6 -2.784,-5.461 0.836,1.129 1.416,1.34 1.99,1.533 -3.957,-9.818 -4.179,-0.541 -7.176,-9.994 L 8.412,66.472 C 7.926,65.74 7.631,64.945 7.24,64.165 l 0.276,-2.75 C 4.667,58.121 6.719,47.409 7.13,41.534 7.415,39.145 9.508,36.602 11.1,32.614 l -0.97,-0.167 c 1.854,-3.234 10.586,-12.988 14.63,-12.486 1.959,-2.461 -0.389,-0.009 -0.772,-0.629 4.303,-4.453 5.656,-3.146 8.56,-3.947 3.132,-1.859 -2.688,0.725 -1.203,-0.709 5.414,-1.383 3.837,-3.144 10.9,-3.846 0.745,0.424 -1.729,0.655 -2.35,1.205 4.511,-2.207 14.275,-1.705 20.617,1.225 7.359,3.439 15.627,13.605 15.953,23.17 l 0.371,0.1 c -0.188,3.802 0.582,8.199 -0.752,12.238 l 0.908,-1.912"
+         id="path19"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 32.372,59.764 -0.252,1.26 c 1.181,1.604 2.118,3.342 3.626,4.596 -1.085,-2.118 -1.891,-2.993 -3.374,-5.856"
+         id="path21"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 35.164,59.654 c -0.625,-0.691 -0.995,-1.523 -1.409,-2.352 0.396,1.457 1.207,2.709 1.962,3.982 l -0.553,-1.63"
+         id="path23"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 84.568,48.916 -0.264,0.662 c -0.484,3.438 -1.529,6.84 -3.131,9.994 1.77,-3.328 2.915,-6.968 3.395,-10.656"
+         id="path25"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="M 45.527,0.537 C 46.742,0.092 48.514,0.293 49.803,0 48.123,0.141 46.451,0.225 44.8,0.438 l 0.727,0.099"
+         id="path27"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="m 2.872,23.219 c 0.28,2.592 -1.95,3.598 0.494,1.889 1.31,-2.951 -0.512,-0.815 -0.494,-1.889"
+         id="path29"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /><path
+         ns2:knockout="Off"
+         d="M 0,35.215 C 0.563,33.487 0.665,32.449 0.88,31.449 -0.676,33.438 0.164,33.862 0,35.215"
+         id="path31"
+         inkscape:connector-curvature="0"
+         style="fill:#a80030" /></g></g></svg>
\ No newline at end of file