From: Luca Ferretti <elle.uca@libero.it>
Date: Fri, 19 Jan 2007 13:52:45 +0000 (+0000)
Subject: Move Evince icons under new apps directory.
X-Git-Tag: EVINCE_0_7_2~86
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=04a2ebaeef464d826a6e7bdfa37ab66f792f6991;p=evince.git

Move Evince icons under new apps directory.

2007-01-19  Luca Ferretti  <elle.uca@libero.it>

	* data/icons/*/apps/evince.*:

	Move Evince icons under new apps directory.

	* data/icons/*/actions/*:

	Add new custom themeable Evince icons: view-page-continuous,
	view-page-facing, zoom-fit-width, zoom-fit-page. From Andreas
	Nilsson, at 16 and 22 pixels (plus 24 for compatibility).

	* configure.ac:

	Add new directories to AC_CONFIG_FILES.

	* shell/ev-stock-icons.c:
	* shell/ev-stock-icons.h:

	Use new custom themeable icons.


svn path=/trunk/; revision=2235
---

diff --git a/ChangeLog b/ChangeLog
index 002c202f..ffed9d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2007-01-19  Luca Ferretti  <elle.uca@libero.it>
+
+	* data/icons/*/apps/evince.*:
+
+	Move Evince icons under new apps directory.
+
+	* data/icons/*/actions/*:
+
+	Add new custom themeable Evince icons: view-page-continuous, 
+	view-page-facing, zoom-fit-width, zoom-fit-page. From Andreas
+	Nilsson, at 16 and 22 pixels (plus 24 for compatibility).
+
+	* configure.ac:
+
+	Add new directories to AC_CONFIG_FILES.
+
+	* shell/ev-stock-icons.c:
+	* shell/ev-stock-icons.h:
+
+	Use new custom themeable icons.
+
 2007-01-18  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/ev-view.c: (ev_view_expose_event), (draw_one_page):
diff --git a/configure.ac b/configure.ac
index 3693fd38..8fd84246 100644
--- a/configure.ac
+++ b/configure.ac
@@ -421,13 +421,21 @@ cut-n-paste/toolbar-editor/Makefile
 cut-n-paste/zoom-control/Makefile
 cut-n-paste/totem-screensaver/Makefile
 data/evince.desktop.in
+data/Makefile
+data/icons/Makefile
 data/icons/16x16/Makefile
+data/icons/16x16/apps/Makefile
+data/icons/16x16/actions/Makefile
 data/icons/22x22/Makefile
+data/icons/22x22/apps/Makefile
+data/icons/22x22/actions/Makefile
 data/icons/24x24/Makefile
+data/icons/24x24/apps/Makefile
+data/icons/24x24/action/Makefile
 data/icons/48x48/Makefile
-data/icons/Makefile
+data/icons/48x48/apps/Makefile
 data/icons/scalable/Makefile
-data/Makefile
+data/icons/scalable/apps/Makefile
 help/Makefile
 libdocument/Makefile
 Makefile
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index eda65ba8..063f6935 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = evince.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = actions apps
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
new file mode 100644
index 00000000..f63776cf
--- /dev/null
+++ b/data/icons/16x16/actions/Makefile.am
@@ -0,0 +1,21 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 16x16
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	view-page-continuous.png	\
+	view-page-facing.png		\
+	zoom-fit-page.png		\
+	zoom-fit-width.png
+
+noinst_DATA = \
+	view-page-continuous.xcf	\
+	view-page-facing.xcf		\
+	zoom-fit-page.svg		\
+	zoom-fit-width.svg
+
+EXTRA_DIST = \
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/16x16/actions/view-page-continuous.png b/data/icons/16x16/actions/view-page-continuous.png
new file mode 100644
index 00000000..fc583098
Binary files /dev/null and b/data/icons/16x16/actions/view-page-continuous.png differ
diff --git a/data/icons/16x16/actions/view-page-continuous.xcf b/data/icons/16x16/actions/view-page-continuous.xcf
new file mode 100644
index 00000000..1a1b36c1
Binary files /dev/null and b/data/icons/16x16/actions/view-page-continuous.xcf differ
diff --git a/data/icons/16x16/actions/view-page-facing.png b/data/icons/16x16/actions/view-page-facing.png
new file mode 100644
index 00000000..078b4c9e
Binary files /dev/null and b/data/icons/16x16/actions/view-page-facing.png differ
diff --git a/data/icons/16x16/actions/view-page-facing.xcf b/data/icons/16x16/actions/view-page-facing.xcf
new file mode 100644
index 00000000..cfe5f232
Binary files /dev/null and b/data/icons/16x16/actions/view-page-facing.xcf differ
diff --git a/data/icons/16x16/actions/zoom-fit-page.png b/data/icons/16x16/actions/zoom-fit-page.png
new file mode 100644
index 00000000..05a6186e
Binary files /dev/null and b/data/icons/16x16/actions/zoom-fit-page.png differ
diff --git a/data/icons/16x16/actions/zoom-fit-page.svg b/data/icons/16x16/actions/zoom-fit-page.svg
new file mode 100644
index 00000000..d6bf4aea
--- /dev/null
+++ b/data/icons/16x16/actions/zoom-fit-page.svg
@@ -0,0 +1,282 @@
+<?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="svg4639"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   sodipodi:docbase="/home/luca/Desktop/16x16/actions"
+   sodipodi:docname="zoom-fit-page.svg"
+   version="1.0">
+  <defs
+     id="defs4641">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2889">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2891" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop2893" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2881">
+      <stop
+         style="stop-color:white;stop-opacity:1"
+         offset="0"
+         id="stop2883" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1"
+         id="stop2885" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2853">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2855" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2857" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5631">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5633" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop5635" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8163">
+      <stop
+         style="stop-color:#bad0e8;stop-opacity:1;"
+         offset="0"
+         id="stop8165" />
+      <stop
+         style="stop-color:#7fa9d5;stop-opacity:1"
+         offset="1"
+         id="stop8167" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8163"
+       id="radialGradient4666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.941673,0,0,0.792865,0.946634,3.041907)"
+       cx="5.9125323"
+       cy="9.0931339"
+       fx="5.9125323"
+       fy="9.0931339"
+       r="6.6046906" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5631"
+       id="linearGradient5637"
+       x1="7.5"
+       y1="8.8833847"
+       x2="7.5"
+       y2="-0.79768431"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2853"
+       id="radialGradient2861"
+       cx="4.9147677"
+       cy="5.1328478"
+       fx="4.9147677"
+       fy="5.1328478"
+       r="5"
+       gradientTransform="matrix(1.925041,0,1.17341e-7,1.382998,-4.336128,-1.661216)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2881"
+       id="linearGradient2887"
+       x1="2.8480079"
+       y1="1.379131"
+       x2="7.0234137"
+       y2="10.952174"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2889"
+       id="linearGradient2895"
+       x1="7.4401245"
+       y1="0.79882336"
+       x2="10.728523"
+       y2="13.712273"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.524656"
+     inkscape:cy="11.367931"
+     inkscape:current-layer="layer8"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showborder="false"
+     inkscape:grid-points="true"
+     inkscape:window-width="1041"
+     inkscape:window-height="710"
+     inkscape:window-x="26"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata4644">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Andreas Nillson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:title>Zoom</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="magnifying lens"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <rect
+       y="-0.1077"
+       x="9.9999997e-05"
+       height="16"
+       width="16"
+       id="rect4613"
+       style="fill:white;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="matrix(0.707107,-0.707107,0.707107,0.707107,0,0)"
+       y="14.201591"
+       x="-0.97432232"
+       height="3.0000219"
+       width="1.9875129"
+       id="rect4615"
+       style="fill:#525655;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="matrix(0.708405,-0.705806,0.708405,0.705806,0,0)"
+       ry="1.4539403"
+       rx="1.3503115"
+       y="16.878378"
+       x="-1.4629019"
+       height="4.4376249"
+       width="2.8660307"
+       id="rect4617"
+       style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:1.00001717;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path4619"
+       d="M 11.128133,11.108613 L 14.215547,14.196027"
+       style="fill:none;fill-rule:evenodd;stroke:#525655;stroke-width:1.0000006px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       transform="matrix(1.088272,0,0,1.200299,-8.933437e-2,0.259922)"
+       d="M 12.487086 5.6153316 A 5.9727769 5.415318 0 1 1  0.54153204,5.6153316 A 5.9727769 5.415318 0 1 1  12.487086 5.6153316 z"
+       sodipodi:ry="5.415318"
+       sodipodi:rx="5.9727769"
+       sodipodi:cy="5.6153316"
+       sodipodi:cx="6.5143089"
+       id="path4621"
+       style="fill:white;fill-opacity:0;stroke:url(#linearGradient2895);stroke-width:0.96245235;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.920843,0,0,1.015635,1.001354,1.29686)"
+       d="M 12.487086 5.6153316 A 5.9727769 5.415318 0 1 1  0.54153204,5.6153316 A 5.9727769 5.415318 0 1 1  12.487086 5.6153316 z"
+       sodipodi:ry="5.415318"
+       sodipodi:rx="5.9727769"
+       sodipodi:cy="5.6153316"
+       sodipodi:cx="6.5143089"
+       id="path4623"
+       style="opacity:1;fill:url(#radialGradient4666);fill-opacity:1;stroke:url(#linearGradient2887);stroke-width:1.03404319;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       style="opacity:1;fill:#999;fill-opacity:1;stroke:none;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1928"
+       width="1"
+       height="1"
+       x="12"
+       y="12" />
+    <path
+       style="opacity:0.5;fill:url(#radialGradient2861);fill-opacity:1;stroke:none;stroke-width:1.03404319;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 7,2 C 4.2399952,2 2.0000001,4.2399964 2,7 C 3,10.521525 8,3.5447287 12,7 C 12,4.2399964 9.7600047,2 7,2 z "
+       id="path2847" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="pagewidth"
+     style="display:inline">
+    <g
+       id="g4561"
+       transform="matrix(0,1,-1,0,14,0)">
+      <g
+         style="opacity:0.8"
+         id="g5768">
+        <path
+           style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 5,4 L 2,7 L 5,10 L 5,4 z M 9,4 L 9,10 L 12,7 L 9,4 z "
+           id="path5760" />
+        <rect
+           style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="rect5752"
+           width="4"
+           height="4"
+           x="5"
+           y="5"
+           rx="0"
+           ry="0" />
+      </g>
+      <rect
+         ry="0"
+         rx="0"
+         y="6"
+         x="4"
+         height="2"
+         width="6"
+         id="rect5754"
+         style="fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+      <path
+         id="path5756"
+         d="M 5,4 L 2,7 L 5,10 L 5,4"
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path5758"
+         d="M 9,4 L 12,7 L 9,10 L 9,4"
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/16x16/actions/zoom-fit-width.png b/data/icons/16x16/actions/zoom-fit-width.png
new file mode 100644
index 00000000..1c495cab
Binary files /dev/null and b/data/icons/16x16/actions/zoom-fit-width.png differ
diff --git a/data/icons/16x16/actions/zoom-fit-width.svg b/data/icons/16x16/actions/zoom-fit-width.svg
new file mode 100644
index 00000000..86dcf876
--- /dev/null
+++ b/data/icons/16x16/actions/zoom-fit-width.svg
@@ -0,0 +1,278 @@
+<?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="svg4639"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   sodipodi:docbase="/home/lapo/Desktop/zoom"
+   sodipodi:docname="zoom-fit-width.svg"
+   version="1.0">
+  <defs
+     id="defs4641">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2889">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2891" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop2893" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2881">
+      <stop
+         style="stop-color:white;stop-opacity:1"
+         offset="0"
+         id="stop2883" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1"
+         id="stop2885" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2853">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2855" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2857" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5631">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5633" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop5635" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8163">
+      <stop
+         style="stop-color:#bad0e8;stop-opacity:1;"
+         offset="0"
+         id="stop8165" />
+      <stop
+         style="stop-color:#7fa9d5;stop-opacity:1"
+         offset="1"
+         id="stop8167" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8163"
+       id="radialGradient4666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.941673,0,0,0.792865,0.946634,3.041907)"
+       cx="5.9125323"
+       cy="9.0931339"
+       fx="5.9125323"
+       fy="9.0931339"
+       r="6.6046906" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5631"
+       id="linearGradient5637"
+       x1="7.5"
+       y1="8.8833847"
+       x2="7.5"
+       y2="-0.79768431"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2853"
+       id="radialGradient2861"
+       cx="4.9147677"
+       cy="5.1328478"
+       fx="4.9147677"
+       fy="5.1328478"
+       r="5"
+       gradientTransform="matrix(1.925041,0,1.17341e-7,1.382998,-4.336128,-1.661216)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2881"
+       id="linearGradient2887"
+       x1="2.8480079"
+       y1="1.379131"
+       x2="7.0234137"
+       y2="10.952174"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2889"
+       id="linearGradient2895"
+       x1="7.4401245"
+       y1="0.79882336"
+       x2="10.728523"
+       y2="13.712273"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="14.680503"
+     inkscape:cy="2.2039917"
+     inkscape:current-layer="layer8"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showborder="false"
+     inkscape:grid-points="true"
+     inkscape:window-width="1034"
+     inkscape:window-height="710"
+     inkscape:window-x="26"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata4644">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Andreas Nillson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:title>Zoom</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="magnifying lens"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <rect
+       y="-0.1077"
+       x="9.9999997e-05"
+       height="16"
+       width="16"
+       id="rect4613"
+       style="fill:white;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="matrix(0.707107,-0.707107,0.707107,0.707107,0,0)"
+       y="14.201591"
+       x="-0.97432232"
+       height="3.0000219"
+       width="1.9875129"
+       id="rect4615"
+       style="fill:#525655;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="matrix(0.708405,-0.705806,0.708405,0.705806,0,0)"
+       ry="1.4539403"
+       rx="1.3503115"
+       y="16.878378"
+       x="-1.4629019"
+       height="4.4376249"
+       width="2.8660307"
+       id="rect4617"
+       style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:1.00001717;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path4619"
+       d="M 11.128133,11.108613 L 14.215547,14.196027"
+       style="fill:none;fill-rule:evenodd;stroke:#525655;stroke-width:1.0000006px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       transform="matrix(1.088272,0,0,1.200299,-8.933437e-2,0.259922)"
+       d="M 12.487086 5.6153316 A 5.9727769 5.415318 0 1 1  0.54153204,5.6153316 A 5.9727769 5.415318 0 1 1  12.487086 5.6153316 z"
+       sodipodi:ry="5.415318"
+       sodipodi:rx="5.9727769"
+       sodipodi:cy="5.6153316"
+       sodipodi:cx="6.5143089"
+       id="path4621"
+       style="fill:white;fill-opacity:0;stroke:url(#linearGradient2895);stroke-width:0.96245235;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.920843,0,0,1.015635,1.001354,1.29686)"
+       d="M 12.487086 5.6153316 A 5.9727769 5.415318 0 1 1  0.54153204,5.6153316 A 5.9727769 5.415318 0 1 1  12.487086 5.6153316 z"
+       sodipodi:ry="5.415318"
+       sodipodi:rx="5.9727769"
+       sodipodi:cy="5.6153316"
+       sodipodi:cx="6.5143089"
+       id="path4623"
+       style="opacity:1;fill:url(#radialGradient4666);fill-opacity:1;stroke:url(#linearGradient2887);stroke-width:1.03404319;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       style="opacity:1;fill:#999;fill-opacity:1;stroke:none;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1928"
+       width="1"
+       height="1"
+       x="12"
+       y="12" />
+    <path
+       style="opacity:0.5;fill:url(#radialGradient2861);fill-opacity:1;stroke:none;stroke-width:1.03404319;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 7,2 C 4.2399952,2 2.0000001,4.2399964 2,7 C 3,10.521525 8,3.5447287 12,7 C 12,4.2399964 9.7600047,2 7,2 z "
+       id="path2847" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="pagewidth"
+     style="display:inline">
+    <g
+       id="g5768"
+       style="opacity:0.8">
+      <path
+         id="path5760"
+         d="M 5,4 L 2,7 L 5,10 L 5,4 z M 9,4 L 9,10 L 12,7 L 9,4 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <rect
+         ry="0"
+         rx="0"
+         y="5"
+         x="5"
+         height="4"
+         width="4"
+         id="rect5752"
+         style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+    </g>
+    <rect
+       style="fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="rect5754"
+       width="6"
+       height="2"
+       x="4"
+       y="6"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,4 L 2,7 L 5,10 L 5,4"
+       id="path5756" />
+    <path
+       style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       d="M 9,4 L 12,7 L 9,10 L 9,4"
+       id="path5758" />
+  </g>
+</svg>
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
new file mode 100644
index 00000000..875cb2ac
--- /dev/null
+++ b/data/icons/16x16/apps/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 16x16
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	evince.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/16x16/evince.png b/data/icons/16x16/apps/evince.png
similarity index 100%
rename from data/icons/16x16/evince.png
rename to data/icons/16x16/apps/evince.png
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 78fbd7ef..063f6935 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = evince.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = actions apps
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
new file mode 100644
index 00000000..d2b21b2e
--- /dev/null
+++ b/data/icons/22x22/actions/Makefile.am
@@ -0,0 +1,21 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 22x22
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	view-page-continuous.png	\
+	view-page-facing.png		\
+	zoom-fit-page.png		\
+	zoom-fit-width.png
+
+noinst_DATA = \
+	view-page-continuous.xcf	\
+	view-page-facing.xcf		\
+	zoom-fit-page.svg		\
+	zoom-fit-width.svg
+
+EXTRA_DIST = \
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/22x22/actions/view-page-continious.png b/data/icons/22x22/actions/view-page-continious.png
new file mode 100644
index 00000000..7f74603b
Binary files /dev/null and b/data/icons/22x22/actions/view-page-continious.png differ
diff --git a/data/icons/22x22/actions/view-page-continuous.xcf b/data/icons/22x22/actions/view-page-continuous.xcf
new file mode 100644
index 00000000..cf3ee516
Binary files /dev/null and b/data/icons/22x22/actions/view-page-continuous.xcf differ
diff --git a/data/icons/22x22/actions/view-page-facing.png b/data/icons/22x22/actions/view-page-facing.png
new file mode 100644
index 00000000..8158ae31
Binary files /dev/null and b/data/icons/22x22/actions/view-page-facing.png differ
diff --git a/data/icons/22x22/actions/view-page-facing.xcf b/data/icons/22x22/actions/view-page-facing.xcf
new file mode 100644
index 00000000..1a4942c8
Binary files /dev/null and b/data/icons/22x22/actions/view-page-facing.xcf differ
diff --git a/data/icons/22x22/actions/zoom-fit-page.png b/data/icons/22x22/actions/zoom-fit-page.png
new file mode 100644
index 00000000..a074b422
Binary files /dev/null and b/data/icons/22x22/actions/zoom-fit-page.png differ
diff --git a/data/icons/22x22/actions/zoom-fit-page.svg b/data/icons/22x22/actions/zoom-fit-page.svg
new file mode 100644
index 00000000..0ac072a1
--- /dev/null
+++ b/data/icons/22x22/actions/zoom-fit-page.svg
@@ -0,0 +1,254 @@
+<?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="22"
+   height="22"
+   id="svg7360"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   version="1.0"
+   sodipodi:docbase="/home/luca/Desktop/22x22/actions"
+   sodipodi:docname="zoom-fit-page.svg"
+   inkscape:export-filename="/home/andreas/project/misc icons/22x22/actions/zoom-fit-width.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs7362">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5398">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop5400" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:0;"
+         offset="1"
+         id="stop5402" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5398"
+       id="linearGradient7413"
+       gradientUnits="userSpaceOnUse"
+       x1="-1.650571"
+       y1="229.18515"
+       x2="6.1053252"
+       y2="250.19063" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7659">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop7661" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop7663" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7659"
+       id="radialGradient7411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.973425,0,0,0.24,0.401944,173.945)"
+       cx="15.125"
+       cy="229.39583"
+       fx="15.125"
+       fy="229.39583"
+       r="9.375" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5388">
+      <stop
+         style="stop-color:#bcd2e9;stop-opacity:1"
+         offset="0"
+         id="stop5390" />
+      <stop
+         style="stop-color:#93b6db;stop-opacity:1"
+         offset="1"
+         id="stop5392" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5388"
+       id="radialGradient7409"
+       gradientUnits="userSpaceOnUse"
+       cx="2.96875"
+       cy="240.416"
+       fx="2.96875"
+       fy="240.416"
+       r="8.96875" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7629">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop7631" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop7633" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7629"
+       id="linearGradient7407"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(235.4321,-644.2117)"
+       x1="-164.73708"
+       y1="182.09869"
+       x2="-162.92517"
+       y2="182.10544" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.672167"
+     inkscape:cx="14.098689"
+     inkscape:cy="13.127552"
+     inkscape:current-layer="draw_zoom"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="22px"
+     height="22px"
+     inkscape:window-width="1270"
+     inkscape:window-height="922"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata7365">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g7387"
+       transform="translate(-1,-1)">
+      <g
+         inkscape:label="#g18331"
+         transform="translate(295.0516,397.0022)"
+         id="draw_zoom">
+        <rect
+           transform="matrix(0.707107,-0.707107,0.707107,0.707107,0,0)"
+           ry="1.4928225"
+           rx="1.4928225"
+           y="-467.01642"
+           x="70.877777"
+           height="9.0625086"
+           width="2.5000021"
+           id="rect18273"
+           style="fill:url(#linearGradient7407);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.00000107;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           transform="matrix(1.003826,0,0,1,-288.0306,-622.4396)"
+           d="M 11.4375 235.40625 A 8.46875 8.46875 0 1 1  -5.5,235.40625 A 8.46875 8.46875 0 1 1  11.4375 235.40625 z"
+           sodipodi:ry="8.46875"
+           sodipodi:rx="8.46875"
+           sodipodi:cy="235.40625"
+           sodipodi:cx="2.96875"
+           id="path18275"
+           style="fill:url(#radialGradient7409);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99809253;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:nodetypes="czccc"
+           id="path18277"
+           d="M -292.15418,-386.77986 C -292.15418,-386.77986 -288.74097,-385.87708 -284.98838,-385.87708 C -281.2922,-385.87708 -277.82258,-387.68264 -277.82258,-387.68264 C -277.82258,-387.68264 -278.8839,-394.00208 -284.98838,-394.00208 C -291.88279,-393.88923 -292.15418,-386.77986 -292.15418,-386.77986 z "
+           style="opacity:0.2857143;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           transform="matrix(0.885609,0,0,0.885612,-287.6784,-595.4806)"
+           d="M 11.4375 235.40625 A 8.46875 8.46875 0 1 1  -5.5,235.40625 A 8.46875 8.46875 0 1 1  11.4375 235.40625 z"
+           sodipodi:ry="8.46875"
+           sodipodi:rx="8.46875"
+           sodipodi:cy="235.40625"
+           sodipodi:cx="2.96875"
+           id="path18279"
+           style="opacity:0.8;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:white;stroke-width:1.12916505;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(1.119412,0,0,1.555533,-300.897,-733.5249)"
+           d="M 24.875 228.875 A 9.375 2.25 0 1 1  6.125,228.875 A 9.375 2.25 0 1 1  24.875 228.875 z"
+           sodipodi:ry="2.25"
+           sodipodi:rx="9.375"
+           sodipodi:cy="228.875"
+           sodipodi:cx="15.5"
+           id="path18281"
+           style="opacity:0.2;fill:url(#radialGradient7411);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:0.6;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7413);stroke-width:1.2950778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path5396"
+           sodipodi:cx="2.96875"
+           sodipodi:cy="235.40625"
+           sodipodi:rx="8.46875"
+           sodipodi:ry="8.46875"
+           d="M 11.4375 235.40625 A 8.46875 8.46875 0 1 1  -5.5,235.40625 A 8.46875 8.46875 0 1 1  11.4375 235.40625 z"
+           transform="matrix(0.770704,0,0,0.773608,-287.3127,-569.1141)" />
+        <g
+           id="g4556"
+           transform="matrix(0,1,-1,0,-671.8038,-101.7006)">
+          <g
+             transform="matrix(1.043478,0,0,1,-292.3559,-393.7522)"
+             style="opacity:0.8;display:inline"
+             id="g5768">
+            <path
+               sodipodi:nodetypes="cccccccc"
+               style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.46841753;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+               d="M 5.3328369,4 L 2,7 L 5.3328369,10 L 5.3328369,4 z M 8.697421,4 L 8.697421,10 L 12,7 L 8.697421,4 z "
+               id="path5760" />
+            <rect
+               style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+               id="rect5752"
+               width="4"
+               height="4"
+               x="5"
+               y="4.75"
+               rx="0"
+               ry="0" />
+          </g>
+          <rect
+             ry="0"
+             rx="0"
+             y="-388.0022"
+             x="-288.30161"
+             height="2"
+             width="6"
+             id="rect5754"
+             style="fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+          <path
+             id="path5756"
+             d="M -287.0516,-389.7522 L -290.0516,-386.7522 L -287.0516,-383.7522 L -287.0516,-389.7522"
+             style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+          <path
+             id="path5758"
+             d="M -283.0516,-389.7522 L -280.0516,-386.7522 L -283.0516,-383.7522 L -283.0516,-389.7522"
+             style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/22x22/actions/zoom-fit-width.png b/data/icons/22x22/actions/zoom-fit-width.png
new file mode 100644
index 00000000..f9fe77fd
Binary files /dev/null and b/data/icons/22x22/actions/zoom-fit-width.png differ
diff --git a/data/icons/22x22/actions/zoom-fit-width.svg b/data/icons/22x22/actions/zoom-fit-width.svg
new file mode 100644
index 00000000..d1498db5
--- /dev/null
+++ b/data/icons/22x22/actions/zoom-fit-width.svg
@@ -0,0 +1,252 @@
+<?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="22"
+   height="22"
+   id="svg7360"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   version="1.0"
+   sodipodi:docbase="/home/andreas/project/misc icons/22x22/actions"
+   sodipodi:docname="zoom-fit-width.svg"
+   inkscape:export-filename="/home/andreas/project/misc icons/22x22/actions/zoom-fit-width.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="TRUE">
+  <defs
+     id="defs7362">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5398">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop5400" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:0;"
+         offset="1"
+         id="stop5402" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5398"
+       id="linearGradient7413"
+       gradientUnits="userSpaceOnUse"
+       x1="-1.650571"
+       y1="229.18515"
+       x2="6.1053252"
+       y2="250.19063" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7659">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop7661" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop7663" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7659"
+       id="radialGradient7411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.973425,0,0,0.24,0.401944,173.945)"
+       cx="15.125"
+       cy="229.39583"
+       fx="15.125"
+       fy="229.39583"
+       r="9.375" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5388">
+      <stop
+         style="stop-color:#bcd2e9;stop-opacity:1"
+         offset="0"
+         id="stop5390" />
+      <stop
+         style="stop-color:#93b6db;stop-opacity:1"
+         offset="1"
+         id="stop5392" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5388"
+       id="radialGradient7409"
+       gradientUnits="userSpaceOnUse"
+       cx="2.96875"
+       cy="240.416"
+       fx="2.96875"
+       fy="240.416"
+       r="8.96875" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7629">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop7631" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop7633" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7629"
+       id="linearGradient7407"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(235.4321,-644.2117)"
+       x1="-164.73708"
+       y1="182.09869"
+       x2="-162.92517"
+       y2="182.10544" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.672167"
+     inkscape:cx="14.098689"
+     inkscape:cy="13.127552"
+     inkscape:current-layer="draw_zoom"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="22px"
+     height="22px"
+     inkscape:window-width="1680"
+     inkscape:window-height="975"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata7365">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g7387"
+       transform="translate(-1,-1)">
+      <g
+         inkscape:label="#g18331"
+         transform="translate(295.0516,397.0022)"
+         id="draw_zoom">
+        <rect
+           transform="matrix(0.707107,-0.707107,0.707107,0.707107,0,0)"
+           ry="1.4928225"
+           rx="1.4928225"
+           y="-467.01642"
+           x="70.877777"
+           height="9.0625086"
+           width="2.5000021"
+           id="rect18273"
+           style="fill:url(#linearGradient7407);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1.00000107;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           transform="matrix(1.003826,0,0,1,-288.0306,-622.4396)"
+           d="M 11.4375 235.40625 A 8.46875 8.46875 0 1 1  -5.5,235.40625 A 8.46875 8.46875 0 1 1  11.4375 235.40625 z"
+           sodipodi:ry="8.46875"
+           sodipodi:rx="8.46875"
+           sodipodi:cy="235.40625"
+           sodipodi:cx="2.96875"
+           id="path18275"
+           style="fill:url(#radialGradient7409);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99809253;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:nodetypes="czccc"
+           id="path18277"
+           d="M -292.15418,-386.77986 C -292.15418,-386.77986 -288.74097,-385.87708 -284.98838,-385.87708 C -281.2922,-385.87708 -277.82258,-387.68264 -277.82258,-387.68264 C -277.82258,-387.68264 -278.8839,-394.00208 -284.98838,-394.00208 C -291.88279,-393.88923 -292.15418,-386.77986 -292.15418,-386.77986 z "
+           style="opacity:0.2857143;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           transform="matrix(0.885609,0,0,0.885612,-287.6784,-595.4806)"
+           d="M 11.4375 235.40625 A 8.46875 8.46875 0 1 1  -5.5,235.40625 A 8.46875 8.46875 0 1 1  11.4375 235.40625 z"
+           sodipodi:ry="8.46875"
+           sodipodi:rx="8.46875"
+           sodipodi:cy="235.40625"
+           sodipodi:cx="2.96875"
+           id="path18279"
+           style="opacity:0.8;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:white;stroke-width:1.12916505;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(1.119412,0,0,1.555533,-300.897,-733.5249)"
+           d="M 24.875 228.875 A 9.375 2.25 0 1 1  6.125,228.875 A 9.375 2.25 0 1 1  24.875 228.875 z"
+           sodipodi:ry="2.25"
+           sodipodi:rx="9.375"
+           sodipodi:cy="228.875"
+           sodipodi:cx="15.5"
+           id="path18281"
+           style="opacity:0.2;fill:url(#radialGradient7411);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:0.6;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7413);stroke-width:1.2950778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path5396"
+           sodipodi:cx="2.96875"
+           sodipodi:cy="235.40625"
+           sodipodi:rx="8.46875"
+           sodipodi:ry="8.46875"
+           d="M 11.4375 235.40625 A 8.46875 8.46875 0 1 1  -5.5,235.40625 A 8.46875 8.46875 0 1 1  11.4375 235.40625 z"
+           transform="matrix(0.770704,0,0,0.773608,-287.3127,-569.1141)" />
+        <g
+           id="g5768"
+           style="opacity:0.8;display:inline"
+           transform="matrix(1.0434783,0,0,1,-292.35595,-393.7522)">
+          <path
+             id="path5760"
+             d="M 5.3328369,4 L 2,7 L 5.3328369,10 L 5.3328369,4 z M 8.697421,4 L 8.697421,10 L 12,7 L 8.697421,4 z "
+             style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.46841753;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             sodipodi:nodetypes="cccccccc" />
+          <rect
+             ry="0"
+             rx="0"
+             y="4.75"
+             x="5"
+             height="4"
+             width="4"
+             id="rect5752"
+             style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+        </g>
+        <rect
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="rect5754"
+           width="6"
+           height="2"
+           x="-288.30161"
+           y="-388.0022"
+           rx="0"
+           ry="0" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="M -287.0516,-389.7522 L -290.0516,-386.7522 L -287.0516,-383.7522 L -287.0516,-389.7522"
+           id="path5756" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="M -283.0516,-389.7522 L -280.0516,-386.7522 L -283.0516,-383.7522 L -283.0516,-389.7522"
+           id="path5758" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
new file mode 100644
index 00000000..816fdd0d
--- /dev/null
+++ b/data/icons/22x22/apps/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 22x22
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	evince.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/22x22/evince.png b/data/icons/22x22/apps/evince.png
similarity index 100%
rename from data/icons/22x22/evince.png
rename to data/icons/22x22/apps/evince.png
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index f7daf3e9..063f6935 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = evince.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = actions apps
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
new file mode 100644
index 00000000..e40425c6
--- /dev/null
+++ b/data/icons/24x24/actions/Makefile.am
@@ -0,0 +1,17 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 24x24
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	view-page-continuous.png	\
+	view-page-facing.png		\
+	zoom-fit-page.png		\
+	zoom-fit-width.png
+
+noinst_DATA = 
+
+EXTRA_DIST = \
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/24x24/actions/view-page-continuous.png b/data/icons/24x24/actions/view-page-continuous.png
new file mode 100644
index 00000000..00b411ca
Binary files /dev/null and b/data/icons/24x24/actions/view-page-continuous.png differ
diff --git a/data/icons/24x24/actions/view-page-facing.png b/data/icons/24x24/actions/view-page-facing.png
new file mode 100644
index 00000000..cb9891bc
Binary files /dev/null and b/data/icons/24x24/actions/view-page-facing.png differ
diff --git a/data/icons/24x24/actions/zoom-fit-page.png b/data/icons/24x24/actions/zoom-fit-page.png
new file mode 100644
index 00000000..2bfd8b95
Binary files /dev/null and b/data/icons/24x24/actions/zoom-fit-page.png differ
diff --git a/data/icons/24x24/actions/zoom-fit-width.png b/data/icons/24x24/actions/zoom-fit-width.png
new file mode 100644
index 00000000..087b4a67
Binary files /dev/null and b/data/icons/24x24/actions/zoom-fit-width.png differ
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
new file mode 100644
index 00000000..00b9a501
--- /dev/null
+++ b/data/icons/24x24/apps/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 24x24
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	evince.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/24x24/evince.png b/data/icons/24x24/apps/evince.png
similarity index 100%
rename from data/icons/24x24/evince.png
rename to data/icons/24x24/apps/evince.png
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 2b07ee6a..ebbd1452 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = evince.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = apps
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
new file mode 100644
index 00000000..32dbf137
--- /dev/null
+++ b/data/icons/48x48/apps/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 48x48
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	evince.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/48x48/evince.png b/data/icons/48x48/apps/evince.png
similarity index 100%
rename from data/icons/48x48/evince.png
rename to data/icons/48x48/apps/evince.png
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index d7bec5de..ebbd1452 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/scalable/apps
-icon_DATA = evince.svg
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = apps
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
new file mode 100644
index 00000000..af419947
--- /dev/null
+++ b/data/icons/scalable/apps/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = scalable
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+	evince.svg
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/scalable/evince.svg b/data/icons/scalable/apps/evince.svg
similarity index 100%
rename from data/icons/scalable/evince.svg
rename to data/icons/scalable/apps/evince.svg
diff --git a/shell/ev-stock-icons.c b/shell/ev-stock-icons.c
index cda5c53c..3b304895 100644
--- a/shell/ev-stock-icons.c
+++ b/shell/ev-stock-icons.c
@@ -34,13 +34,13 @@ typedef struct {
 	char *icon;
 } EvStockIcon;
 
-/* Evince stock icons from gnome-icon-theme */
+/* Evince stock icons */
 static const EvStockIcon stock_icons [] = {
-	{ EV_STOCK_ZOOM_PAGE,        "stock_zoom-page" },
-	{ EV_STOCK_ZOOM_WIDTH,       "stock_zoom-page-width" },
-	{ EV_STOCK_LEAVE_FULLSCREEN, "stock_leave-fullscreen" },
-	{ EV_STOCK_VIEW_DUAL,        "stock_preview-two-pages" },
-	{ EV_STOCK_VIEW_CONTINUOUS,  "stock_new-master-document" },
+	{ EV_STOCK_ZOOM_PAGE,        "zoom-fit-page" },
+	{ EV_STOCK_ZOOM_WIDTH,       "zoom-fit-width" },
+	{ EV_STOCK_LEAVE_FULLSCREEN, "view-restore" },
+	{ EV_STOCK_VIEW_DUAL,        "view-page-facing" },
+	{ EV_STOCK_VIEW_CONTINUOUS,  "view-page-continuous" },
 	{ EV_STOCK_ROTATE_LEFT,      "object-rotate-left"},
 	{ EV_STOCK_ROTATE_RIGHT,     "object-rotate-right"},
 };
@@ -73,4 +73,12 @@ ev_stock_icons_init (void)
 	gtk_icon_source_free (source);
 
 	g_object_unref (G_OBJECT (factory));
+
+        /* GtkIconTheme will then look in Evince custom hicolor dir
+         * for icons as well as the standard search paths
+         */
+        /* FIXME: multi-head! */
+        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                           DATADIR G_DIR_SEPARATOR_S "icons");
+
 }
diff --git a/shell/ev-stock-icons.h b/shell/ev-stock-icons.h
index 4064ef09..3ea635a9 100644
--- a/shell/ev-stock-icons.h
+++ b/shell/ev-stock-icons.h
@@ -29,11 +29,11 @@
 G_BEGIN_DECLS
 
 /* Evince stock icons */
-#define EV_STOCK_ZOOM_PAGE              "stock_zoom-page" 
-#define EV_STOCK_ZOOM_WIDTH             "stock_zoom-page-width" 
-#define EV_STOCK_LEAVE_FULLSCREEN       "stock_leave-fullscreen"
-#define EV_STOCK_VIEW_DUAL       	"stock_view-dual-page"
-#define EV_STOCK_VIEW_CONTINUOUS        "stock_view-continuous"
+#define EV_STOCK_ZOOM_PAGE              "zoom-fit-page" 
+#define EV_STOCK_ZOOM_WIDTH             "zoom-fit-width" 
+#define EV_STOCK_LEAVE_FULLSCREEN       "view-restore"
+#define EV_STOCK_VIEW_DUAL       	"view-page-facing"
+#define EV_STOCK_VIEW_CONTINUOUS        "view-page-continuous"
 #define EV_STOCK_ROTATE_LEFT            "object-rotate-left"
 #define EV_STOCK_ROTATE_RIGHT           "object-rotate-right"