Merge branch 'release/debian/3.32.2.1-1'debian/3.32.2.1-1

10 files changed, 8 insertions, 835 deletions

diff --git a/data/icons/16x16/object-crop.png b/data/icons/16x16/object-crop.png
deleted file mode 100644
index 48bcd12..0000000
--- a/data/icons/16x16/object-crop.png
+++ /dev/null
diff --git a/data/icons/22x22/object-crop.png b/data/icons/22x22/object-crop.png
deleted file mode 100644
index 4dedd93..0000000
--- a/data/icons/22x22/object-crop.png
+++ /dev/null
diff --git a/data/icons/24x24/object-crop.png b/data/icons/24x24/object-crop.png
deleted file mode 100644
index 0e46708..0000000
--- a/data/icons/24x24/object-crop.png
+++ /dev/null
diff --git a/data/icons/32x32/object-crop.png b/data/icons/32x32/object-crop.png
deleted file mode 100644
index b169fb7..0000000
--- a/data/icons/32x32/object-crop.png
+++ /dev/null
diff --git a/data/icons/48x48/object-crop.png b/data/icons/48x48/object-crop.png
deleted file mode 100644
index e410183..0000000
--- a/data/icons/48x48/object-crop.png
+++ /dev/null
diff --git a/data/icons/hicolor/scalable/org.gnome.SimpleScan.svg b/data/icons/hicolor/scalable/org.gnome.SimpleScan.svg
new file mode 100644
index 0000000..9616b55
--- /dev/null
+++ b/data/icons/hicolor/scalable/org.gnome.SimpleScan.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.0" enable-background="new"><defs><linearGradient xlink:href="#a" id="n" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.25 0 0 .25 166 125.009)" x1="248" y1="619.964" x2="568" y2="619.964"/><linearGradient id="a"><stop offset="0" stop-color="#d5d3cf"/><stop offset=".05" stop-color="#e4e1de"/><stop offset=".1" stop-color="#d5d3cf"/><stop offset=".9" stop-color="#d5d3cf"/><stop offset=".95" stop-color="#e4e1de"/><stop offset="1" stop-color="#d5d3cf"/></linearGradient><clipPath clipPathUnits="userSpaceOnUse" id="l"><rect style="marker:none" width="400" height="256" x="56" y="-92" rx="8" ry="8" fill="none" stroke="#000" stroke-width="4" enable-background="new"/></clipPath><filter id="m" x="-.264" width="1.528" y="-.014" height="1.028" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="1.76"/></filter><radialGradient xlink:href="#b" id="k" cx="-72.632" cy="88.045" fx="-72.632" fy="88.045" r="200" gradientTransform="matrix(.08386 0 0 2.375 230.091 -273.105)" gradientUnits="userSpaceOnUse"/><linearGradient id="b"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#d5d3cf" stop-opacity="0"/></linearGradient><linearGradient gradientTransform="matrix(.25 0 0 .29687 225 12)" xlink:href="#c" id="j" x1="-156" y1="-256" x2="220" y2="-256" gradientUnits="userSpaceOnUse"/><linearGradient id="c"><stop offset="0"/><stop offset="1" stop-color="#424048"/></linearGradient><linearGradient gradientTransform="matrix(.25 0 0 .275 232.467 16.3)" xlink:href="#d" id="i" x1="-122.894" y1="-292" x2="34.97" y2="-292" gradientUnits="userSpaceOnUse"/><linearGradient id="d"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient id="h"><stop stop-color="#fff" offset="0"/><stop stop-opacity="0" stop-color="#fff" offset="1"/></linearGradient><linearGradient id="e"><stop stop-color="#f6f5f4" offset="0"/><stop stop-color="#fff" offset="1"/></linearGradient><linearGradient id="f"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".05"/><stop stop-color="#d5d3cf" offset=".1"/><stop stop-color="#d5d3cf" offset=".9"/><stop stop-color="#e4e1de" offset=".95"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient><linearGradient id="g"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".02"/><stop stop-color="#d5d3cf" offset=".059"/><stop stop-color="#d5d3cf" offset=".945"/><stop stop-color="#e4e1de" offset=".973"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient></defs><g transform="translate(0 -172)"><rect transform="rotate(90)" ry="8.8" rx="8" y="-108" x="180" height="88" width="110" style="marker:none" fill="url(#i)" enable-background="new"/><rect transform="rotate(90)" ry="0" rx="0" y="-102" x="186" height="76" width="94" style="marker:none" fill="url(#j)" enable-background="new"/><rect transform="rotate(90)" ry="0" rx="0" y="-102" x="186" height="76" width="94" style="marker:none" opacity=".486" fill="url(#k)" enable-background="new"/><g transform="matrix(0 .25 -.29687 0 74.688 132)" clip-path="url(#l)" fill="#fff" stroke="none" color="#000" font-weight="400" font-family="sans-serif"><path transform="matrix(1.33333 0 0 1 -144 0)" d="M372-116v304h24v-304z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" overflow="visible" fill="#f9f06b" filter="url(#m)" enable-background="new"/><path d="M360-116v304h16v-304z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" overflow="visible" enable-background="accumulate"/></g><path style="marker:none" d="M108 280v4c0 4.432-3.568 8-8 8H28c-4.432 0-8-3.568-8-8v-4c0 4.432 3.568 8 8 8h72c4.432 0 8-3.568 8-8z" fill="url(#n)" enable-background="new"/><g stroke-width="1.376"><path d="M37.815 191.985h36.096l22.088 21.748.001 54.585c0 3.221-2.626 5.831-5.847 5.831H37.815A5.803 5.803 0 0 1 32 268.334V197.8a5.803 5.803 0 0 1 5.815-5.816z" fill="#f6f5f4" enable-background="new"/><path d="M74.036 192.235v15.992c0 3.222 2.624 5.76 5.846 5.76l15.992-.004z" fill="#deddda" enable-background="new"/></g></g></svg>
\ No newline at end of file
diff --git a/data/icons/hicolor/symbolic/org.gnome.SimpleScan-symbolic.svg b/data/icons/hicolor/symbolic/org.gnome.SimpleScan-symbolic.svg
new file mode 100644
index 0000000..e18b812
--- /dev/null
+++ b/data/icons/hicolor/symbolic/org.gnome.SimpleScan-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.0"><defs><linearGradient id="d"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#d5d3cf" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0"/><stop offset="1" stop-color="#424048"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient id="g"><stop stop-color="#fff" offset="0"/><stop stop-opacity="0" stop-color="#fff" offset="1"/></linearGradient><linearGradient id="a"><stop stop-color="#f6f5f4" offset="0"/><stop stop-color="#fff" offset="1"/></linearGradient><linearGradient id="b"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".05"/><stop stop-color="#d5d3cf" offset=".1"/><stop stop-color="#d5d3cf" offset=".9"/><stop stop-color="#e4e1de" offset=".95"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient><linearGradient id="c"><stop stop-color="#d5d3cf" offset="0"/><stop stop-color="#e4e1de" offset=".02"/><stop stop-color="#d5d3cf" offset=".059"/><stop stop-color="#d5d3cf" offset=".945"/><stop stop-color="#e4e1de" offset=".973"/><stop stop-color="#d5d3cf" offset="1"/></linearGradient></defs><g transform="translate(-160 -172)"><rect style="marker:none" width="12" height="12" x="162" y="174" rx="1.661" ry="1.661" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path style="marker:none" d="M163 179.645h11" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><path style="marker:none" d="M165 176v8h6v-6l-2-2z"/></g></svg>
\ No newline at end of file
diff --git a/data/icons/scalable/object-crop.svg b/data/icons/scalable/object-crop.svg
deleted file mode 100644
index 42c4605..0000000
--- a/data/icons/scalable/object-crop.svg
+++ /dev/null
@@ -1,826 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/andreas/projekt/bild/tango/scalable/draw-pencil3.png"
-   width="48px"
-   height="48px"
-   id="svg9121"
-   sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-art-libre/scalable/transformations"
-   sodipodi:docname="transform-crop-and-resize.svg">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2309">
-      <stop
-         style="stop-color:#686b65;stop-opacity:1;"
-         offset="0"
-         id="stop2311" />
-      <stop
-         style="stop-color:#686b65;stop-opacity:0;"
-         offset="1"
-         id="stop2313" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2301">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2303" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2305" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2287">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2289" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:0.77319586;"
-         offset="1"
-         id="stop2291" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#32342f;stop-opacity:0.54639173;"
-         offset="0.0000000"
-         id="stop2226" />
-      <stop
-         style="stop-color:#32342f;stop-opacity:0;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2224"
-       id="radialGradient2230"
-       cx="24.041630"
-       cy="42.242130"
-       fx="24.041630"
-       fy="42.242130"
-       r="17.576654"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,1.552820e-15,29.37527)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3441">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop3443" />
-      <stop
-         style="stop-color:#fcfff6;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2655">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop2657" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop2659" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6157">
-      <stop
-         id="stop6159"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         id="stop6165"
-         offset="0.50000000"
-         style="stop-color:#dfe2da;stop-opacity:1.0000000;" />
-      <stop
-         id="stop6161"
-         offset="1.0000000"
-         style="stop-color:#babdb6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10677">
-      <stop
-         style="stop-color:#6f4501;stop-opacity:1;"
-         offset="0"
-         id="stop10679" />
-      <stop
-         style="stop-color:#6f4501;stop-opacity:0;"
-         offset="1"
-         id="stop10681" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8391">
-      <stop
-         style="stop-color:#8f5902;stop-opacity:1;"
-         offset="0"
-         id="stop8393" />
-      <stop
-         style="stop-color:#8f5902;stop-opacity:0;"
-         offset="1"
-         id="stop8395" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7625">
-      <stop
-         style="stop-color:#505b5f;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop7627" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop7629" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5333">
-      <stop
-         style="stop-color:#555753;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop5335" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop5341" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop5337" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5325">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop5327" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0;"
-         offset="1"
-         id="stop5329" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5229">
-      <stop
-         id="stop5231"
-         offset="0.0000000"
-         style="stop-color:#969993;stop-opacity:1.0000000;" />
-      <stop
-         id="stop5237"
-         offset="0.50000000"
-         style="stop-color:#d4d8d0;stop-opacity:1.0000000;" />
-      <stop
-         id="stop5233"
-         offset="1.0000000"
-         style="stop-color:#abaea7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11940">
-      <stop
-         id="stop11942"
-         offset="0"
-         style="stop-color:#fcf18f;stop-opacity:1;" />
-      <stop
-         id="stop11944"
-         offset="1"
-         style="stop-color:#fcf18f;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11932">
-      <stop
-         id="stop11934"
-         offset="0"
-         style="stop-color:#b59300;stop-opacity:1;" />
-      <stop
-         id="stop11936"
-         offset="1"
-         style="stop-color:#b59300;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11924"
-       inkscape:collect="always">
-      <stop
-         id="stop11926"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11928"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11916">
-      <stop
-         id="stop11918"
-         offset="0.0000000"
-         style="stop-color:#8b7200;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11920"
-         offset="1"
-         style="stop-color:#544500;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11124">
-      <stop
-         id="stop11126"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11128"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19124">
-      <stop
-         style="stop-color:#fcf18f;stop-opacity:1;"
-         offset="0"
-         id="stop19126" />
-      <stop
-         style="stop-color:#fcf8ce;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop19128" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19116">
-      <stop
-         style="stop-color:#987c00;stop-opacity:1;"
-         offset="0"
-         id="stop19118" />
-      <stop
-         style="stop-color:#5f4d00;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop19120" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19108">
-      <stop
-         style="stop-color:#edd400;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop19110" />
-      <stop
-         style="stop-color:#b8a500;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop19112" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18320">
-      <stop
-         style="stop-color:#e9b96e;stop-opacity:1;"
-         offset="0"
-         id="stop18322" />
-      <stop
-         style="stop-color:#b88433;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop18324" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14520">
-      <stop
-         style="stop-color:#fcfae2;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop14522" />
-      <stop
-         style="stop-color:#b8ab27;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop14524" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14520"
-       id="linearGradient14526"
-       gradientTransform="scale(0.831950,1.201995)"
-       x1="23.411154"
-       y1="0.82209921"
-       x2="21.684671"
-       y2="6.4114828"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18320"
-       id="linearGradient18326"
-       gradientTransform="matrix(1.228073,0.000000,0.000000,1.407676,-1.888866,-14.16649)"
-       x1="11.711685"
-       y1="31.134253"
-       x2="15.543560"
-       y2="33.482140"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19108"
-       id="linearGradient19114"
-       gradientTransform="scale(0.827650,1.208240)"
-       x1="31.654196"
-       y1="3.4796145"
-       x2="28.394352"
-       y2="12.564109"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="29.502863"
-       x2="24.769884"
-       y1="11.246989"
-       x1="15.750742"
-       gradientTransform="matrix(0.831950,0.000000,0.000000,1.201995,100.1096,-33.10918)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11152"
-       xlink:href="#linearGradient14520"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="33.482140"
-       x2="15.543560"
-       y1="31.134253"
-       x1="11.711685"
-       gradientTransform="matrix(0.934030,0.000000,0.000000,1.070630,100.1096,-33.10918)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11154"
-       xlink:href="#linearGradient18320"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.211454"
-       x2="29.475761"
-       y1="13.215685"
-       x1="20.190006"
-       gradientTransform="matrix(0.827650,0.000000,0.000000,1.208240,100.1096,-33.10918)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient11156"
-       xlink:href="#linearGradient19108"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="4.8820314"
-       x2="33.964863"
-       y1="35.224327"
-       x1="8.1650734"
-       gradientTransform="scale(0.824694,1.212571)"
-       id="linearGradient11930"
-       xlink:href="#linearGradient11924"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="2.7806931"
-       x2="34.060062"
-       y1="16.266647"
-       x1="27.062229"
-       gradientTransform="scale(0.800741,1.248844)"
-       id="linearGradient11938"
-       xlink:href="#linearGradient11932"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="-0.48521933"
-       x2="16.707243"
-       y1="4.4311285"
-       x1="14.394565"
-       gradientTransform="scale(0.838071,1.193216)"
-       id="linearGradient11946"
-       xlink:href="#linearGradient11940"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="4.8820314"
-       x2="33.964863"
-       y1="35.224327"
-       x1="8.1650734"
-       gradientTransform="matrix(0.824694,0.000000,0.000000,1.212571,17.09202,-2.523485)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13466"
-       xlink:href="#linearGradient11924"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2.6501136"
-       x2="24.141811"
-       y1="7.2559285"
-       x1="22.480724"
-       gradientTransform="scale(0.826560,1.209833)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13472"
-       xlink:href="#linearGradient11916"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="12.564109"
-       x2="28.394352"
-       y1="3.4796145"
-       x1="31.654196"
-       gradientTransform="scale(0.827650,1.208240)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1949"
-       xlink:href="#linearGradient19108"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="33.482140"
-       x2="15.543560"
-       y1="31.134253"
-       x1="11.711685"
-       gradientTransform="matrix(1.228073,4.302344e-17,-4.316300e-17,1.407676,-1.888866,-14.16649)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1951"
-       xlink:href="#linearGradient18320"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-0.48521933"
-       x2="16.707243"
-       y1="4.4311285"
-       x1="14.394565"
-       gradientTransform="scale(0.838071,1.193216)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1953"
-       xlink:href="#linearGradient11940"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2.7806931"
-       x2="34.060062"
-       y1="16.266647"
-       x1="27.062229"
-       gradientTransform="scale(0.800741,1.248844)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1955"
-       xlink:href="#linearGradient11932"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="6.4114828"
-       x2="21.684671"
-       y1="0.82209921"
-       x1="23.411154"
-       gradientTransform="scale(0.831950,1.201995)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1957"
-       xlink:href="#linearGradient14520"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="2.6501136"
-       x2="24.141811"
-       y1="7.2559285"
-       x1="22.480724"
-       gradientTransform="scale(0.826560,1.209833)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1959"
-       xlink:href="#linearGradient11916"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11916"
-       id="linearGradient4295"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.810222,0.163528,-0.239356,1.185920,0.000000,0.000000)"
-       x1="32.368496"
-       y1="6.0591717"
-       x2="35.239323"
-       y2="-3.6642039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14520"
-       id="linearGradient4300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.815505,0.164595,-0.237805,1.178235,8.297767,0.197690)"
-       x1="23.411154"
-       y1="0.82209921"
-       x2="21.684671"
-       y2="6.4114828" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11932"
-       id="linearGradient4303"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.784913,0.158420,-0.247074,1.224159,0.000000,0.000000)"
-       x1="43.604591"
-       y1="9.6609612"
-       x2="48.134148"
-       y2="1.5751816" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11940"
-       id="linearGradient4306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.821506,0.165806,-0.236068,1.169631,0.000000,0.000000)"
-       x1="28.250944"
-       y1="1.5502936"
-       x2="29.906208"
-       y2="-2.3372657" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18320"
-       id="linearGradient4309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.203798,0.242964,-0.278497,1.379850,9.248965,-14.06247)"
-       x1="11.711685"
-       y1="31.134253"
-       x2="15.543560"
-       y2="33.482140" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19108"
-       id="linearGradient4312"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.811291,0.163744,-0.239041,1.184358,0.000000,0.000000)"
-       x1="41.323280"
-       y1="-3.1978326"
-       x2="38.269123"
-       y2="11.365776" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5229"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.821255,0.715182,-0.603048,0.692490,0.000000,0.000000)"
-       x1="24.742752"
-       y1="2.3111212"
-       x2="31.589277"
-       y2="2.4383495" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5333"
-       id="linearGradient5339"
-       gradientTransform="scale(1.064121,0.939743)"
-       x1="21.868711"
-       y1="15.557981"
-       x2="30.635437"
-       y2="24.778368"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5333"
-       id="linearGradient6107"
-       gradientTransform="scale(1.061798,0.941799)"
-       x1="15.356030"
-       y1="27.317253"
-       x2="20.829000"
-       y2="33.497402"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7625"
-       id="radialGradient7631"
-       gradientTransform="matrix(1.130280,0.000000,0.000000,0.884737,0.902354,-0.427463)"
-       cx="8.9124269"
-       cy="34.747555"
-       fx="9.0367527"
-       fy="34.482697"
-       r="7.9984083"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8391"
-       id="linearGradient8397"
-       gradientTransform="scale(1.013347,0.986829)"
-       x1="32.138252"
-       y1="14.785198"
-       x2="38.881176"
-       y2="6.9174280"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10677"
-       id="linearGradient10683"
-       gradientTransform="scale(0.941920,1.061662)"
-       x1="32.457001"
-       y1="16.203007"
-       x2="41.377167"
-       y2="5.4044285"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10677"
-       id="linearGradient10685"
-       gradientTransform="scale(0.941920,1.061662)"
-       x1="32.457001"
-       y1="16.203007"
-       x2="41.377167"
-       y2="5.4044285"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="7.8440785"
-       x2="-38.256573"
-       y1="17.157629"
-       x1="-31.074017"
-       gradientTransform="scale(0.765250,1.306762)"
-       id="linearGradient6163"
-       xlink:href="#linearGradient6157"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="7.8440785"
-       x2="-38.256573"
-       y1="17.157629"
-       x1="-31.074017"
-       gradientTransform="matrix(0.603485,0.470548,-0.803519,1.030527,48.59133,29.97432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7714"
-       xlink:href="#linearGradient6157"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2655"
-       id="linearGradient2661"
-       gradientTransform="scale(0.954299,1.047890)"
-       x1="34.563408"
-       y1="12.489259"
-       x2="40.103199"
-       y2="5.6996894"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3441"
-       id="linearGradient3452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.527682,3.007844e-9,-1.465781e-8,1.395766,0.274469,-0.380594)"
-       x1="54.225159"
-       y1="-3.4504862"
-       x2="64.746307"
-       y2="-2.537426" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2287"
-       id="linearGradient2293"
-       x1="17.66604"
-       y1="30.501617"
-       x2="19.180296"
-       y2="22.001617"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2224"
-       id="radialGradient2297"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,2.474554e-15,29.37527)"
-       cx="24.041630"
-       cy="42.242130"
-       fx="24.041630"
-       fy="42.242130"
-       r="17.576654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2301"
-       id="linearGradient2307"
-       x1="25.728207"
-       y1="12.759781"
-       x2="27.500931"
-       y2="14.134781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.902575,0.000000,0.000000,0.902575,2.604411,1.752083)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2309"
-       id="linearGradient2315"
-       x1="32.983826"
-       y1="13.087369"
-       x2="38.270443"
-       y2="5.9726477"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.22745098"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="30.522044"
-     inkscape:cy="36.26787"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="915"
-     inkscape:window-height="852"
-     inkscape:window-x="365"
-     inkscape:window-y="58"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata4">
-    <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>Crop Tool</dc:title>
-        <dc:date>2005-10-12</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>crop</rdf:li>
-            <rdf:li>cut</rdf:li>
-            <rdf:li>divide</rdf:li>
-            <rdf:li>split</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.48295455;fill:url(#radialGradient2230);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07686412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2222"
-       sodipodi:cx="24.04163"
-       sodipodi:cy="42.24213"
-       sodipodi:rx="17.576654"
-       sodipodi:ry="5.3538084"
-       d="M 41.618284 42.24213 A 17.576654 5.3538084 0 1 1  6.4649754,42.24213 A 17.576654 5.3538084 0 1 1  41.618284 42.24213 z"
-       transform="matrix(0.673638,0.000000,0.000000,0.430086,-0.605052,20.90465)" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path7706"
-       d="M 2.8839231,40.604807 C 2.8289019,40.675373 16.747691,40.499044 28.467196,32.686242 L 25.880399,30.669273 L 28.874256,26.8296 L 19.439728,19.473343 L 2.8839231,40.604807 z "
-       style="fill:url(#linearGradient7714);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#686b65;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path7708"
-       d="M 5.4018936,39.015942 C 9.8468723,38.336507 18.489609,36.512606 26.767934,32.643585 L 24.476866,30.857202 L 29.930295,23.863084 L 22.072991,17.736614 L 5.4018936,39.015942 z "
-       style="stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000007;stroke:url(#linearGradient2293);fill-rule:evenodd;fill-opacity:1.0000000;fill:none" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path7710"
-       d="M 25.184875,30.813965 C 16.717482,37.347736 5.8763072,37.531471 5.9121195,37.508799 L 4.1515976,39.859872 C 4.1959591,39.943637 16.629555,39.727546 27.636682,32.738124 L 25.184875,30.813965 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       id="path7712"
-       d="M 33.128941,0.021384731 L 18.603207,18.650892 C 21.372977,21.055374 22.372377,22.637098 20.25171,25.552907 L 23.708442,28.248177 C 25.447618,25.865954 27.221201,25.210765 30.296105,27.96658 L 45.12593,9.5458368"
-       style="fill:url(#linearGradient2661);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2315);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;opacity:1;color:#000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       style="fill:#eeeeec;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient3452);stroke-width:1.0000583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       id="rect3450"
-       width="4.5955172"
-       height="14.063637"
-       x="31.493130"
-       y="-11.785673"
-       rx="1.6161331"
-       ry="1.4138852"
-       transform="matrix(0.794294,0.607534,-0.619919,0.784665,0.000000,0.000000)" />
-    <path
-       transform="matrix(1.281689,0.000000,0.000000,1.098472,-7.036086,-7.532814)"
-       d="M 41.618284 42.24213 A 17.576654 5.3538084 0 1 1  6.4649754,42.24213 A 17.576654 5.3538084 0 1 1  41.618284 42.24213 z"
-       sodipodi:ry="5.3538084"
-       sodipodi:rx="17.576654"
-       sodipodi:cy="42.24213"
-       sodipodi:cx="24.04163"
-       id="path2295"
-       style="opacity:0.32954544;fill:url(#radialGradient2297);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07686412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient2307);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 32.505759,1.7713847 L 19.395197,18.585909 C 21.895122,20.756134 22.797155,22.183758 20.883095,24.815494 L 24.003054,27.248177 C 25.57279,25.098042 27.173582,24.506685 29.948913,26.994015 L 43.33394,10.367915"
-       id="path2299"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="opacity:0.48295456;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 43.125,11 L 30.25,27.25 C 27.25,25.5 26.375,24.75 23.625,27.5 L 20.875,25.375 L 23.625,26.5 C 25.875,24.375 27.625,24.25 29.75,26.375 L 43.125,11 z "
-       id="path2317"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="opacity:0.11363636;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 20,26.0625 L 23.6875,30.25 C 26.0625,26.875 26.75,27.3125 27.625,27.5625 L 28.1875,27.0625 C 26.6875,26.25 25.25,26.6875 23.75,28.875 L 20,26.0625 z "
-       id="path2319"
-       sodipodi:nodetypes="cccccc" />
-  </g>
-</svg>
diff --git a/data/meson.build b/data/meson.build
index 9bba15f..aa1d0ec 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,11 +1,8 @@
-foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48', 'scalable' ]
-    suffix = 'png'
-    if size == 'scalable'
-        suffix = 'svg'
-    endif
-    install_data (join_paths ('icons', size , 'object-crop.' + suffix),
-                  install_dir: join_paths (icondir, 'hicolor', size, 'actions'))
-endforeach
+install_data (join_paths ('icons', 'hicolor', 'scalable', '@0@.svg'.format(app_id)),
+              install_dir: join_paths (datadir, 'icons', 'hicolor', 'scalable', 'apps'))
+
+install_data (join_paths ('icons', 'hicolor', 'symbolic', '@0@-symbolic.svg'.format(app_id)),
+              install_dir: join_paths (datadir, 'icons', 'hicolor', 'symbolic', 'apps'))
 
 install_data ('org.gnome.SimpleScan.gschema.xml',
               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index 98deb0d..2e602af 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -6,7 +6,7 @@ Comment=Scan Documents
 Keywords=scan;scanner;flatbed;adf;
 Exec=simple-scan
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=scanner
+Icon=org.gnome.SimpleScan
 Terminal=false
 Type=Application
 StartupNotify=true