diff --git a/generate_png.sh b/generate_png.sh
index 4e01251..21e0867 100755
--- a/generate_png.sh
+++ b/generate_png.sh
@@ -58,6 +58,10 @@ for i in $SIZES; do
 	fi
 	find . -name "*.svg" | while read a; do
 		echo "$a"
-		rsvg-convert --height=$i -o ../${i}x${i}/`echo $a | cut -d. -f2`.png $a
+		if [ "x`readlink "$a"`" = "x" ]; then
+			rsvg-convert --height=$i -o ../${i}x${i}/`echo $a | cut -d. -f2`.png $a
+		else
+			ln -sf `readlink "$a" | sed 's/\.svg$//'`.png ../${i}x${i}`echo $a | cut -d. -f2`.png
+		fi
 	done
 done
diff --git a/icons/128x128/apps/gimp.png b/icons/128x128/apps/gimp.png
new file mode 100644
index 0000000..19c79b6
Binary files /dev/null and b/icons/128x128/apps/gimp.png differ
diff --git a/icons/128x128/apps/mauplay.png b/icons/128x128/apps/mauplay.png
new file mode 120000
index 0000000..68aeac3
--- /dev/null
+++ b/icons/128x128/apps/mauplay.png
@@ -0,0 +1 @@
+../devices/radio.png
\ No newline at end of file
diff --git a/icons/128x128/apps/mbiff.png b/icons/128x128/apps/mbiff.png
new file mode 120000
index 0000000..281dcd9
--- /dev/null
+++ b/icons/128x128/apps/mbiff.png
@@ -0,0 +1 @@
+../places/mailbox.png
\ No newline at end of file
diff --git a/icons/128x128/apps/mimview.png b/icons/128x128/apps/mimview.png
new file mode 120000
index 0000000..2a8f8d2
--- /dev/null
+++ b/icons/128x128/apps/mimview.png
@@ -0,0 +1 @@
+../devices/projector.png
\ No newline at end of file
diff --git a/icons/128x128/apps/unknown.png b/icons/128x128/apps/unknown.png
new file mode 120000
index 0000000..0a81ebd
--- /dev/null
+++ b/icons/128x128/apps/unknown.png
@@ -0,0 +1 @@
+../categories/applications-other.png
\ No newline at end of file
diff --git a/icons/128x128/apps/xterm.png b/icons/128x128/apps/xterm.png
new file mode 120000
index 0000000..75fea29
--- /dev/null
+++ b/icons/128x128/apps/xterm.png
@@ -0,0 +1 @@
+terminal.png
\ No newline at end of file
diff --git a/icons/128x128/categories/applications-other.png b/icons/128x128/categories/applications-other.png
new file mode 100644
index 0000000..7e0b661
Binary files /dev/null and b/icons/128x128/categories/applications-other.png differ
diff --git a/icons/16x16/apps/gimp.png b/icons/16x16/apps/gimp.png
new file mode 100644
index 0000000..bafdb8d
Binary files /dev/null and b/icons/16x16/apps/gimp.png differ
diff --git a/icons/16x16/apps/mauplay.png b/icons/16x16/apps/mauplay.png
new file mode 120000
index 0000000..68aeac3
--- /dev/null
+++ b/icons/16x16/apps/mauplay.png
@@ -0,0 +1 @@
+../devices/radio.png
\ No newline at end of file
diff --git a/icons/16x16/apps/mbiff.png b/icons/16x16/apps/mbiff.png
new file mode 120000
index 0000000..281dcd9
--- /dev/null
+++ b/icons/16x16/apps/mbiff.png
@@ -0,0 +1 @@
+../places/mailbox.png
\ No newline at end of file
diff --git a/icons/16x16/apps/mimview.png b/icons/16x16/apps/mimview.png
new file mode 120000
index 0000000..2a8f8d2
--- /dev/null
+++ b/icons/16x16/apps/mimview.png
@@ -0,0 +1 @@
+../devices/projector.png
\ No newline at end of file
diff --git a/icons/16x16/apps/unknown.png b/icons/16x16/apps/unknown.png
new file mode 120000
index 0000000..0a81ebd
--- /dev/null
+++ b/icons/16x16/apps/unknown.png
@@ -0,0 +1 @@
+../categories/applications-other.png
\ No newline at end of file
diff --git a/icons/16x16/apps/xterm.png b/icons/16x16/apps/xterm.png
new file mode 120000
index 0000000..75fea29
--- /dev/null
+++ b/icons/16x16/apps/xterm.png
@@ -0,0 +1 @@
+terminal.png
\ No newline at end of file
diff --git a/icons/16x16/categories/applications-other.png b/icons/16x16/categories/applications-other.png
new file mode 100644
index 0000000..43b7b81
Binary files /dev/null and b/icons/16x16/categories/applications-other.png differ
diff --git a/icons/32x32/apps/gimp.png b/icons/32x32/apps/gimp.png
new file mode 100644
index 0000000..2f2b3b5
Binary files /dev/null and b/icons/32x32/apps/gimp.png differ
diff --git a/icons/32x32/apps/mauplay.png b/icons/32x32/apps/mauplay.png
new file mode 120000
index 0000000..68aeac3
--- /dev/null
+++ b/icons/32x32/apps/mauplay.png
@@ -0,0 +1 @@
+../devices/radio.png
\ No newline at end of file
diff --git a/icons/32x32/apps/mbiff.png b/icons/32x32/apps/mbiff.png
new file mode 120000
index 0000000..281dcd9
--- /dev/null
+++ b/icons/32x32/apps/mbiff.png
@@ -0,0 +1 @@
+../places/mailbox.png
\ No newline at end of file
diff --git a/icons/32x32/apps/mimview.png b/icons/32x32/apps/mimview.png
new file mode 120000
index 0000000..2a8f8d2
--- /dev/null
+++ b/icons/32x32/apps/mimview.png
@@ -0,0 +1 @@
+../devices/projector.png
\ No newline at end of file
diff --git a/icons/32x32/apps/unknown.png b/icons/32x32/apps/unknown.png
new file mode 120000
index 0000000..0a81ebd
--- /dev/null
+++ b/icons/32x32/apps/unknown.png
@@ -0,0 +1 @@
+../categories/applications-other.png
\ No newline at end of file
diff --git a/icons/32x32/apps/xterm.png b/icons/32x32/apps/xterm.png
new file mode 120000
index 0000000..75fea29
--- /dev/null
+++ b/icons/32x32/apps/xterm.png
@@ -0,0 +1 @@
+terminal.png
\ No newline at end of file
diff --git a/icons/32x32/categories/applications-other.png b/icons/32x32/categories/applications-other.png
new file mode 100644
index 0000000..b990145
Binary files /dev/null and b/icons/32x32/categories/applications-other.png differ
diff --git a/icons/64x64/apps/gimp.png b/icons/64x64/apps/gimp.png
new file mode 100644
index 0000000..b891e82
Binary files /dev/null and b/icons/64x64/apps/gimp.png differ
diff --git a/icons/64x64/apps/mauplay.png b/icons/64x64/apps/mauplay.png
new file mode 120000
index 0000000..68aeac3
--- /dev/null
+++ b/icons/64x64/apps/mauplay.png
@@ -0,0 +1 @@
+../devices/radio.png
\ No newline at end of file
diff --git a/icons/64x64/apps/mbiff.png b/icons/64x64/apps/mbiff.png
new file mode 120000
index 0000000..281dcd9
--- /dev/null
+++ b/icons/64x64/apps/mbiff.png
@@ -0,0 +1 @@
+../places/mailbox.png
\ No newline at end of file
diff --git a/icons/64x64/apps/mimview.png b/icons/64x64/apps/mimview.png
new file mode 120000
index 0000000..2a8f8d2
--- /dev/null
+++ b/icons/64x64/apps/mimview.png
@@ -0,0 +1 @@
+../devices/projector.png
\ No newline at end of file
diff --git a/icons/64x64/apps/unknown.png b/icons/64x64/apps/unknown.png
new file mode 120000
index 0000000..0a81ebd
--- /dev/null
+++ b/icons/64x64/apps/unknown.png
@@ -0,0 +1 @@
+../categories/applications-other.png
\ No newline at end of file
diff --git a/icons/64x64/apps/xterm.png b/icons/64x64/apps/xterm.png
new file mode 120000
index 0000000..75fea29
--- /dev/null
+++ b/icons/64x64/apps/xterm.png
@@ -0,0 +1 @@
+terminal.png
\ No newline at end of file
diff --git a/icons/64x64/categories/applications-other.png b/icons/64x64/categories/applications-other.png
new file mode 100644
index 0000000..5b30a80
Binary files /dev/null and b/icons/64x64/categories/applications-other.png differ
diff --git a/icons/scalable/apps/gimp.svg b/icons/scalable/apps/gimp.svg
new file mode 100644
index 0000000..7943c1b
--- /dev/null
+++ b/icons/scalable/apps/gimp.svg
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
+     xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path style="fill:#010101; fill-opacity:0.3764"
+        d="M32 16C23.16 16 16 23.16 16 32C16 40.83 23.16 48 32 48C40.83 48 48 40.83 48 32C48 23.16 40.83 16 32 16z"
+        transform="matrix(1.5,0,0,0.6875,-10,21)"
+  />
+  <radialGradient id="gradient0" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="64" gradientTransform="matrix(-0.0014,0.5108,-0.6983,-0.002,20.9275,25.6796)">
+   <stop offset="0" stop-color="#857c63"/>
+   <stop offset="1" stop-color="#221f19"/>
+  </radialGradient>
+  <path style="fill:url(#gradient0)"
+        d="M12.85 12.76C12.85 12.76 16.18 19.19 25 19C43.47 18.59 46.99 9.37 49 7C55.47 62.94 7.06 40.14 5.38 30.82C14.89 28.06 12.59 22.73 12.59 22.73C12.68 19.4 12.77 16.08 12.85 12.76V12.76z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#010101; stroke-width:3.5"
+        d="M12.85 12.76C12.85 12.76 16.18 19.19 25 19C43.47 18.59 46.99 9.37 49 7C55.47 62.94 7.06 40.14 5.38 30.82C14.89 28.06 12.59 22.73 12.59 22.73C12.68 19.4 12.77 16.08 12.85 12.76V12.76z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient1" gradientUnits="userSpaceOnUse" x1="36.57" y1="33.76" x2="21.96" y2="36.61">
+   <stop offset="0" stop-color="#000000"/>
+   <stop offset="1" stop-color="#000000" stop-opacity="0"/>
+  </linearGradient>
+  <path style="fill:url(#gradient1)"
+        d="M19.82 35.85C28.65 37.65 33.15 36.02 35.79 34C35.1 33.1 33.91 32.11 33.91 32.11C33.91 32.11 37 32.97 38.08 34.38C39.16 35.78 38.48 36.64 38.19 38.43C37.56 36.85 36.38 36.26 36.23 35.64C33.85 38.9 27.95 38.75 19.82 35.85H19.82V35.85z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient2" gradientUnits="userSpaceOnUse" x1="-6.23" y1="20.93" x2="25.85" y2="57.57">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="0.7921"/>
+   <stop offset="1" stop-color="#ffffff" stop-opacity="0.2117"/>
+  </linearGradient>
+  <path style="fill:none; stroke:url(#gradient2); stroke-width:1.2896"
+        d="M47.56 11.06C46.83 12.28 45.72 13.75 44.02 15.15C40.57 18.01 34.78 20.61 25.3 20.82C19.75 20.94 16.19 18.23 14 15.84C13.95 17.8 13.9 19.76 13.85 21.72C14.02 22.27 14.36 23.55 13.72 25.29C13.04 27.16 10.88 29.04 7.19 30.48C7.51 31.17 7.82 31.89 8.81 32.86C10.15 34.18 12.05 35.6 14.28 36.89C18.72 39.46 24.49 41.49 29.88 41.6C35.26 41.71 40.16 40.02 43.56 35.09C46.69 30.55 48.44 22.81 47.56 11.06V11.06V11.06z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <radialGradient id="gradient3" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="64" gradientTransform="matrix(0.0529,0.0922,-0.079,0.0453,5.0803,26.9916)">
+   <stop offset="0" stop-color="#5b676b"/>
+   <stop offset="1" stop-color="#141718"/>
+  </radialGradient>
+  <path style="fill:url(#gradient3)"
+        d="M11.81 26.47C14.39 30.06 14.41 34.45 11.86 36.28C9.31 38.1 5.16 36.68 2.58 33.09C0.01 29.5 -0 25.11 2.54 23.28C5.09 21.45 9.24 22.88 11.81 26.47V26.47V26.47z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#000000; stroke-width:3"
+        d="M11.81 26.47C14.39 30.06 14.41 34.45 11.86 36.28C9.31 38.1 5.16 36.68 2.58 33.09C0.01 29.5 -0 25.11 2.54 23.28C5.09 21.45 9.24 22.88 11.81 26.47V26.47V26.47z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#ffffff"
+        d="M6.86 26.88C6.85 28.42 5.81 29.66 4.53 29.66C3.25 29.65 2.22 28.4 2.22 26.87C2.23 25.33 3.27 24.09 4.55 24.09C5.83 24.1 6.86 25.34 6.86 26.88V26.88V26.88z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#eeeeec"
+        d="M21.23 25.07C21.23 27.37 19.35 29.24 17.05 29.23C14.75 29.22 12.88 27.35 12.89 25.04C12.9 22.74 14.77 20.88 17.07 20.88C19.38 20.89 21.24 22.76 21.23 25.07V25.07V25.07z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#010101; stroke-width:2"
+        d="M21.23 25.07C21.23 27.37 19.35 29.24 17.05 29.23C14.75 29.22 12.88 27.35 12.89 25.04C12.9 22.74 14.77 20.88 17.07 20.88C19.38 20.89 21.24 22.76 21.23 25.07V25.07V25.07z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <radialGradient id="gradient4" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="64" gradientTransform="matrix(-0.0004,0.1424,-0.1424,-0.0004,28.1323,20.6899)">
+   <stop offset="0" stop-color="#ffffff"/>
+   <stop offset="1" stop-color="#b9b9b0"/>
+  </radialGradient>
+  <path style="fill:url(#gradient4)"
+        d="M34.37 25.11C34.36 28.56 31.55 31.36 28.1 31.35C24.64 31.34 21.85 28.53 21.86 25.07C21.87 21.61 24.68 18.82 28.13 18.83C31.59 18.84 34.38 21.65 34.37 25.11V25.11V25.11z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#010101; stroke-width:2"
+        d="M34.37 25.11C34.36 28.56 31.55 31.36 28.1 31.35C24.64 31.34 21.85 28.53 21.86 25.07C21.87 21.61 24.68 18.82 28.13 18.83C31.59 18.84 34.38 21.65 34.37 25.11V25.11V25.11z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#010101"
+        d="M32.59 26.03C32.58 27.69 31.23 29.04 29.57 29.03C27.9 29.03 26.56 27.68 26.56 26.01C26.57 24.35 27.92 23 29.58 23.01C31.25 23.01 32.59 24.36 32.59 26.03V26.03V26.03z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#000000; stroke-width:1.3111"
+        d="M32.59 26.03C32.58 27.69 31.23 29.04 29.57 29.03C27.9 29.03 26.56 27.68 26.56 26.01C26.57 24.35 27.92 23 29.58 23.01C31.25 23.01 32.59 24.36 32.59 26.03V26.03V26.03z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#ffffff"
+        d="M30.51 24.63C30.5 25.78 29.57 26.72 28.41 26.71C27.26 26.71 26.33 25.77 26.33 24.62C26.34 23.47 27.27 22.54 28.43 22.54C29.58 22.54 30.51 23.48 30.51 24.63V24.63V24.63z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#010101"
+        d="M20.26 25.65C20.26 26.67 19.43 27.5 18.4 27.49C17.38 27.49 16.55 26.66 16.55 25.63C16.56 24.61 17.39 23.78 18.41 23.79C19.44 23.79 20.26 24.62 20.26 25.65V25.65V25.65z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#000000; stroke-width:1.3111"
+        d="M20.26 25.65C20.26 26.67 19.43 27.5 18.4 27.49C17.38 27.49 16.55 26.66 16.55 25.63C16.56 24.61 17.39 23.78 18.41 23.79C19.44 23.79 20.26 24.62 20.26 25.65V25.65V25.65z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#ffffff"
+        d="M18.98 24.79C18.98 25.49 18.4 26.07 17.69 26.07C16.98 26.06 16.41 25.49 16.41 24.78C16.42 24.07 16.99 23.5 17.7 23.5C18.41 23.5 18.98 24.08 18.98 24.79V24.79V24.79z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient5" gradientUnits="userSpaceOnUse" x1="44.23" y1="38.53" x2="41.48" y2="44.47">
+   <stop offset="0" stop-color="#6e3d09"/>
+   <stop offset="0.2424" stop-color="#ea8113"/>
+   <stop offset="0.6212" stop-color="#5c3307"/>
+   <stop offset="1" stop-color="#e07c12"/>
+  </linearGradient>
+  <path style="fill:url(#gradient5)"
+        d="M47.13 43.83C47.54 43.03 47.94 42.22 48.35 41.42C43.84 38.1 35.52 35.67 35.52 35.67C34.08 34.99 33.62 36.29 34.62 37.13C34.62 37.13 41.73 42.26 47.13 43.83V43.83V43.83z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#673907; stroke-width:1.2896; stroke-linecap:round"
+        d="M47.13 43.83C47.54 43.03 47.94 42.22 48.35 41.42C43.84 38.1 35.52 35.67 35.52 35.67C34.08 34.99 33.62 36.29 34.62 37.13C34.62 37.13 41.73 42.26 47.13 43.83V43.83V43.83z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient6" gradientUnits="userSpaceOnUse" x1="50.04" y1="45.01" x2="51.25" y2="42.6">
+   <stop offset="0" stop-color="#bdbdbd"/>
+   <stop offset="0.3333" stop-color="#e2e2e2"/>
+   <stop offset="0.6666" stop-color="#a3a3a3"/>
+   <stop offset="1" stop-color="#dddddd"/>
+  </linearGradient>
+  <path style="fill:url(#gradient6)"
+        d="M52.92 46.08C53.13 45.6 53.35 45.12 53.57 44.64C51.89 43.56 50.21 42.48 48.54 41.4C48.4 41.38 48.27 41.37 48.13 41.36C48.08 41.17 48.02 40.99 47.96 40.8C47.23 41.26 46.16 42.96 46.44 43.92C46.62 43.85 46.8 43.78 46.98 43.72C47.08 43.81 47.18 43.91 47.28 44C49.16 44.69 51.04 45.39 52.92 46.08H52.92V46.08z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#888a85; stroke-width:1.2896; stroke-linecap:round"
+        d="M52.92 46.08C53.13 45.6 53.35 45.12 53.57 44.64C51.89 43.56 50.21 42.48 48.54 41.4C48.4 41.38 48.27 41.37 48.13 41.36C48.08 41.17 48.02 40.99 47.96 40.8C47.23 41.26 46.16 42.96 46.44 43.92C46.62 43.85 46.8 43.78 46.98 43.72C47.08 43.81 47.18 43.91 47.28 44C49.16 44.69 51.04 45.39 52.92 46.08H52.92V46.08z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:none; stroke:#ffffff; stroke-width:1.3111; stroke-linecap:round; stroke-linejoin:round"
+        d="M49.66 43.34C50.77 43.82 51.89 44.31 53 44.79"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <radialGradient id="gradient7" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="64" gradientTransform="matrix(0.0928,-0.027,0.0277,0.0952,53.0307,46.427)">
+   <stop offset="0" stop-color="#696969"/>
+   <stop offset="1" stop-color="#000000"/>
+  </radialGradient>
+  <path style="fill:url(#gradient7)"
+        d="M60.23 52.21C58.67 46.87 58.13 42.63 54.02 43C50.7 43.29 50.46 48.03 53.88 49.35C57.17 50.63 60.23 52.21 60.23 52.21V52.21V52.21z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#ffffff; fill-opacity:0.5254"
+        d="M54.26 43.43C54.99 43.22 55.76 43.64 55.97 44.37C56.18 45.1 55.76 45.86 55.03 46.08C54.3 46.29 53.54 45.87 53.32 45.14C53.11 44.41 53.53 43.64 54.26 43.43V43.43V43.43z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <path style="fill:#ffffff"
+        d="M48.26 41.45C48.75 41.31 49.27 41.59 49.41 42.08C49.55 42.58 49.27 43.09 48.78 43.24C48.28 43.38 47.77 43.1 47.62 42.6C47.48 42.11 47.76 41.59 48.26 41.45V41.45V41.45z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient8" gradientUnits="userSpaceOnUse" x1="56.79" y1="45.16" x2="58.32" y2="48.01">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="0.7921"/>
+   <stop offset="1" stop-color="#ffffff" stop-opacity="0.2117"/>
+  </linearGradient>
+  <path style="fill:url(#gradient8)"
+        d="M58.27 49.01C58.27 49.01 57.76 47.1 56.63 46.09C56.23 45.74 56.74 45.22 57.11 45.68C57.93 46.67 58.27 49.01 58.27 49.01V49.01V49.01z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient9" gradientUnits="userSpaceOnUse" x1="33.48" y1="36.52" x2="31.08" y2="37.09">
+   <stop offset="0" stop-color="#000000"/>
+   <stop offset="1" stop-color="#000000" stop-opacity="0"/>
+  </linearGradient>
+  <path style="fill:url(#gradient9)"
+        d="M29.34 38.07C31.3 38.26 33.07 37.73 33.81 37.46C33.94 36.74 34.52 35.34 36.5 35.25C36.27 34.85 36.04 34.44 35.81 34.03C35.81 34.03 33.23 35.79 30.47 36.31C30.09 36.9 29.72 37.48 29.34 38.07V38.07z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+  <linearGradient id="gradient10" gradientUnits="userSpaceOnUse" x1="-5" y1="33.98" x2="-1.07" y2="32.46">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="0.7921"/>
+   <stop offset="1" stop-color="#ffffff" stop-opacity="0.2117"/>
+  </linearGradient>
+  <path style="fill:none; stroke:url(#gradient10); stroke-width:1.0587"
+        d="M10.63 26.38C12.72 29.35 12.74 32.99 10.67 34.51C8.6 36.02 5.22 34.84 3.13 31.86C1.04 28.89 1.02 25.25 3.09 23.73C5.17 22.22 8.54 23.4 10.63 26.38V26.38V26.38z"
+        transform="matrix(1.0166,0,0,1.0166,1,0.9999)"
+  />
+ </g>
+</svg>
diff --git a/icons/scalable/apps/mauplay.svg b/icons/scalable/apps/mauplay.svg
new file mode 120000
index 0000000..69f9fe3
--- /dev/null
+++ b/icons/scalable/apps/mauplay.svg
@@ -0,0 +1 @@
+../devices/radio.svg
\ No newline at end of file
diff --git a/icons/scalable/apps/mbiff.svg b/icons/scalable/apps/mbiff.svg
new file mode 120000
index 0000000..c641bb4
--- /dev/null
+++ b/icons/scalable/apps/mbiff.svg
@@ -0,0 +1 @@
+../places/mailbox.svg
\ No newline at end of file
diff --git a/icons/scalable/apps/mimview.svg b/icons/scalable/apps/mimview.svg
new file mode 120000
index 0000000..804fff2
--- /dev/null
+++ b/icons/scalable/apps/mimview.svg
@@ -0,0 +1 @@
+../devices/projector.svg
\ No newline at end of file
diff --git a/icons/scalable/apps/unknown.svg b/icons/scalable/apps/unknown.svg
new file mode 120000
index 0000000..24335f4
--- /dev/null
+++ b/icons/scalable/apps/unknown.svg
@@ -0,0 +1 @@
+../categories/applications-other.svg
\ No newline at end of file
diff --git a/icons/scalable/apps/xterm.svg b/icons/scalable/apps/xterm.svg
new file mode 120000
index 0000000..b6181fc
--- /dev/null
+++ b/icons/scalable/apps/xterm.svg
@@ -0,0 +1 @@
+terminal.svg
\ No newline at end of file
diff --git a/icons/scalable/categories/applications-other.svg b/icons/scalable/categories/applications-other.svg
new file mode 100644
index 0000000..668d442
--- /dev/null
+++ b/icons/scalable/categories/applications-other.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
+     xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path style="fill:#010101; fill-opacity:0.4549"
+        d="M18 62H25L33 54L46 62H53L64 50L56 46L30 49L18 62z"
+  />
+  <path style="fill:none; stroke:#000000; stroke-width:4"
+        d="M2 34V52L18 60L30 49V32L14 26L2 34z"
+  />
+  <linearGradient id="gradient0" gradientUnits="userSpaceOnUse" x1="-25.79" y1="20.62" x2="10.43" y2="5.03">
+   <stop offset="0" stop-color="#bde2b7"/>
+   <stop offset="1" stop-color="#40a635"/>
+  </linearGradient>
+  <path style="fill:url(#gradient0)"
+        d="M2 34V52L18 60V41L2 34z"
+  />
+  <path style="fill:#587c46"
+        d="M18 41V60L30 49V32L18 41z"
+  />
+  <path style="fill:#076102"
+        d="M24 34L28 45V36L24 34z"
+        transform="matrix(1,0,0,1,0,1)"
+  />
+  <linearGradient id="gradient1" gradientUnits="userSpaceOnUse" x1="12.94" y1="-1.93" x2="52.06" y2="14.45">
+   <stop offset="0" stop-color="#d1facb"/>
+   <stop offset="1" stop-color="#76cb68"/>
+  </linearGradient>
+  <path style="fill:url(#gradient1)"
+        d="M2 34L18 41L30 32L14 26L2 34z"
+  />
+  <path style="fill:none; stroke:#000000; stroke-width:4"
+        d="M30 34V52L46 60L58 48V31L42 25L30 34z"
+  />
+  <path style="fill:#e86b06"
+        d="M33 49L33.99 53.99L46 60V41L41.07 38.84L33 49z"
+  />
+  <path style="fill:#be5305"
+        d="M30 34V52L33.99 53.99L33 49L41.07 38.84L30 34z"
+  />
+  <linearGradient id="gradient2" gradientUnits="userSpaceOnUse" x1="71.36" y1="-3.35" x2="104.04" y2="22.42">
+   <stop offset="0" stop-color="#b03c03"/>
+   <stop offset="1" stop-color="#bb5605"/>
+  </linearGradient>
+  <path style="fill:url(#gradient2)"
+        d="M32 18V37L44 28V10L32 18z
+           M46 41V60L58 48V30L46 41z"
+  />
+  <path style="fill:#ff9803"
+        d="M51.5 30.75L40.98 38.8L46 41L58 31L42 25L41.58 26.18L51.5 30.75z"
+  />
+  <path style="fill:#de6706"
+        d="M30 34L40.98 38.8L51.5 30.75L41.58 26.18L30 34z"
+  />
+  <path style="fill:none; stroke:#000000; stroke-width:4"
+        d="M16 12V30L32 37L44 28V10L28 5L16 12z"
+  />
+  <linearGradient id="gradient3" gradientUnits="userSpaceOnUse" x1="-19.87" y1="-1.53" x2="5.48" y2="-26.29">
+   <stop offset="0" stop-color="#ffec4b"/>
+   <stop offset="1" stop-color="#f0a506"/>
+  </linearGradient>
+  <path style="fill:url(#gradient3)"
+        d="M16 12V30L32 37V18L16 12z"
+  />
+  <linearGradient id="gradient4" gradientUnits="userSpaceOnUse" x1="30.5" y1="-22.81" x2="56.01" y2="-9.13">
+   <stop offset="0" stop-color="#ffffff"/>
+   <stop offset="1" stop-color="#fff289"/>
+  </linearGradient>
+  <path style="fill:url(#gradient4)"
+        d="M16 12L32 18L44 10L28 5L16 12z"
+  />
+  <linearGradient id="gradient5" gradientUnits="userSpaceOnUse" x1="53.01" y1="-9.55" x2="69.94" y2="3.43">
+   <stop offset="0" stop-color="#f99b05"/>
+   <stop offset="1" stop-color="#fcb23d"/>
+  </linearGradient>
+  <path style="fill:url(#gradient5)"
+        d="M32 18V37L44 28V10L32 18z"
+  />
+ </g>
+</svg>