diff --git a/ChangeLog b/ChangeLog
index 3f8ea2f9b2..65e6cb7af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/stock-icons/*: Make sure all svg icons are added
+	as pngs.
+
 2007-05-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* modules/input/Makefile.am: Fix broken DESTDIR support
diff --git a/gtk/stock-icons/16/gtk-clear.png b/gtk/stock-icons/16/gtk-clear.png
new file mode 100644
index 0000000000..49ae8db9c8
Binary files /dev/null and b/gtk/stock-icons/16/gtk-clear.png differ
diff --git a/gtk/stock-icons/16/gtk-color-picker.png b/gtk/stock-icons/16/gtk-color-picker.png
new file mode 100644
index 0000000000..24233cde02
Binary files /dev/null and b/gtk/stock-icons/16/gtk-color-picker.png differ
diff --git a/gtk/stock-icons/16/gtk-orientation-landscape.png b/gtk/stock-icons/16/gtk-orientation-landscape.png
new file mode 100644
index 0000000000..5b3081572f
Binary files /dev/null and b/gtk/stock-icons/16/gtk-orientation-landscape.png differ
diff --git a/gtk/stock-icons/16/gtk-orientation-portrait.png b/gtk/stock-icons/16/gtk-orientation-portrait.png
new file mode 100644
index 0000000000..94f078d91b
Binary files /dev/null and b/gtk/stock-icons/16/gtk-orientation-portrait.png differ
diff --git a/gtk/stock-icons/16/gtk-orientation-reverse-landscape.png b/gtk/stock-icons/16/gtk-orientation-reverse-landscape.png
new file mode 100644
index 0000000000..550e34756b
Binary files /dev/null and b/gtk/stock-icons/16/gtk-orientation-reverse-landscape.png differ
diff --git a/gtk/stock-icons/16/gtk-orientation-reverse-portrait.png b/gtk/stock-icons/16/gtk-orientation-reverse-portrait.png
new file mode 100644
index 0000000000..c79cea3559
Binary files /dev/null and b/gtk/stock-icons/16/gtk-orientation-reverse-portrait.png differ
diff --git a/gtk/stock-icons/16/gtk-stop-16.svg b/gtk/stock-icons/16/gtk-stop-16.svg
deleted file mode 100644
index 8ef846e908..0000000000
--- a/gtk/stock-icons/16/gtk-stop-16.svg
+++ /dev/null
@@ -1,148 +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://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop"
-   sodipodi:docname="gtk-stop-16.svg"
-   inkscape:export-filename="/home/hbons/Desktop/process-stop.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7810">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop7812" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop7814" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5111">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop5113" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop5115" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient30505">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop30507" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop30509" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30505"
-       id="radialGradient30511"
-       cx="25.375"
-       cy="47.350433"
-       fx="25.375"
-       fy="47.350433"
-       r="17.125"
-       gradientTransform="matrix(1,0,0,0.343066,0,28.49453)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5111"
-       id="linearGradient5117"
-       x1="11.018858"
-       y1="5.1061416"
-       x2="11.018858"
-       y2="14.598754"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7810"
-       id="linearGradient7816"
-       x1="12.272322"
-       y1="0.43931913"
-       x2="12.272322"
-       y2="17.85289"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="18.419485"
-     inkscape:cy="8.7407789"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="16px"
-     height="16px"
-     showgrid="true"
-     inkscape:window-width="1274"
-     inkscape:window-height="972"
-     inkscape:window-x="6"
-     inkscape:window-y="25" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#ef4e29;fill-opacity:1;stroke:#a02b00;stroke-width:1.26666594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 7.5,2.5 L 2.5,7.5 L 2.5,16.5 L 7.5,21.5 L 16.5,21.5 L 21.5,16.5 L 21.5,7.5 L 16.5,2.5 L 7.5,2.5 z "
-       id="rect6915"
-       sodipodi:nodetypes="ccccccccc"
-       transform="matrix(0.789474,0,0,0.789474,-1.473694,-1.473684)" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0267857"
-       inkscape:original="M 7.5 2.5 L 2.5 7.5 L 2.5 16.5 L 7.5 21.5 L 16.5 21.5 L 21.5 16.5 L 21.5 7.5 L 16.5 2.5 L 7.5 2.5 z "
-       style="opacity:0.4;fill:url(#linearGradient7816);fill-opacity:1;stroke:#eeeeec;stroke-width:1.30288398;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path7808"
-       d="M 7.90625,3.53125 L 3.53125,7.90625 L 3.53125,16.09375 L 7.90625,20.46875 L 16.09375,20.46875 L 20.46875,16.09375 L 20.46875,7.90625 L 16.09375,3.53125 L 7.90625,3.53125 z "
-       transform="matrix(0.767527,0,0,0.767528,-1.210331,-1.210334)" />
-    <path
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#c00;stroke-width:1.26025271;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10.5,5.5 L 10.5,10.5 L 5.5,10.5 L 5.5,13.5 L 10.5,13.5 L 10.5,18.5 L 13.5,18.5 L 13.5,13.5 L 18.5,13.5 L 18.5,10.5 L 13.5,10.5 L 13.5,5.5 L 10.5,5.5 z "
-       id="rect5279"
-       transform="matrix(0.560901,0.561266,-0.560901,0.561266,8.035698,-5.42976)" />
-  </g>
-</svg>