2006-01-17 Jakub Steiner <jimmac@ximian.com>

18 files changed, 153 insertions, 175 deletions

diff --git a/22x22/places/folder-remote.png b/22x22/places/folder-remote.png
new file mode 100644
index 000000000..cb52337d3
--- /dev/null
+++ b/22x22/places/folder-remote.png
diff --git a/22x22/places/folder-remote.xcf.bz2 b/22x22/places/folder-remote.xcf.bz2
new file mode 100644
index 000000000..556e09c99
--- /dev/null
+++ b/22x22/places/folder-remote.xcf.bz2
diff --git a/22x22/places/folder.icon b/22x22/places/folder.icon
new file mode 100644
index 000000000..d96a4a4b1
--- /dev/null
+++ b/22x22/places/folder.icon
@@ -0,0 +1,2 @@
+[Icon Data]
+AttachPoints=12,12|22,0|22,12|22,22
diff --git a/22x22/places/folder.png b/22x22/places/folder.png
new file mode 100644
index 000000000..de4bd68e3
--- /dev/null
+++ b/22x22/places/folder.png
diff --git a/22x22/places/folder.xcf.bz2 b/22x22/places/folder.xcf.bz2
new file mode 100644
index 000000000..3b6b92858
--- /dev/null
+++ b/22x22/places/folder.xcf.bz2
diff --git a/22x22/places/network-server.png b/22x22/places/network-server.png
new file mode 100644
index 000000000..a0d7118d2
--- /dev/null
+++ b/22x22/places/network-server.png
diff --git a/22x22/places/network-workgroup.png b/22x22/places/network-workgroup.png
new file mode 100644
index 000000000..f96c9db51
--- /dev/null
+++ b/22x22/places/network-workgroup.png
diff --git a/22x22/places/user-desktop.png b/22x22/places/user-desktop.png
new file mode 100644
index 000000000..a4aae82a4
--- /dev/null
+++ b/22x22/places/user-desktop.png
diff --git a/22x22/places/user-desktop.xcf.bz2 b/22x22/places/user-desktop.xcf.bz2
new file mode 100644
index 000000000..857e42b99
--- /dev/null
+++ b/22x22/places/user-desktop.xcf.bz2
diff --git a/22x22/places/user-home.png b/22x22/places/user-home.png
new file mode 100644
index 000000000..c16a3232f
--- /dev/null
+++ b/22x22/places/user-home.png
diff --git a/22x22/places/user-home.xcf.bz2 b/22x22/places/user-home.xcf.bz2
new file mode 100644
index 000000000..bb279ede0
--- /dev/null
+++ b/22x22/places/user-home.xcf.bz2
diff --git a/22x22/places/user-trash.png b/22x22/places/user-trash.png
new file mode 100644
index 000000000..49feaa6b5
--- /dev/null
+++ b/22x22/places/user-trash.png
diff --git a/22x22/places/user-trash.xcf.bz2 b/22x22/places/user-trash.xcf.bz2
new file mode 100644
index 000000000..4f3d88863
--- /dev/null
+++ b/22x22/places/user-trash.xcf.bz2
diff --git a/22x22/status/user-trash-full.png b/22x22/status/user-trash-full.png
new file mode 100644
index 000000000..408367d2d
--- /dev/null
+++ b/22x22/status/user-trash-full.png
diff --git a/22x22/status/user-trash-full.xcf.bz2 b/22x22/status/user-trash-full.xcf.bz2
new file mode 100644
index 000000000..44bd5c7e5
--- /dev/null
+++ b/22x22/status/user-trash-full.xcf.bz2
diff --git a/ChangeLog b/ChangeLog
index f6212b46d..4b8cec83e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-17  Jakub Steiner <jimmac@ximian.com>
+
+	* 22x22/status/user-trash-full.png:
+	* 22x22/places/*: let icon-naming-utilities deal with the legacy
+		24x24 size.
+
 2006-01-17  Rodney Dawes  <dobey@novell.com>
 
 	* 24x24/apps/Makefile.am:
diff --git a/scalable/places/user-trash.svg b/scalable/places/user-trash.svg
index 6c6b8aa72..3696d853d 100644
--- a/scalable/places/user-trash.svg
+++ b/scalable/places/user-trash.svg
@@ -9,16 +9,29 @@
    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"
-   width="48.000000px"
-   height="48.000000px"
+   width="48"
+   height="48"
    id="svg1"
    sodipodi:version="0.32"
-   inkscape:version="0.40+cvs"
-   sodipodi:docbase="/home/jimmac/ximian_art/icons/nautilus/other"
-   sodipodi:docname="gnome-fs-trash-empty.svg">
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/jimmac/src/cvs/gnome/gnome-icon-theme/scalable/places"
+   sodipodi:docname="user-trash.svg"
+   version="1.0">
   <defs
      id="defs3">
     <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4211">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4213" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4215" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient1264">
       <stop
          id="stop1265"
@@ -32,7 +45,7 @@
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -50,17 +63,17 @@
        gradientUnits="userSpaceOnUse"
        r="13.265761"
        fy="8.9303417"
-       fx="39.147720"
+       fx="39.14772"
        cy="8.9303417"
-       cx="39.147720"
-       gradientTransform="matrix(0.878817,0.000000,0.000000,1.025708,1.243275,2.850095)"
+       cx="39.14772"
+       gradientTransform="matrix(0.878817,0,0,1.025708,1.243275,2.850095)"
        id="radialGradient1260"
        xlink:href="#linearGradient641"
        inkscape:collect="always" />
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -76,11 +89,11 @@
     </linearGradient>
     <radialGradient
        r="5.6434927"
-       fy="20.452780"
+       fy="20.45278"
        fx="16.280994"
-       cy="20.452780"
+       cy="20.45278"
        cx="16.280994"
-       gradientTransform="matrix(2.202254,0.000000,0.000000,0.574568,-13.83631,0.652472)"
+       gradientTransform="matrix(2.202254,0,0,0.574568,-13.83631,0.652472)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient1256"
        xlink:href="#linearGradient477"
@@ -101,11 +114,11 @@
          style="stop-color:#b0b0b0;stop-opacity:1.0000000;" />
     </linearGradient>
     <linearGradient
-       y2="14.748880"
+       y2="14.74888"
        x2="18.086929"
        y1="11.165159"
        x1="14.248631"
-       gradientTransform="matrix(1.399756,0.000000,0.000000,0.903977,-3.993125,0.751900)"
+       gradientTransform="matrix(1.399756,0,0,0.903977,-3.993125,0.7519)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1251"
        xlink:href="#linearGradient454"
@@ -158,7 +171,7 @@
        x2="20.135639"
        y1="8.7251825"
        x1="9.9626188"
-       gradientTransform="matrix(1.399756,0.000000,0.000000,0.903977,-3.993125,0.797381)"
+       gradientTransform="matrix(1.399756,0,0,0.903977,-3.993125,0.797381)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1240"
        xlink:href="#linearGradient177"
@@ -166,7 +179,7 @@
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -185,7 +198,7 @@
        x2="40.437176"
        y1="2.3488793"
        x1="24.162909"
-       gradientTransform="matrix(1.124876,0.000000,0.000000,1.124876,-3.993125,0.751900)"
+       gradientTransform="matrix(1.124876,0,0,1.124876,-3.993125,0.7519)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1236"
        xlink:href="#linearGradient477"
@@ -214,7 +227,7 @@
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -233,7 +246,7 @@
        x2="45.130928"
        y1="13.131673"
        x1="36.155384"
-       gradientTransform="matrix(0.826490,0.763061,0.763061,-0.826490,-30.95946,-9.495656)"
+       gradientTransform="matrix(0.82649,0.763061,0.763061,-0.82649,-30.95946,-9.495656)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1228"
        xlink:href="#linearGradient477"
@@ -254,7 +267,7 @@
        x2="13.763388"
        y1="14.035932"
        x1="16.551964"
-       gradientTransform="matrix(1.399756,0.000000,0.000000,0.903977,-2.860352,0.227876)"
+       gradientTransform="matrix(1.399756,0,0,0.903977,-2.860352,0.227876)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1224"
        xlink:href="#linearGradient177"
@@ -275,7 +288,7 @@
        x2="20.135639"
        y1="8.7251825"
        x1="9.9626188"
-       gradientTransform="matrix(1.027326,-0.134612,0.528454,0.536480,8.122164,4.863400)"
+       gradientTransform="matrix(1.027326,-0.134612,0.528454,0.53648,8.122164,4.8634)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1220"
        xlink:href="#linearGradient508"
@@ -294,7 +307,7 @@
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -312,17 +325,17 @@
        gradientUnits="userSpaceOnUse"
        r="13.265761"
        fy="8.9303417"
-       fx="39.147720"
+       fx="39.14772"
        cy="8.9303417"
-       cx="39.147720"
-       gradientTransform="matrix(0.878817,0.000000,0.000000,1.025708,7.377059,5.838147)"
+       cx="39.14772"
+       gradientTransform="matrix(0.878817,0,0,1.025708,7.377059,5.838147)"
        id="radialGradient640"
        xlink:href="#linearGradient641"
        inkscape:collect="always" />
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -338,11 +351,11 @@
     </linearGradient>
     <radialGradient
        r="5.6434927"
-       fy="20.452780"
+       fy="20.45278"
        fx="16.280994"
-       cy="20.452780"
+       cy="20.45278"
        cx="16.280994"
-       gradientTransform="matrix(2.202254,0.000000,0.000000,0.574568,-7.702522,3.640524)"
+       gradientTransform="matrix(2.202254,0,0,0.574568,-7.702522,3.640524)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient605"
        xlink:href="#linearGradient477"
@@ -363,11 +376,11 @@
          style="stop-color:#b0b0b0;stop-opacity:1.0000000;" />
     </linearGradient>
     <linearGradient
-       y2="14.748880"
+       y2="14.74888"
        x2="18.086929"
        y1="11.165159"
        x1="14.248631"
-       gradientTransform="matrix(1.399756,0.000000,0.000000,0.903977,2.140659,3.739952)"
+       gradientTransform="matrix(1.399756,0,0,0.903977,2.140659,3.739952)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient606"
        xlink:href="#linearGradient454"
@@ -420,7 +433,7 @@
        x2="20.135639"
        y1="8.7251825"
        x1="9.9626188"
-       gradientTransform="matrix(1.399756,0.000000,0.000000,0.903977,2.140659,3.785433)"
+       gradientTransform="matrix(1.399756,0,0,0.903977,2.140659,3.785433)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient608"
        xlink:href="#linearGradient177"
@@ -428,7 +441,7 @@
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -447,7 +460,7 @@
        x2="40.437176"
        y1="2.3488793"
        x1="24.162909"
-       gradientTransform="matrix(1.124876,0.000000,0.000000,1.124876,2.140659,3.739952)"
+       gradientTransform="matrix(1.124876,0,0,1.124876,2.140659,3.739952)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient609"
        xlink:href="#linearGradient477"
@@ -476,7 +489,7 @@
     <linearGradient
        style="fill-rule:nonzero;"
        y2="72.608902"
-       x2="192.38570"
+       x2="192.3857"
        y1="72.608902"
        x1="78.245598"
        gradientUnits="userSpaceOnUse"
@@ -495,7 +508,7 @@
        x2="45.130928"
        y1="13.131673"
        x1="36.155384"
-       gradientTransform="matrix(0.826490,0.763061,0.763061,-0.826490,-24.82567,-6.507603)"
+       gradientTransform="matrix(0.82649,0.763061,0.763061,-0.82649,-24.82567,-6.507603)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient611"
        xlink:href="#linearGradient477"
@@ -516,7 +529,7 @@
        x2="13.763388"
        y1="14.035932"
        x1="16.551964"
-       gradientTransform="matrix(1.399756,0.000000,0.000000,0.903977,3.273432,3.215928)"
+       gradientTransform="matrix(1.399756,0,0,0.903977,3.273432,3.215928)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient612"
        xlink:href="#linearGradient177"
@@ -537,7 +550,7 @@
        x2="20.135639"
        y1="8.7251825"
        x1="9.9626188"
-       gradientTransform="matrix(1.027326,-0.134612,0.528454,0.536480,14.25595,7.851452)"
+       gradientTransform="matrix(1.027326,-0.134612,0.528454,0.53648,14.25595,7.851452)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient613"
        xlink:href="#linearGradient508"
@@ -635,40 +648,20 @@
        inkscape:collect="always"
        xlink:href="#linearGradient1848"
        id="linearGradient1851"
-       gradientTransform="matrix(0.372255,0.000000,0.000000,1.799960,-36.85125,41.42950)"
+       gradientTransform="matrix(0.372255,0,0,1.79996,-36.85125,41.4295)"
        x1="10.956468"
-       y1="17.116150"
+       y1="17.11615"
        x2="24.819071"
        y2="14.198464"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1852"
-       id="linearGradient1855"
-       gradientTransform="matrix(0.975439,0.000000,0.000000,0.686915,-6.508085,7.772155)"
-       x1="-27.388609"
-       y1="92.944817"
-       x2="13.979697"
-       y2="92.944817"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1866"
-       id="linearGradient1865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.975439,0.000000,0.000000,0.686915,-6.508085,7.772155)"
-       x1="6.0349660"
-       y1="63.982471"
-       x2="-14.835558"
-       y2="63.364517" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1869"
        id="linearGradient1872"
-       gradientTransform="matrix(1.436131,0.000000,0.000000,0.466562,-6.508085,7.772155)"
+       gradientTransform="matrix(1.436131,0,0,0.466562,-6.508085,7.772155)"
        x1="-4.6375198"
        y1="104.38752"
-       x2="-4.5239210"
+       x2="-4.523921"
        y2="110.61378"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -676,37 +669,17 @@
        xlink:href="#linearGradient1877"
        id="linearGradient1874"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.358726,0.000000,0.000000,1.867845,-6.508085,7.772155)"
+       gradientTransform="matrix(-0.358726,0,0,1.867845,-6.508085,7.772155)"
        x1="0.57476199"
        y1="40.427212"
        x2="1.2553958"
        y2="32.083073" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1885"
-       id="linearGradient1884"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.975439,0.000000,0.000000,0.686915,-6.508085,7.772155)"
-       x1="-23.356779"
-       y1="68.580467"
-       x2="-26.357227"
-       y2="59.815063" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1890"
-       id="linearGradient1889"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.094645,0.000000,0.000000,0.612111,-6.508085,7.772155)"
-       x1="-7.7114453"
-       y1="77.223976"
-       x2="-12.228708"
-       y2="67.728409" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1877"
        id="linearGradient1894"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.358726,0.000000,0.000000,1.867845,-36.85125,41.42950)"
+       gradientTransform="matrix(-0.358726,0,0,1.867845,-36.85125,41.4295)"
        x1="-84.334358"
        y1="9.5548248"
        x2="-84.334358"
@@ -715,7 +688,7 @@
        inkscape:collect="always"
        xlink:href="#linearGradient2354"
        id="radialGradient2357"
-       gradientTransform="matrix(1.473067,0.000000,0.000000,0.454864,0.217601,0.311868)"
+       gradientTransform="matrix(1.473067,0,0,0.454864,0.217601,0.311868)"
        cx="16.354658"
        cy="91.818771"
        fx="16.354658"
@@ -727,10 +700,10 @@
        xlink:href="#linearGradient641"
        id="radialGradient1267"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.776773,0.000000,0.000000,0.906608,9.216466,6.938257)"
-       cx="39.147720"
+       gradientTransform="matrix(0.776773,0,0,0.906608,9.216466,6.938257)"
+       cx="39.14772"
        cy="8.9303417"
-       fx="39.147720"
+       fx="39.14772"
        fy="8.9303417"
        r="13.265761" />
     <radialGradient
@@ -738,22 +711,22 @@
        xlink:href="#linearGradient477"
        id="radialGradient1268"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.946539,0.000000,0.000000,0.507852,-4.112147,4.995812)"
+       gradientTransform="matrix(1.946539,0,0,0.507852,-4.112147,4.995812)"
        cx="16.280994"
-       cy="20.452780"
+       cy="20.45278"
        fx="16.280994"
-       fy="20.452780"
+       fy="20.45278"
        r="5.6434927" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient454"
        id="linearGradient1269"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.237223,0.000000,0.000000,0.799011,4.588093,5.083695)"
+       gradientTransform="matrix(1.237223,0,0,0.799011,4.588093,5.083695)"
        x1="14.248631"
        y1="11.165159"
        x2="18.086929"
-       y2="14.748880" />
+       y2="14.74888" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient177"
@@ -769,7 +742,7 @@
        xlink:href="#linearGradient177"
        id="linearGradient1271"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.237223,0.000000,0.000000,0.799011,4.588093,5.123895)"
+       gradientTransform="matrix(1.237223,0,0,0.799011,4.588093,5.123895)"
        x1="9.9626188"
        y1="8.7251825"
        x2="20.135639"
@@ -779,7 +752,7 @@
        xlink:href="#linearGradient477"
        id="linearGradient1272"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.994261,0.000000,0.000000,0.994261,4.588093,5.083695)"
+       gradientTransform="matrix(0.994261,0,0,0.994261,4.588093,5.083695)"
        x1="24.162909"
        y1="2.3488793"
        x2="40.437176"
@@ -809,7 +782,7 @@
        xlink:href="#linearGradient177"
        id="linearGradient1275"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.237223,0.000000,0.000000,0.799011,5.589330,4.620518)"
+       gradientTransform="matrix(1.237223,0,0,0.799011,5.58933,4.620518)"
        x1="16.551964"
        y1="14.035932"
        x2="13.763388"
@@ -819,11 +792,22 @@
        xlink:href="#linearGradient508"
        id="linearGradient1276"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.908038,-0.118981,0.467092,0.474187,15.29661,8.717790)"
+       gradientTransform="matrix(0.908038,-0.118981,0.467092,0.474187,15.29661,8.71779)"
        x1="9.9626188"
        y1="8.7251825"
        x2="20.135639"
        y2="14.744809" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4211"
+       id="radialGradient4217"
+       cx="18.738329"
+       cy="41.63604"
+       fx="18.738329"
+       fy="41.63604"
+       r="21.743534"
+       gradientTransform="matrix(1,0,0,0.333333,0,27.75736)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      inkscape:document-units="px"
@@ -833,79 +817,57 @@
      borderopacity="0.11372549"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.0000000"
-     inkscape:cx="59.721920"
-     inkscape:cy="8.1211624"
-     inkscape:current-layer="g1623"
-     inkscape:window-width="461"
-     inkscape:window-height="535"
-     inkscape:window-x="720"
-     inkscape:window-y="285" />
+     inkscape:zoom="1"
+     inkscape:cx="33.143279"
+     inkscape:cy="27.948799"
+     inkscape:current-layer="layer2"
+     inkscape:window-width="872"
+     inkscape:window-height="582"
+     inkscape:window-x="275"
+     inkscape:window-y="195"
+     fill="#204a87"
+     inkscape:showpageshadow="false" />
   <metadata
      id="metadata4">
-    <rdf:RDF
-       id="RDF5">
+    <rdf:RDF>
       <cc:Work
-         rdf:about=""
-         id="Work6">
-        <dc:format
-           id="format7">image/svg+xml</dc:format>
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
         <dc:type
-           id="type9"
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title
-           id="title1061">Trash Full</dc:title>
-        <dc:creator
-           id="creator1063">
-          <cc:Agent
-             id="Agent1064">
-            <dc:title
-               id="title1065">Jakub Steiner</dc:title>
+        <dc:title>Trash Full</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:date
-           id="date1067">2005-02-03</dc:date>
-        <dc:subject
-           id="subject1069">
-          <rdf:Bag
-             id="Bag1070">
-            <rdf:li
-               id="li1297">trash</rdf:li>
-            <rdf:li
-               id="li1298">delete</rdf:li>
-            <rdf:li
-               id="li1299">wastebasket</rdf:li>
-            <rdf:li
-               id="li1300">full</rdf:li>
+        <dc:date>2005-02-03</dc:date>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>trash</rdf:li>
+            <rdf:li>delete</rdf:li>
+            <rdf:li>wastebasket</rdf:li>
+            <rdf:li>full</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description
-           id="description1191">Trash is used to store deleted files. Alternatively it can work as a metaphore for &quot;delete&quot; action.</dc:description>
+        <dc:description>Trash is used to store deleted files. Alternatively it can work as a metaphore for &quot;delete&quot; action.</dc:description>
         <cc:license
-           id="license1193"
            rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/"
-         id="License1194">
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction"
-           id="permits1195" />
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution"
-           id="permits1196" />
+           rdf:resource="http://web.resource.org/cc/Distribution" />
         <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice"
-           id="requires1197" />
+           rdf:resource="http://web.resource.org/cc/Notice" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks"
-           id="permits1198" />
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
         <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike"
-           id="requires1199" />
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
         <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode"
-           id="requires1200" />
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
       </cc:License>
     </rdf:RDF>
   </metadata>
@@ -914,10 +876,15 @@
      id="layer2"
      inkscape:label="Shadow">
     <path
-       style="fill:url(#radialGradient2357);fill-opacity:1.0000000;stroke-width:0.0000000;stroke-miterlimit:4.0000000"
-       d="M 8.5396441,32.562221 C 7.6949192,32.562221 6.6406268,33.084363 6.1676550,33.744389 L 1.4219512,45.652042 C 0.94897927,46.312070 1.2549383,46.834211 2.0996627,46.834211 L 22.093867,46.834211 L 23.095032,46.834211 L 46.530180,46.834211 C 47.374903,46.834211 47.665467,46.312076 47.192488,45.652042 L 41.501051,33.744389 C 41.028076,33.084360 39.958383,32.562221 39.113660,32.562221 L 25.944499,32.562221 L 9.4021853,32.562221 L 8.5396441,32.562221 z "
-       id="rect1957"
-       sodipodi:nodetypes="ccccccccccccc" />
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:url(#radialGradient4217);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999982px;stroke-linecap:round;stroke-linejoin:round;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"
+       id="path3336"
+       sodipodi:cx="18.738329"
+       sodipodi:cy="41.63604"
+       sodipodi:rx="21.743534"
+       sodipodi:ry="7.2478447"
+       d="M 40.481863 41.63604 A 21.743534 7.2478447 0 1 1  -3.0052052,41.63604 A 21.743534 7.2478447 0 1 1  40.481863 41.63604 z"
+       transform="translate(5.303301,-0.707107)" />
   </g>
   <g
      inkscape:label="Pixmap Background"
@@ -929,43 +896,43 @@
      id="g1623"
      transform="translate(37.06885,-41.11763)">
     <path
-       style="fill:url(#linearGradient1855);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0232029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -32.711617,57.920760 C -32.754840,57.886386 -31.013657,82.649503 -31.013161,82.657012 C -30.849819,85.130028 -29.478625,86.033875 -27.943864,86.037558 C -27.889022,86.037684 0.84900065,86.034373 1.4612656,86.031797 C 4.0458711,86.020920 4.6790717,84.446994 4.8490952,82.727315 C 4.8627317,82.693406 6.6030230,57.954668 6.6166586,57.920760 C -6.4927658,57.920760 -19.602191,57.920760 -32.711617,57.920760 z "
+       style="fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0232029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M -32.711617,57.92076 C -32.75484,57.886386 -31.013657,82.649503 -31.013161,82.657012 C -30.849819,85.130028 -29.478625,86.033875 -27.943864,86.037558 C -27.889022,86.037684 0.84900065,86.034373 1.4612656,86.031797 C 4.0458711,86.02092 4.6790717,84.446994 4.8490952,82.727315 C 4.8627317,82.693406 6.603023,57.954668 6.6166586,57.92076 C -6.4927658,57.92076 -19.602191,57.92076 -32.711617,57.92076 z "
        id="path1751"
        sodipodi:nodetypes="ccccccc" />
     <path
-       style="fill:url(#linearGradient1872);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0232029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -29.082499,46.078313 C -30.106321,46.080636 -30.963179,46.104146 -31.429903,47.071988 C -31.511024,47.240207 -33.983709,54.067523 -34.102588,54.327887 C -35.120311,56.556852 -34.181763,59.364644 -32.216058,59.345847 C -31.842230,59.342386 6.5184540,59.363255 7.1133033,59.345847 C 8.7866141,59.297731 9.0007434,56.046339 8.2803939,54.583688 C 8.2395836,54.500824 4.8963639,46.978946 4.8110968,46.845716 C 4.4167208,46.250708 3.5335502,45.989940 2.8775216,46.014363 C 2.7482894,46.019294 -28.954598,46.078025 -29.082499,46.078313 z "
+       style="fill:url(#linearGradient1872);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0232029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M -29.082499,46.078313 C -30.106321,46.080636 -30.963179,46.104146 -31.429903,47.071988 C -31.511024,47.240207 -33.983709,54.067523 -34.102588,54.327887 C -35.120311,56.556852 -34.181763,59.364644 -32.216058,59.345847 C -31.84223,59.342386 6.518454,59.363255 7.1133033,59.345847 C 8.7866141,59.297731 9.0007434,56.046339 8.2803939,54.583688 C 8.2395836,54.500824 4.8963639,46.978946 4.8110968,46.845716 C 4.4167208,46.250708 3.5335502,45.98994 2.8775216,46.014363 C 2.7482894,46.019294 -28.954598,46.078025 -29.082499,46.078313 z "
        id="path1841"
        sodipodi:nodetypes="cssssscss" />
     <path
-       style="opacity:0.51256281;fill:url(#linearGradient1851);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M -32.182886,59.783811 L -30.328331,59.783811 L -28.921427,82.260747 C -28.638980,83.587714 -28.068757,84.882705 -26.875021,85.282393 C -28.921427,85.372989 -30.216418,84.856059 -30.456231,82.756361 L -32.182886,59.783811 z "
+       style="opacity:0.51256283;fill:url(#linearGradient1851);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M -32.182886,59.783811 L -30.328331,59.783811 L -28.921427,82.260747 C -28.63898,83.587714 -28.068757,84.882705 -26.875021,85.282393 C -28.921427,85.372989 -30.216418,84.856059 -30.456231,82.756361 L -32.182886,59.783811 z "
        id="path1847"
        sodipodi:nodetypes="cccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient1865);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block"
-       d="M -28.904114,47.705157 C -29.869702,47.692675 -29.932579,47.655347 -30.149937,48.338662 C -30.200113,48.496399 -32.221643,54.706499 -32.300884,54.947484 C -32.570366,55.767024 -32.189294,55.983311 -31.254099,55.966651 C -30.922809,55.960749 5.3594230,55.966651 5.8868702,55.966651 C 6.6356452,55.966651 6.8577579,55.719989 6.6886176,55.137851 C 6.6198886,54.901303 3.8056452,48.270739 3.7300723,48.152656 C 3.3805322,47.625295 3.4411517,47.626830 2.8306245,47.619395 C 2.7160102,47.617999 -28.790763,47.706622 -28.904114,47.705157 z "
+       style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       d="M -28.904114,47.705157 C -29.869702,47.692675 -29.932579,47.655347 -30.149937,48.338662 C -30.200113,48.496399 -32.221643,54.706499 -32.300884,54.947484 C -32.570366,55.767024 -32.189294,55.983311 -31.254099,55.966651 C -30.922809,55.960749 5.359423,55.966651 5.8868702,55.966651 C 6.6356452,55.966651 6.8577579,55.719989 6.6886176,55.137851 C 6.6198886,54.901303 3.8056452,48.270739 3.7300723,48.152656 C 3.3805322,47.625295 3.4411517,47.62683 2.8306245,47.619395 C 2.7160102,47.617999 -28.790763,47.706622 -28.904114,47.705157 z "
        id="path1864"
        sodipodi:nodetypes="cssssscss" />
     <path
-       style="fill:url(#linearGradient1874);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       d="M 6.1041854,59.783811 L 4.3819859,59.783811 L 3.0754893,83.139597 C 3.0167754,84.195130 2.2145270,84.566107 1.0652660,84.526180 C 0.67478857,84.512614 -10.486625,85.289778 -26.979631,85.712086 C -13.097423,85.663733 0.54021160,85.648839 1.1363557,85.640996 C 2.9372791,85.617303 4.2037383,84.839825 4.3941236,83.008330 L 6.1041854,59.783811 z "
+       style="fill:url(#linearGradient1874);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6.1041854,59.783811 L 4.3819859,59.783811 L 3.0754893,83.139597 C 3.0167754,84.19513 2.214527,84.566107 1.065266,84.52618 C 0.67478857,84.512614 -10.486625,85.289778 -26.979631,85.712086 C -13.097423,85.663733 0.5402116,85.648839 1.1363557,85.640996 C 2.9372791,85.617303 4.2037383,84.839825 4.3941236,83.00833 L 6.1041854,59.783811 z "
        id="path1873"
        sodipodi:nodetypes="cccscscc" />
     <path
-       style="color:#000000;fill:url(#linearGradient1884);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block"
-       d="M -29.422740,47.702148 C -29.786334,47.729905 -29.961217,47.837636 -30.113402,48.316070 C -30.163578,48.473807 -32.182887,54.674744 -32.262128,54.915728 C -32.531611,55.735265 -32.174120,55.955589 -31.238926,55.938931 C -31.222726,55.938645 -29.323942,55.939169 -29.144207,55.938931 L -29.422740,47.702148 z "
+       style="color:#000000;fill:#132c52;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       d="M -29.42274,47.702148 C -29.786334,47.729905 -29.961217,47.837636 -30.113402,48.31607 C -30.163578,48.473807 -32.182887,54.674744 -32.262128,54.915728 C -32.531611,55.735265 -32.17412,55.955589 -31.238926,55.938931 C -31.222726,55.938645 -29.323942,55.939169 -29.144207,55.938931 L -29.42274,47.702148 z "
        id="path1880"
        sodipodi:nodetypes="cccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient1889);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block"
-       d="M 2.8823282,47.616780 C 3.3242332,47.620556 3.4540015,47.611701 3.7365037,48.145711 C 3.7751374,48.218740 6.5544700,54.805511 6.6542609,55.046495 C 6.9936352,55.975004 6.3472779,55.955589 5.3221031,55.982521 C 5.1273467,55.982234 2.8232902,55.960963 2.5969422,55.960725 L 2.8823282,47.616780 z "
+       style="color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       d="M 2.8823282,47.61678 C 3.3242332,47.620556 3.4540015,47.611701 3.7365037,48.145711 C 3.7751374,48.21874 6.55447,54.805511 6.6542609,55.046495 C 6.9936352,55.975004 6.3472779,55.955589 5.3221031,55.982521 C 5.1273467,55.982234 2.8232902,55.960963 2.5969422,55.960725 L 2.8823282,47.61678 z "
        id="path1888"
        sodipodi:nodetypes="cscccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient1894);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:0.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block"
-       d="M 5.8674719,59.783199 L -29.241178,59.847150 C -2.6592192,60.465334 2.5633795,63.385727 5.8035217,63.236509 L 5.8674719,59.783199 z "
+       style="color:#000000;fill:url(#linearGradient1894);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       d="M 5.8674719,59.783199 L -29.241178,59.84715 C -2.6592192,60.465334 2.5633795,63.385727 5.8035217,63.236509 L 5.8674719,59.783199 z "
        id="path1893"
        sodipodi:nodetypes="cccc" />
   </g>
diff --git a/scalable/stock/generic/stock_person.svg b/scalable/stock/generic/stock_person.svg
index 0a8cf2ec4..c3fbadede 100644
--- a/scalable/stock/generic/stock_person.svg
+++ b/scalable/stock/generic/stock_person.svg
@@ -15,7 +15,10 @@
    sodipodi:version="0.32"
    inkscape:version="0.43+devel"
    sodipodi:docbase="/home/jimmac/src/cvs/gnome/gnome-icon-theme/scalable/stock/generic"
-   sodipodi:docname="stock_person.svg">
+   sodipodi:docname="stock_person.svg"
+   inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-icon-theme/48x48/stock/generic/stock_person.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
      id="defs3">
     <linearGradient
@@ -413,8 +416,8 @@
      stroke="#727e0a"
      inkscape:window-width="872"
      inkscape:window-height="815"
-     inkscape:window-x="2139"
-     inkscape:window-y="152" />
+     inkscape:window-x="2420"
+     inkscape:window-y="156" />
   <metadata
      id="metadata4">
     <rdf:RDF>