From: Mohammed Sameer <msameer@foolab.org>
Date: Fri, 9 Aug 2013 03:11:28 +0000 (+0300)
Subject: Added own camera icons instead of relying on the system icons
X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=commitdiff_plain;h=27c38b202b0be08a89d7b23fd88a7d257be760a2

Added own camera icons instead of relying on the system icons
---

diff --git a/icons/README.txt b/icons/README.txt
new file mode 100644
index 0000000..25b37b4
--- /dev/null
+++ b/icons/README.txt
@@ -0,0 +1,16 @@
+arrow-black.svg is based on arrow-blue.svg from http://openclipart.org/detail/77329/arrow-blue-by-shokunin
+logo is leftover_bacon_Camera_Lens.svg from http://openclipart.org/detail/8099/camera-lens-by-leftover_bacon
+
+The following icons were created by me:
+torch-on.svg
+torch-off.svg
+shutter.svg
+filter-black-white.svg
+exposure.svg
+filter-negative.svg
+filter-solarize.svg
+filter-vivid.svg
+filter-sepia.svg
+filter-none.svg
+
+The rest is based on icons from https://github.com/nemomobile/nemo-theme-default lgpl part
diff --git a/icons/arrow-black.svg b/icons/arrow-black.svg
new file mode 100644
index 0000000..0aef7ae
--- /dev/null
+++ b/icons/arrow-black.svg
@@ -0,0 +1,389 @@
+<?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://creativecommons.org/ns#"
+   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="166.37231"
+   height="168.47308"
+   id="svg2965"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="arrow-black.svg">
+  <defs
+     id="defs2967">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2973" />
+    <inkscape:perspective
+       id="perspective2983"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3917"
+       id="linearGradient5325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,96.553265,671.01127)"
+       x1="381.89471"
+       y1="-310.05496"
+       x2="387.75485"
+       y2="-147.97206" />
+    <linearGradient
+       id="linearGradient3917">
+      <stop
+         style="stop-color:#edf4fd;stop-opacity:0.52845526;"
+         offset="0"
+         id="stop3919" />
+      <stop
+         style="stop-color:#175bb3;stop-opacity:0;"
+         offset="1"
+         id="stop3921" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3075"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3917-2"
+       id="linearGradient5374"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,-395.59376,1094.2791)"
+       x1="381.89471"
+       y1="-310.05496"
+       x2="387.75485"
+       y2="-147.97206" />
+    <linearGradient
+       id="linearGradient3917-2">
+      <stop
+         style="stop-color:#edf4fd;stop-opacity:0.52845526;"
+         offset="0"
+         id="stop3919-2" />
+      <stop
+         style="stop-color:#175bb3;stop-opacity:0;"
+         offset="1"
+         id="stop3921-9" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3161"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3917-8"
+       id="linearGradient5377"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,387.17357,670.22793)"
+       x1="381.89471"
+       y1="-310.05496"
+       x2="387.75485"
+       y2="-147.97206" />
+    <linearGradient
+       id="linearGradient3917-8">
+      <stop
+         style="stop-color:#edf4fd;stop-opacity:0.52845526;"
+         offset="0"
+         id="stop3919-1" />
+      <stop
+         style="stop-color:#175bb3;stop-opacity:0;"
+         offset="1"
+         id="stop3921-2" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3247"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3917-21">
+      <stop
+         style="stop-color:#edf4fd;stop-opacity:0.52845526;"
+         offset="0"
+         id="stop3919-7" />
+      <stop
+         style="stop-color:#175bb3;stop-opacity:0;"
+         offset="1"
+         id="stop3921-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3365"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3952"
+       id="linearGradient5480"
+       gradientUnits="userSpaceOnUse"
+       x1="379.92142"
+       y1="-298.53522"
+       x2="387.75485"
+       y2="-148.13335" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3952">
+      <stop
+         style="stop-color:#0146a8;stop-opacity:1;"
+         offset="0"
+         id="stop3954" />
+      <stop
+         style="stop-color:#0146a8;stop-opacity:0;"
+         offset="1"
+         id="stop3956" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3917-7"
+       id="linearGradient5482"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,689.98645,669.67217)"
+       x1="381.89471"
+       y1="-310.05496"
+       x2="387.75485"
+       y2="-147.97206" />
+    <linearGradient
+       id="linearGradient3917-7">
+      <stop
+         style="stop-color:#edf4fd;stop-opacity:0.52845526;"
+         offset="0"
+         id="stop3919-6" />
+      <stop
+         style="stop-color:#175bb3;stop-opacity:0;"
+         offset="1"
+         id="stop3921-27" />
+    </linearGradient>
+    <linearGradient
+       y2="-147.97206"
+       x2="387.75485"
+       y1="-310.05496"
+       x1="381.89471"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,689.98645,669.67217)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3917-7"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3451"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3952-0"
+       id="linearGradient5335"
+       gradientUnits="userSpaceOnUse"
+       x1="379.92142"
+       y1="-298.53522"
+       x2="387.75485"
+       y2="-148.13335" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3952-0">
+      <stop
+         style="stop-color:#0146a8;stop-opacity:1;"
+         offset="0"
+         id="stop3954-9" />
+      <stop
+         style="stop-color:#0146a8;stop-opacity:0;"
+         offset="1"
+         id="stop3956-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3917-1"
+       id="linearGradient5337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,91.853206,957.71486)"
+       x1="381.89471"
+       y1="-310.05496"
+       x2="387.75485"
+       y2="-147.97206" />
+    <linearGradient
+       id="linearGradient3917-1">
+      <stop
+         style="stop-color:#edf4fd;stop-opacity:0.52845526;"
+         offset="0"
+         id="stop3919-3" />
+      <stop
+         style="stop-color:#175bb3;stop-opacity:0;"
+         offset="1"
+         id="stop3921-4" />
+    </linearGradient>
+    <linearGradient
+       y2="-147.97206"
+       x2="387.75485"
+       y1="-310.05496"
+       x1="381.89471"
+       gradientTransform="matrix(0.93571428,0,0,0.97142857,91.853206,957.71486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3470"
+       xlink:href="#linearGradient3917-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3917-1"
+       id="linearGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70976448,0,0,0.73685473,163.85458,678.90749)"
+       x1="381.89471"
+       y1="-310.05496"
+       x2="387.75485"
+       y2="-147.97206" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3952-0"
+       id="linearGradient3038"
+       gradientUnits="userSpaceOnUse"
+       x1="379.92142"
+       y1="-298.53522"
+       x2="387.75485"
+       y2="-148.13335" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="-98.383047"
+     inkscape:cy="53.990685"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-355.88304,-440.02263)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke-width:1.89999998000000003;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4155"
+       sodipodi:cx="387.75485"
+       sodipodi:cy="-208.45078"
+       sodipodi:rx="109.66804"
+       sodipodi:ry="109.66804"
+       d="m 497.42289,-208.45078 a 109.66804,109.66804 0 1 1 -219.33608,0 109.66804,109.66804 0 1 1 219.33608,0 z"
+       transform="matrix(0.75852693,0,0,0.76810477,144.94671,684.37121)" />
+    <g
+       id="g4149"
+       transform="matrix(0.62444668,0,0,0.61057646,-30.371864,229.91622)">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="20.681622"
+         inkscape:original="M -558.09375 87.6875 L -698.15625 187.46875 L -541.71875 258.875 L -558.09375 87.6875 z "
+         style="fill:#eeeeee;fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4"
+         id="path4138"
+         d="m -558.59375,67 a 20.68369,20.68369 0 0 0 -11.5,3.84375 l -140.0625,99.78125 a 20.68369,20.68369 0 0 0 3.40625,35.65625 l 156.4375,71.40625 a 20.68369,20.68369 0 0 0 29.1875,-20.78125 L -537.5,85.71875 A 20.68369,20.68369 0 0 0 -558.59375,67 z"
+         transform="matrix(-0.26963513,-0.71803432,0.57865609,-0.3310744,482.8413,110.52503)" />
+      <rect
+         style="fill:#eeeeee;fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4143"
+         width="20.366922"
+         height="78.334312"
+         x="801.15967"
+         y="441.35452"
+         rx="19.054878"
+         ry="19.504995" />
+    </g>
+  </g>
+  <metadata
+     id="metadata53">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>arrow-blue</dc:title>
+        <dc:date>2010-08-04T13:04:34</dc:date>
+        <dc:description>Single web 2.0  icons from my set. check the whole set in my clip art if you want get all of it together.</dc:description>
+        <dc:source>http://openclipart.org/detail/77329/arrow-blue-by-shokunin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>shokunin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>arrow</rdf:li>
+            <rdf:li>chat</rdf:li>
+            <rdf:li>clip art</rdf:li>
+            <rdf:li>clipart</rdf:li>
+            <rdf:li>communicator</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>desktop</rdf:li>
+            <rdf:li>earth</rdf:li>
+            <rdf:li>email.mail</rdf:li>
+            <rdf:li>globe</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>icons</rdf:li>
+            <rdf:li>information</rdf:li>
+            <rdf:li>interface</rdf:li>
+            <rdf:li>lock</rdf:li>
+            <rdf:li>messenger</rdf:li>
+            <rdf:li>mobile</rdf:li>
+            <rdf:li>network</rdf:li>
+            <rdf:li>pc</rdf:li>
+            <rdf:li>phone</rdf:li>
+            <rdf:li>secure</rdf:li>
+            <rdf:li>set</rdf:li>
+            <rdf:li>shopping cart</rdf:li>
+            <rdf:li>unlock</rdf:li>
+            <rdf:li>web 2.0</rdf:li>
+            <rdf:li>website</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/icons/arrow-blue.svg b/icons/arrow-blue.svg
new file mode 100644
index 0000000..ebd5006
--- /dev/null
+++ b/icons/arrow-blue.svg
@@ -0,0 +1,124 @@
+<?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://creativecommons.org/ns#" 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="166.37231" height="168.47308" id="svg2965" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="email-blue.svg">
+  <defs id="defs2967">
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective2973"/>
+    <inkscape:perspective id="perspective2983" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3917" id="linearGradient5325" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93571428,0,0,0.97142857,96.553265,671.01127)" x1="381.89471" y1="-310.05496" x2="387.75485" y2="-147.97206"/>
+    <linearGradient id="linearGradient3917">
+      <stop style="stop-color:#edf4fd;stop-opacity:0.52845526;" offset="0" id="stop3919"/>
+      <stop style="stop-color:#175bb3;stop-opacity:0;" offset="1" id="stop3921"/>
+    </linearGradient>
+    <inkscape:perspective id="perspective3075" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3917-2" id="linearGradient5374" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93571428,0,0,0.97142857,-395.59376,1094.2791)" x1="381.89471" y1="-310.05496" x2="387.75485" y2="-147.97206"/>
+    <linearGradient id="linearGradient3917-2">
+      <stop style="stop-color:#edf4fd;stop-opacity:0.52845526;" offset="0" id="stop3919-2"/>
+      <stop style="stop-color:#175bb3;stop-opacity:0;" offset="1" id="stop3921-9"/>
+    </linearGradient>
+    <inkscape:perspective id="perspective3161" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3917-8" id="linearGradient5377" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93571428,0,0,0.97142857,387.17357,670.22793)" x1="381.89471" y1="-310.05496" x2="387.75485" y2="-147.97206"/>
+    <linearGradient id="linearGradient3917-8">
+      <stop style="stop-color:#edf4fd;stop-opacity:0.52845526;" offset="0" id="stop3919-1"/>
+      <stop style="stop-color:#175bb3;stop-opacity:0;" offset="1" id="stop3921-2"/>
+    </linearGradient>
+    <inkscape:perspective id="perspective3247" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient id="linearGradient3917-21">
+      <stop style="stop-color:#edf4fd;stop-opacity:0.52845526;" offset="0" id="stop3919-7"/>
+      <stop style="stop-color:#175bb3;stop-opacity:0;" offset="1" id="stop3921-5"/>
+    </linearGradient>
+    <inkscape:perspective id="perspective3365" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3952" id="linearGradient5480" gradientUnits="userSpaceOnUse" x1="379.92142" y1="-298.53522" x2="387.75485" y2="-148.13335"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3952">
+      <stop style="stop-color:#0146a8;stop-opacity:1;" offset="0" id="stop3954"/>
+      <stop style="stop-color:#0146a8;stop-opacity:0;" offset="1" id="stop3956"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3917-7" id="linearGradient5482" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93571428,0,0,0.97142857,689.98645,669.67217)" x1="381.89471" y1="-310.05496" x2="387.75485" y2="-147.97206"/>
+    <linearGradient id="linearGradient3917-7">
+      <stop style="stop-color:#edf4fd;stop-opacity:0.52845526;" offset="0" id="stop3919-6"/>
+      <stop style="stop-color:#175bb3;stop-opacity:0;" offset="1" id="stop3921-27"/>
+    </linearGradient>
+    <linearGradient y2="-147.97206" x2="387.75485" y1="-310.05496" x1="381.89471" gradientTransform="matrix(0.93571428,0,0,0.97142857,689.98645,669.67217)" gradientUnits="userSpaceOnUse" id="linearGradient3383" xlink:href="#linearGradient3917-7" inkscape:collect="always"/>
+    <inkscape:perspective id="perspective3451" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3952-0" id="linearGradient5335" gradientUnits="userSpaceOnUse" x1="379.92142" y1="-298.53522" x2="387.75485" y2="-148.13335"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3952-0">
+      <stop style="stop-color:#0146a8;stop-opacity:1;" offset="0" id="stop3954-9"/>
+      <stop style="stop-color:#0146a8;stop-opacity:0;" offset="1" id="stop3956-9"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3917-1" id="linearGradient5337" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.93571428,0,0,0.97142857,91.853206,957.71486)" x1="381.89471" y1="-310.05496" x2="387.75485" y2="-147.97206"/>
+    <linearGradient id="linearGradient3917-1">
+      <stop style="stop-color:#edf4fd;stop-opacity:0.52845526;" offset="0" id="stop3919-3"/>
+      <stop style="stop-color:#175bb3;stop-opacity:0;" offset="1" id="stop3921-4"/>
+    </linearGradient>
+    <linearGradient y2="-147.97206" x2="387.75485" y1="-310.05496" x1="381.89471" gradientTransform="matrix(0.93571428,0,0,0.97142857,91.853206,957.71486)" gradientUnits="userSpaceOnUse" id="linearGradient3470" xlink:href="#linearGradient3917-1" inkscape:collect="always"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" inkscape:cx="54.116953" inkscape:cy="53.990685" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="613" inkscape:window-height="504" inkscape:window-x="51" inkscape:window-y="612" inkscape:window-maximized="0"/>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-355.88304,-440.02263)">
+    <g id="g5327" transform="matrix(0.75852693,0,0,0.75852693,94.181451,-47.545022)">
+      <path transform="matrix(1,0,0,1.0126269,66.926108,964.91792)" d="m 497.42289,-208.45078 c 0,60.56799 -49.10005,109.668042 -109.66804,109.668042 -60.56798,0 -109.66804,-49.100052 -109.66804,-109.668042 0,-60.56798 49.10006,-109.66803 109.66804,-109.66803 60.56799,0 109.66804,49.10005 109.66804,109.66803 z" sodipodi:ry="109.66804" sodipodi:rx="109.66804" sodipodi:cy="-208.45078" sodipodi:cx="387.75485" id="path4155" style="fill:#103683;fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="fill:url(#linearGradient5335);fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none" id="path4157" sodipodi:cx="387.75485" sodipodi:cy="-208.45078" sodipodi:rx="109.66804" sodipodi:ry="109.66804" d="m 497.42289,-208.45078 c 0,60.56799 -49.10005,109.668042 -109.66804,109.668042 -60.56798,0 -109.66804,-49.100052 -109.66804,-109.668042 0,-60.56798 49.10006,-109.66803 109.66804,-109.66803 60.56799,0 109.66804,49.10005 109.66804,109.66803 z" transform="matrix(0.93571428,0,0,0.97142857,91.853206,957.71486)"/>
+      <g transform="matrix(0.823236,0,0,0.80495027,-164.20421,365.78957)" id="g4149">
+        <path transform="matrix(-0.26963513,-0.71803432,0.57865609,-0.3310744,482.8413,110.52503)" d="m -558.59375,67 a 20.68369,20.68369 0 0 0 -11.5,3.84375 l -140.0625,99.78125 a 20.68369,20.68369 0 0 0 3.40625,35.65625 l 156.4375,71.40625 a 20.68369,20.68369 0 0 0 29.1875,-20.78125 L -537.5,85.71875 A 20.68369,20.68369 0 0 0 -558.59375,67 z" id="path4138" style="fill:#eeeeee;fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4" inkscape:original="M -558.09375 87.6875 L -698.15625 187.46875 L -541.71875 258.875 L -558.09375 87.6875 z " inkscape:radius="20.681622" sodipodi:type="inkscape:offset"/>
+        <rect ry="19.504995" rx="19.054878" y="441.35452" x="801.15967" height="78.334312" width="20.366922" id="rect4143" style="fill:#eeeeee;fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none"/>
+      </g>
+      <path id="path4159" d="m 454.67611,648.6706 c -56.67433,0 -102.625,47.72503 -102.625,106.5625 0,3.7524 0.1979,7.44146 0.5625,11.09375 50.06658,18.72599 126.58171,32.36872 204.6875,-10.59375 7.4e-4,-0.16695 0,-0.33287 0,-0.5 0,-58.83747 -45.95067,-106.5625 -102.625,-106.5625 z" style="fill:url(#linearGradient3470);fill-opacity:1;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none"/>
+    </g>
+  </g>
+  <metadata>
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>arrow-blue</dc:title>
+        <dc:date>2010-08-04T13:04:34</dc:date>
+        <dc:description>Single web 2.0  icons from my set. check the whole set in my clip art if you want get all of it together.</dc:description>
+        <dc:source>http://openclipart.org/detail/77329/arrow-blue-by-shokunin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>shokunin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>arrow</rdf:li>
+            <rdf:li>chat</rdf:li>
+            <rdf:li>clip art</rdf:li>
+            <rdf:li>clipart</rdf:li>
+            <rdf:li>communicator</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>desktop</rdf:li>
+            <rdf:li>earth</rdf:li>
+            <rdf:li>email.mail</rdf:li>
+            <rdf:li>globe</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>icons</rdf:li>
+            <rdf:li>information</rdf:li>
+            <rdf:li>interface</rdf:li>
+            <rdf:li>lock</rdf:li>
+            <rdf:li>messenger</rdf:li>
+            <rdf:li>mobile</rdf:li>
+            <rdf:li>network</rdf:li>
+            <rdf:li>pc</rdf:li>
+            <rdf:li>phone</rdf:li>
+            <rdf:li>secure</rdf:li>
+            <rdf:li>set</rdf:li>
+            <rdf:li>shopping cart</rdf:li>
+            <rdf:li>unlock</rdf:li>
+            <rdf:li>web 2.0</rdf:li>
+            <rdf:li>website</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/icons/cameraplus-icon-l-camera-standby.png b/icons/cameraplus-icon-l-camera-standby.png
new file mode 100644
index 0000000..bd50ac7
Binary files /dev/null and b/icons/cameraplus-icon-l-camera-standby.png differ
diff --git a/icons/cameraplus-icon-m-camera-face-detection-screen.png b/icons/cameraplus-icon-m-camera-face-detection-screen.png
new file mode 100644
index 0000000..f3e2743
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-face-detection-screen.png differ
diff --git a/icons/cameraplus-icon-m-camera-filter-black-white.png b/icons/cameraplus-icon-m-camera-filter-black-white.png
new file mode 100644
index 0000000..2b601bf
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-filter-black-white.png differ
diff --git a/icons/cameraplus-icon-m-camera-filter-negative.png b/icons/cameraplus-icon-m-camera-filter-negative.png
new file mode 100644
index 0000000..fa7c1be
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-filter-negative.png differ
diff --git a/icons/cameraplus-icon-m-camera-filter-sepia.png b/icons/cameraplus-icon-m-camera-filter-sepia.png
new file mode 100644
index 0000000..6fad359
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-filter-sepia.png differ
diff --git a/icons/cameraplus-icon-m-camera-filter-solarize.png b/icons/cameraplus-icon-m-camera-filter-solarize.png
new file mode 100644
index 0000000..de93af5
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-filter-solarize.png differ
diff --git a/icons/cameraplus-icon-m-camera-filter-vivid.png b/icons/cameraplus-icon-m-camera-filter-vivid.png
new file mode 100644
index 0000000..dba8a8d
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-filter-vivid.png differ
diff --git a/icons/cameraplus-icon-m-camera-flash-always.png b/icons/cameraplus-icon-m-camera-flash-always.png
new file mode 100644
index 0000000..8f8ca2c
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-flash-always.png differ
diff --git a/icons/cameraplus-icon-m-camera-flash-auto.png b/icons/cameraplus-icon-m-camera-flash-auto.png
new file mode 100644
index 0000000..3495bbb
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-flash-auto.png differ
diff --git a/icons/cameraplus-icon-m-camera-flash-off.png b/icons/cameraplus-icon-m-camera-flash-off.png
new file mode 100644
index 0000000..bc15e68
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-flash-off.png differ
diff --git a/icons/cameraplus-icon-m-camera-flash-red-eye.png b/icons/cameraplus-icon-m-camera-flash-red-eye.png
new file mode 100644
index 0000000..ef59e3d
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-flash-red-eye.png differ
diff --git a/icons/cameraplus-icon-m-camera-iso-100.png b/icons/cameraplus-icon-m-camera-iso-100.png
new file mode 100644
index 0000000..8d10a48
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-iso-100.png differ
diff --git a/icons/cameraplus-icon-m-camera-iso-200.png b/icons/cameraplus-icon-m-camera-iso-200.png
new file mode 100644
index 0000000..02de858
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-iso-200.png differ
diff --git a/icons/cameraplus-icon-m-camera-iso-400.png b/icons/cameraplus-icon-m-camera-iso-400.png
new file mode 100644
index 0000000..2e55853
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-iso-400.png differ
diff --git a/icons/cameraplus-icon-m-camera-iso-800.png b/icons/cameraplus-icon-m-camera-iso-800.png
new file mode 100644
index 0000000..2cf16b9
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-iso-800.png differ
diff --git a/icons/cameraplus-icon-m-camera-iso-auto.png b/icons/cameraplus-icon-m-camera-iso-auto.png
new file mode 100644
index 0000000..ab124af
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-iso-auto.png differ
diff --git a/icons/cameraplus-icon-m-camera-location.png b/icons/cameraplus-icon-m-camera-location.png
new file mode 100644
index 0000000..fccae67
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-location.png differ
diff --git a/icons/cameraplus-icon-m-camera-manual-exposure.png b/icons/cameraplus-icon-m-camera-manual-exposure.png
new file mode 100644
index 0000000..ac2cc75
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-manual-exposure.png differ
diff --git a/icons/cameraplus-icon-m-camera-night.png b/icons/cameraplus-icon-m-camera-night.png
new file mode 100644
index 0000000..0c919f8
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-night.png differ
diff --git a/icons/cameraplus-icon-m-camera-no-filter.png b/icons/cameraplus-icon-m-camera-no-filter.png
new file mode 100644
index 0000000..bc46c24
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-no-filter.png differ
diff --git a/icons/cameraplus-icon-m-camera-ongoing-recording.png b/icons/cameraplus-icon-m-camera-ongoing-recording.png
new file mode 100644
index 0000000..15092ca
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-ongoing-recording.png differ
diff --git a/icons/cameraplus-icon-m-camera-roll.png b/icons/cameraplus-icon-m-camera-roll.png
new file mode 100644
index 0000000..abda15a
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-roll.png differ
diff --git a/icons/cameraplus-icon-m-camera-scene-auto.png b/icons/cameraplus-icon-m-camera-scene-auto.png
new file mode 100644
index 0000000..18909d4
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-scene-auto.png differ
diff --git a/icons/cameraplus-icon-m-camera-scene-landscape.png b/icons/cameraplus-icon-m-camera-scene-landscape.png
new file mode 100644
index 0000000..ff244d0
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-scene-landscape.png differ
diff --git a/icons/cameraplus-icon-m-camera-scene-macro.png b/icons/cameraplus-icon-m-camera-scene-macro.png
new file mode 100644
index 0000000..f63d4b1
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-scene-macro.png differ
diff --git a/icons/cameraplus-icon-m-camera-scene-portrait.png b/icons/cameraplus-icon-m-camera-scene-portrait.png
new file mode 100644
index 0000000..7e287b9
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-scene-portrait.png differ
diff --git a/icons/cameraplus-icon-m-camera-scene-sports.png b/icons/cameraplus-icon-m-camera-scene-sports.png
new file mode 100644
index 0000000..5a65913
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-scene-sports.png differ
diff --git a/icons/cameraplus-icon-m-camera-shutter.png b/icons/cameraplus-icon-m-camera-shutter.png
new file mode 100644
index 0000000..706fa44
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-shutter.png differ
diff --git a/icons/cameraplus-icon-m-camera-torch-off.png b/icons/cameraplus-icon-m-camera-torch-off.png
new file mode 100644
index 0000000..df6157e
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-torch-off.png differ
diff --git a/icons/cameraplus-icon-m-camera-torch-on.png b/icons/cameraplus-icon-m-camera-torch-on.png
new file mode 100644
index 0000000..dcc50a2
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-torch-on.png differ
diff --git a/icons/cameraplus-icon-m-camera-video-fine-resolution.png b/icons/cameraplus-icon-m-camera-video-fine-resolution.png
new file mode 100644
index 0000000..7032347
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-video-fine-resolution.png differ
diff --git a/icons/cameraplus-icon-m-camera-video-high-resolution.png b/icons/cameraplus-icon-m-camera-video-high-resolution.png
new file mode 100644
index 0000000..1adfd2e
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-video-high-resolution.png differ
diff --git a/icons/cameraplus-icon-m-camera-video-low-resolution.png b/icons/cameraplus-icon-m-camera-video-low-resolution.png
new file mode 100644
index 0000000..283dc4a
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-video-low-resolution.png differ
diff --git a/icons/cameraplus-icon-m-camera-video-night.png b/icons/cameraplus-icon-m-camera-video-night.png
new file mode 100644
index 0000000..d0ad27e
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-video-night.png differ
diff --git a/icons/cameraplus-icon-m-camera-video-record.png b/icons/cameraplus-icon-m-camera-video-record.png
new file mode 100644
index 0000000..27381ba
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-video-record.png differ
diff --git a/icons/cameraplus-icon-m-camera-video.png b/icons/cameraplus-icon-m-camera-video.png
new file mode 100644
index 0000000..44e3c69
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-video.png differ
diff --git a/icons/cameraplus-icon-m-camera-whitebalance-auto.png b/icons/cameraplus-icon-m-camera-whitebalance-auto.png
new file mode 100644
index 0000000..4fb3573
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-whitebalance-auto.png differ
diff --git a/icons/cameraplus-icon-m-camera-whitebalance-cloudy.png b/icons/cameraplus-icon-m-camera-whitebalance-cloudy.png
new file mode 100644
index 0000000..f0323ab
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-whitebalance-cloudy.png differ
diff --git a/icons/cameraplus-icon-m-camera-whitebalance-fluorescent.png b/icons/cameraplus-icon-m-camera-whitebalance-fluorescent.png
new file mode 100644
index 0000000..359b5fd
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-whitebalance-fluorescent.png differ
diff --git a/icons/cameraplus-icon-m-camera-whitebalance-sunny.png b/icons/cameraplus-icon-m-camera-whitebalance-sunny.png
new file mode 100644
index 0000000..56fc8f8
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-whitebalance-sunny.png differ
diff --git a/icons/cameraplus-icon-m-camera-whitebalance-tungsten.png b/icons/cameraplus-icon-m-camera-whitebalance-tungsten.png
new file mode 100644
index 0000000..c4be815
Binary files /dev/null and b/icons/cameraplus-icon-m-camera-whitebalance-tungsten.png differ
diff --git a/icons/cameraplus-icon-m-settings-reset.png b/icons/cameraplus-icon-m-settings-reset.png
new file mode 100644
index 0000000..4daf2b0
Binary files /dev/null and b/icons/cameraplus-icon-m-settings-reset.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-back-white.png b/icons/cameraplus-icon-m-toolbar-back-white.png
new file mode 100644
index 0000000..2bdbb69
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-back-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-delete-white.png b/icons/cameraplus-icon-m-toolbar-delete-white.png
new file mode 100644
index 0000000..b598c5c
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-delete-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-favorite-mark-white.png b/icons/cameraplus-icon-m-toolbar-favorite-mark-white.png
new file mode 100644
index 0000000..1a0be97
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-favorite-mark-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-favorite-unmark-white.png b/icons/cameraplus-icon-m-toolbar-favorite-unmark-white.png
new file mode 100644
index 0000000..7c43907
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-favorite-unmark-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-mediacontrol-pause-white.png b/icons/cameraplus-icon-m-toolbar-mediacontrol-pause-white.png
new file mode 100644
index 0000000..c39de21
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-mediacontrol-pause-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-mediacontrol-play-white.png b/icons/cameraplus-icon-m-toolbar-mediacontrol-play-white.png
new file mode 100644
index 0000000..629e0a2
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-mediacontrol-play-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-mediacontrol-stop-white.png b/icons/cameraplus-icon-m-toolbar-mediacontrol-stop-white.png
new file mode 100644
index 0000000..b22d50f
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-mediacontrol-stop-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-share-white.png b/icons/cameraplus-icon-m-toolbar-share-white.png
new file mode 100644
index 0000000..3f28436
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-share-white.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-volume-off-white-selected.png b/icons/cameraplus-icon-m-toolbar-volume-off-white-selected.png
new file mode 100644
index 0000000..4410455
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-volume-off-white-selected.png differ
diff --git a/icons/cameraplus-icon-m-toolbar-volume-white-selected.png b/icons/cameraplus-icon-m-toolbar-volume-white-selected.png
new file mode 100644
index 0000000..6f591b3
Binary files /dev/null and b/icons/cameraplus-icon-m-toolbar-volume-white-selected.png differ
diff --git a/icons/cameraplus-icon-m-viewfinder-camera.png b/icons/cameraplus-icon-m-viewfinder-camera.png
new file mode 100644
index 0000000..48d74e7
Binary files /dev/null and b/icons/cameraplus-icon-m-viewfinder-camera.png differ
diff --git a/icons/exposure.svg b/icons/exposure.svg
new file mode 100644
index 0000000..b96cdf3
--- /dev/null
+++ b/icons/exposure.svg
@@ -0,0 +1,72 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg6669"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="exposure.svg">
+  <defs
+     id="defs6671" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="25.058342"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6674">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 23.8125 4.65625 C 18.234869 4.7118102 12.718751 7.1678281 8.9375 11.84375 C 2.2152763 20.1565 3.5309999 32.340276 11.84375 39.0625 C 20.1565 45.784724 32.340276 44.469 39.0625 36.15625 C 45.784724 27.8435 44.469 15.659724 36.15625 8.9375 C 32.519422 5.9965271 28.150657 4.6130365 23.8125 4.65625 z M 23.71875 6.09375 C 27.690076 6.0540609 31.703083 7.3398801 35.03125 10.03125 C 35.072125 10.06431 35.0845 10.09166 35.125 10.125 L 12.84375 37.6875 C 12.802664 37.65487 12.75963 37.62681 12.71875 37.59375 C 5.1115101 31.442047 3.9420474 20.26349 10.09375 12.65625 C 13.554083 8.3771774 18.612759 6.1447788 23.71875 6.09375 z M 27.5 28.34375 L 34.875 28.34375 L 34.875 30.59375 L 27.5 30.59375 L 27.5 28.34375 z "
+       id="path6045" />
+    <text
+       xml:space="preserve"
+       style="font-size:21.41063309px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="8.9364386"
+       y="24.125244"
+       id="text6686"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6688"
+         x="8.9364386"
+         y="24.125244"
+         style="font-size:18.35197067px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold">+</tspan></text>
+  </g>
+</svg>
diff --git a/icons/filter-black-white.svg b/icons/filter-black-white.svg
new file mode 100644
index 0000000..c071dab
--- /dev/null
+++ b/icons/filter-black-white.svg
@@ -0,0 +1,61 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg6112"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="filter-black-white.svg">
+  <defs
+     id="defs6114" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="-29.285714"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6117">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 23,4.6599664 C 12.772269,5.1784112 4.65625,13.647144 4.65625,24.003716 c 0,10.690655 8.653095,19.34375 19.34375,19.34375 10.690655,0 19.34375,-8.653095 19.34375,-19.34375 C 43.34375,13.313061 34.690655,4.6599664 24,4.6599664 c -0.334083,0 -0.670073,-0.016724 -1,0 z m 0.78125,1.5625 c 0.05257,0 0.10379,-4.571e-4 0.15625,0 l 0,35.4374996 c -0.05246,4.57e-4 -0.10368,0 -0.15625,0 -9.78333,0 -17.71875,-7.93542 -17.71875,-17.71875 0,-9.78333 7.93542,-17.7187496 17.71875,-17.7187496 z"
+       id="path6045"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/filter-negative.svg b/icons/filter-negative.svg
new file mode 100644
index 0000000..05245fc
--- /dev/null
+++ b/icons/filter-negative.svg
@@ -0,0 +1,61 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg7255"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="filter-negative.svg">
+  <defs
+     id="defs7257" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="-29.571429"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7260">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 23,4.6599664 C 12.772269,5.1784112 4.65625,13.647144 4.65625,24.003716 c 0,10.690655 8.653095,19.34375 19.34375,19.34375 10.690655,0 19.34375,-8.653095 19.34375,-19.34375 C 43.34375,13.313061 34.690655,4.6599664 24,4.6599664 c -0.334083,0 -0.670073,-0.016724 -1,0 z m -6.21875,17.3437496 14.4375,0 0,4 -14.4375,0 0,-4 z"
+       id="path6045"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/filter-none.svg b/icons/filter-none.svg
new file mode 100644
index 0000000..fdc8d34
--- /dev/null
+++ b/icons/filter-none.svg
@@ -0,0 +1,61 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2998"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="608"
+     inkscape:window-height="459"
+     inkscape:window-x="207"
+     inkscape:window-y="141"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3003">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 23.984375,4.640625 c -10.690655,0 -19.34375,8.684345 -19.34375,19.375 0,10.690655 8.653095,19.34375 19.34375,19.34375 10.690655,0 19.375,-8.653095 19.375,-19.34375 0,-10.690655 -8.684345,-19.375 -19.375,-19.375 z m 0,2.875 c 9.112699,0 16.5,7.387301 16.5,16.5 0,9.112699 -7.387301,16.5 -16.5,16.5 -9.112699,0 -16.5,-7.387301 -16.5,-16.5 0,-9.112699 7.387301,-16.5 16.5,-16.5 z"
+       id="path6045" />
+  </g>
+</svg>
diff --git a/icons/filter-sepia.svg b/icons/filter-sepia.svg
new file mode 100644
index 0000000..e1c1739
--- /dev/null
+++ b/icons/filter-sepia.svg
@@ -0,0 +1,73 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="filter-sepia.svg">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="23.518222"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 24,1 C 11.297451,1 1,11.297451 1,24 1,36.702549 11.297451,47 24,47 36.702549,47 47,36.702549 47,24 47,11.297451 36.702549,1 24,1 z m 0,3.375 C 34.84845,4.375 43.625,13.15155 43.625,24 43.625,34.84845 34.84845,43.65625 24,43.65625 13.15155,43.65625 4.34375,34.84845 4.34375,24 4.34375,13.15155 13.15155,4.375 24,4.375 z"
+       id="path3765"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:34.79959488px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="11.493896"
+       y="36.667526"
+       id="text3786"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3788"
+         x="11.493896"
+         y="36.667526"
+         style="font-size:34.79959488px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold">S</tspan></text>
+  </g>
+</svg>
diff --git a/icons/filter-solarize.svg b/icons/filter-solarize.svg
new file mode 100644
index 0000000..13becaa
--- /dev/null
+++ b/icons/filter-solarize.svg
@@ -0,0 +1,74 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg7804"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="filter-solarize.svg">
+  <defs
+     id="defs7806" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="-8.6635773"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7809">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="star"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path7812"
+       sodipodi:sides="15"
+       sodipodi:cx="14.142857"
+       sodipodi:cy="15.428571"
+       sodipodi:r1="22.980972"
+       sodipodi:r2="25.253815"
+       sodipodi:arg1="0.78539816"
+       sodipodi:arg2="0.99483767"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 30.392858,31.678572 -2.495788,4.92963 -5.518569,0.274955 -4.285077,3.488312 -5.153298,-1.993421 -5.3334375,1.443835 -3.8969749,-3.917116 -5.4595975,-0.850296 -1.9668293,-5.163506 -4.6417438,-2.997402 0.303399,-5.517079 -3.021291,-4.626231 2.5211672,-4.916698 -0.8784287,-5.455142 4.303002,-3.4661768 1.4163214,-5.340809 5.3408091,-1.4163215 3.4661767,-4.303002 5.4551413,0.8784287 4.916699,-2.5211669 4.626231,3.0212906 5.517078,-0.3033991 2.997403,4.6417439 5.163506,1.96682924 0.850296,5.45959746 3.917115,3.8969749 -1.443834,5.3334375 1.993421,5.153298 -3.488312,4.285077 -0.274955,5.518569 z"
+       transform="matrix(0.88893152,0,0,0.88893152,11.550778,10.407866)" />
+  </g>
+</svg>
diff --git a/icons/filter-vivid.svg b/icons/filter-vivid.svg
new file mode 100644
index 0000000..000c857
--- /dev/null
+++ b/icons/filter-vivid.svg
@@ -0,0 +1,82 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg5525"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="filter-vivid.svg">
+  <defs
+     id="defs5527" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="-33.689015"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:snap-global="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid6095" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-0.57142857,52.428571"
+       id="guide6097" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5530">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 23.984375,4.640625 c -10.690655,0 -19.34375,8.684345 -19.34375,19.375 0,10.690655 8.653095,19.34375 19.34375,19.34375 10.690655,0 19.375,-8.653095 19.375,-19.34375 0,-10.690655 -8.684345,-19.375 -19.375,-19.375 z m 0,2.875 c 9.112699,0 16.5,7.387301 16.5,16.5 0,9.112699 -7.387301,16.5 -16.5,16.5 -9.112699,0 -16.5,-7.387301 -16.5,-16.5 0,-9.112699 7.387301,-16.5 16.5,-16.5 z"
+       id="path6045"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 23.990256,11.151688 c -6.667331,0 -12.063916,5.763573 -12.063916,12.858681 0,7.095109 5.396585,12.837943 12.063916,12.837943 6.667329,0 12.083404,-5.742834 12.083404,-12.837943 0,-7.095108 -5.416075,-12.858681 -12.083404,-12.858681 z m 0,1.908062 c 5.683223,0 10.290384,4.902759 10.290384,10.950619 0,6.047861 -4.607161,10.95062 -10.290384,10.95062 -5.683223,0 -10.290384,-4.902759 -10.290384,-10.95062 0,-6.04786 4.607161,-10.950619 10.290384,-10.950619 z"
+       id="path6045-6" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 23.99504,17.854911 c -3.393448,0 -6.140129,2.756601 -6.140129,6.15005 0,3.393447 2.746681,6.140129 6.140129,6.140129 3.393448,0 6.150049,-2.746682 6.150049,-6.140129 0,-3.393449 -2.756601,-6.15005 -6.150049,-6.15005 z m 0,0.912588 c 2.89257,0 5.237462,2.344891 5.237462,5.237462 0,2.89257 -2.344892,5.23746 -5.237462,5.23746 -2.89257,0 -5.237461,-2.34489 -5.237461,-5.23746 0,-2.892571 2.344891,-5.237462 5.237461,-5.237462 z"
+       id="path6045-4" />
+  </g>
+</svg>
diff --git a/icons/gen.sh b/icons/gen.sh
new file mode 100755
index 0000000..db58339
--- /dev/null
+++ b/icons/gen.sh
@@ -0,0 +1 @@
+ cat icons.txt| while read l; do echo $l | sed -e 's/^\([^ ]*\) \([0-9]*\) \([0-9]*\) \(.*\)/inkscape -C -e cameraplus-\1.png -w \2 -h \3 \4/'; done | bash
diff --git a/icons/icon-m-camera-face-detection-screen.svg b/icons/icon-m-camera-face-detection-screen.svg
new file mode 100644
index 0000000..0205ae5
--- /dev/null
+++ b/icons/icon-m-camera-face-detection-screen.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-face-detection-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-face-detection-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M8.5,29H3V2.95L8.5,3V0.5H3C1.625,0.5,0.5,1.625,0.5,3v26c0,1.375,1.125,2.5,2.5,2.5h5.5V29z"/>
+	<path style="fill:#FFFFFF;" d="M23.5,3L29,2.95V29h-5.5v2.5H29c1.375,0,2.5-1.125,2.5-2.5V3c0-1.375-1.125-2.5-2.5-2.5h-5.5V3z"/>
+	<path style="fill:#FFFFFF;" d="M6.5,24h19c0-2.5-3.703-4.206-7.022-4.985c1.341-1.351,2.022-3.6,2.022-5.559
+		C20.5,10.402,18.65,8,16,8c-2.65,0-5,2.402-5,5.456c0,1.959,1.002,4.208,2.341,5.559C10.023,19.794,6.5,21.558,6.5,24z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-flash-always-screen.svg b/icons/icon-m-camera-flash-always-screen.svg
new file mode 100644
index 0000000..8f38141
--- /dev/null
+++ b/icons/icon-m-camera-flash-always-screen.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-flash-always-screen-layer"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-flash-always-screen.svg"><metadata
+   id="metadata12"><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><defs
+   id="defs10" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview8"
+   showgrid="false"
+   inkscape:zoom="9.8390732"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-flash-always-screen-layer" />
+<g
+   id="icon-m-camera-flash-always-screen"
+   transform="matrix(1.368429,0,0,1.368429,2.105136,2.105136)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect4"
+   x="0"
+   y="0" />
+	<polygon
+   style="fill:#ffffff"
+   points="18,0.498 3.499,12.498 11.499,17 1,31.498 21.498,15 13.499,11 "
+   id="polygon6" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-flash-auto-screen.svg b/icons/icon-m-camera-flash-auto-screen.svg
new file mode 100644
index 0000000..69b7b16
--- /dev/null
+++ b/icons/icon-m-camera-flash-auto-screen.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-flash-auto-screen-layer"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-flash-auto-screen.svg"><metadata
+   id="metadata3001"><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><defs
+   id="defs2999" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview2997"
+   showgrid="false"
+   inkscape:zoom="9.8390732"
+   inkscape:cx="-0.21087642"
+   inkscape:cy="28.196271"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-flash-auto-screen-layer" />
+<g
+   id="icon-m-camera-flash-auto-screen"
+   transform="matrix(1.3366679,0,0,1.3366679,2.6133136,2.6133136)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect2991"
+   x="0"
+   y="0" />
+	<polygon
+   style="fill:#ffffff"
+   points="18,0.498 3.5,12.498 11.5,17 1,31.5 21.5,15 13.5,11 "
+   id="polygon2993" />
+	<path
+   style="fill:#ffffff"
+   d="m 27.159,18 h -3.13 L 20,31.5 h 2.273 l 0.896,-3.097 h 4.516 l 0.896,3.097 h 2.534 L 27.159,18 z m -3.556,8.693 1.845,-6.671 1.826,6.7 -3.671,-0.029 z"
+   id="path2995"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-flash-off-screen.svg b/icons/icon-m-camera-flash-off-screen.svg
new file mode 100644
index 0000000..c95b204
--- /dev/null
+++ b/icons/icon-m-camera-flash-off-screen.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-flash-off-screen-layer"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-flash-off-screen.svg"><metadata
+   id="metadata3015"><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><defs
+   id="defs3013" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3011"
+   showgrid="false"
+   inkscape:zoom="9.8390732"
+   inkscape:cx="8.8070395"
+   inkscape:cy="24.130847"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-flash-off-screen-layer" />
+<g
+   id="icon-m-camera-flash-off-screen"
+   transform="matrix(1.3779573,0,0,1.3779573,1.9526832,1.9526832)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect3005"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="M 16,0.451 C 7.441,0.452 0.5,7.396 0.5,15.96 0.5,24.514 7.441,31.449 16,31.451 24.558,31.449 31.498,24.513 31.5,15.96 31.498,7.396 24.559,0.452 16,0.451 z m 10.288,23.735 -4.341,-4.342 -2.278,1.83 4.564,4.565 C 21.977,28.047 19.117,29.133 16,29.136 8.72,29.125 2.827,23.233 2.813,15.96 2.82,12.842 3.906,9.979 5.716,7.72 L 9.553,11.557 11.734,9.631 7.77,5.664 C 10.026,3.856 12.886,2.771 16,2.768 V 2.765 c 7.278,0.014 13.173,5.911 13.186,13.195 -0.004,3.112 -1.089,5.972 -2.898,8.226 z"
+   id="path3007"
+   inkscape:connector-curvature="0" />
+	<polygon
+   style="fill:#ffffff"
+   points="17.273,12.979 20.297,6.264 11.509,14.03 16.177,16.779 9.703,25.639 22.297,15.526 "
+   id="polygon3009" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-flash-red-eye-screen.svg b/icons/icon-m-camera-flash-red-eye-screen.svg
new file mode 100644
index 0000000..dcf4c5e
--- /dev/null
+++ b/icons/icon-m-camera-flash-red-eye-screen.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-flash-red-eye-screen-layer"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-flash-red-eye-screen.svg"><metadata
+   id="metadata3031"><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><defs
+   id="defs3029" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3027"
+   showgrid="false"
+   inkscape:zoom="9.8390732"
+   inkscape:cx="23.860606"
+   inkscape:cy="24.130847"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-flash-red-eye-screen-layer" />
+<g
+   id="icon-m-camera-flash-red-eye-screen"
+   transform="matrix(1.2509129,0,0,1.2509129,3.9853936,3.9853936)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect3019"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="M 28.475,8.996 28.488,8.964 28.343,8.747 H 28.317 C 28.261,8.689 28.176,8.601 28.083,8.5 27.819,8.218 21.512,1.558 14.496,1.558 7.478,1.558 1.172,8.218 0.906,8.502 0.741,8.678 0.603,8.822 0.603,8.822 L 0.489,8.937 0.532,9.041 V 9.112 L 0.6,9.182 c 0,10e-4 0.141,0.144 0.304,0.317 0.266,0.285 6.572,6.945 13.59,6.945 7.016,0 13.323,-6.66 13.587,-6.943 l 0.235,-0.248 h 0.03 L 28.488,9.028 28.475,8.996 z M 4.609,8.914 C 4.657,8.861 9.417,3.84 14.495,3.84 c 5.078,0 9.835,5.021 9.883,5.074 L 24.461,9 C 24.436,9.028 24.408,9.059 24.379,9.088 24.33,9.139 19.576,14.163 14.495,14.163 9.416,14.163 4.657,9.139 4.61,9.091 L 4.527,9 C 4.553,8.974 4.581,8.943 4.609,8.914 z"
+   id="path3021"
+   inkscape:connector-curvature="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 14.995,5.184 v 4.824 h -4.223 c 0.444,1.638 1.94,2.847 3.723,2.847 2.129,0 3.857,-1.725 3.857,-3.853 C 18.353,7.043 16.888,5.43 14.995,5.184 z"
+   id="path3023"
+   inkscape:connector-curvature="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 27.545,18 h -3.131 l -4.028,13.498 h 2.273 l 0.896,-3.095 h 4.516 l 0.896,3.095 H 31.5 L 27.545,18 z m -3.557,8.693 1.844,-6.67 1.827,6.699 -3.671,-0.029 z"
+   id="path3025"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-iso-100.svg b/icons/icon-m-camera-iso-100.svg
new file mode 100644
index 0000000..2270323
--- /dev/null
+++ b/icons/icon-m-camera-iso-100.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-iso-100-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-iso-100.svg"><metadata
+   id="metadata20"><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><defs
+   id="defs18">
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="687"
+   inkscape:window-height="480"
+   id="namedview16"
+   showgrid="false"
+   inkscape:zoom="7.375"
+   inkscape:cx="16"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="icon-m-camera-iso-100-layer" />
+<rect
+   y="0"
+   x="0"
+   id="rect4"
+   height="32"
+   width="32"
+   style="fill:none" /><g
+   id="g3115"
+   transform="matrix(1.2833611,0,0,1.2833611,-5.0381385,-4.5337776)"><path
+     style="fill:#ffffff"
+     d="M 7.956,4.944 V 17.493 H 24.045 V 4.944 H 7.956 z m 3.66,2.978 h -0.695 v 6.207 h 0.695 v 1.112 H 8.314 V 14.129 H 9.01 V 7.922 H 8.314 V 6.809 h 3.301 v 1.113 z m 2.247,7.412 c -0.648,0 -1.32,-0.081 -1.946,-0.231 v -1.147 c 0.591,0.15 1.193,0.267 1.818,0.267 0.915,0 1.355,-0.429 1.355,-1.112 0,-0.717 -0.417,-0.984 -1.529,-1.609 -0.949,-0.532 -1.633,-1.17 -1.633,-2.432 0,-1.587 1.204,-2.352 2.872,-2.352 0.591,0 1.182,0.058 1.772,0.174 V 8.015 C 16.039,7.9 15.622,7.829 15.055,7.829 c -0.753,0 -1.205,0.348 -1.205,0.974 0,0.672 0.486,0.984 1.332,1.425 1.123,0.59 1.83,1.263 1.83,2.502 0.002,1.839 -1.261,2.604 -3.149,2.604 z m 6.719,0 c -2.815,0 -3.268,-2.433 -3.268,-4.425 0,-1.98 0.521,-4.192 3.268,-4.192 2.744,0 3.254,2.212 3.254,4.192 0,2.005 -0.44,4.425 -3.254,4.425 z"
+     id="path6"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 20.582,7.828 c -1.193,0 -1.286,1.506 -1.286,3.081 0,1.575 0.139,3.313 1.286,3.313 1.192,0 1.273,-1.714 1.273,-3.313 0,-1.575 -0.115,-3.081 -1.273,-3.081 z"
+     id="path8"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="M 12.755,26.975 H 7.428 v -1.02 H 9.211 V 19.91 l -1.783,0.382 v -0.996 l 2.64,-0.822 h 1.008 v 7.481 h 1.679 v 1.02 z"
+     id="path10"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 16.231,27.056 c -2.629,0 -2.849,-2.235 -2.849,-4.401 0,-1.957 0.313,-4.203 2.896,-4.203 2.548,0 2.826,2.223 2.826,4.203 0,2.189 -0.267,4.401 -2.873,4.401 z m 0,-7.551 c -0.915,0 -0.973,1.228 -0.973,3.149 0,2.236 0.093,3.348 0.973,3.348 0.869,0 0.95,-1.111 0.95,-3.348 0,-1.933 -0.046,-3.149 -0.95,-3.149 z"
+     id="path12"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 22.486,27.056 c -2.629,0 -2.85,-2.235 -2.85,-4.401 0,-1.957 0.313,-4.203 2.896,-4.203 2.548,0 2.826,2.223 2.826,4.203 0,2.189 -0.266,4.401 -2.872,4.401 z m 0,-7.551 c -0.915,0 -0.973,1.228 -0.973,3.149 0,2.236 0.092,3.348 0.973,3.348 0.868,0 0.949,-1.111 0.949,-3.348 0.001,-1.933 -0.045,-3.149 -0.949,-3.149 z"
+     id="path14"
+     inkscape:connector-curvature="0" /></g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-iso-200.svg b/icons/icon-m-camera-iso-200.svg
new file mode 100644
index 0000000..02455d4
--- /dev/null
+++ b/icons/icon-m-camera-iso-200.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-iso-200-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-iso-200.svg"><metadata
+   id="metadata3015"><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><defs
+   id="defs3013">
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3011"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-iso-200-layer" />
+<rect
+   y="0"
+   x="0"
+   id="rect2999"
+   height="32"
+   width="32"
+   style="fill:none" /><g
+   id="g3135"
+   transform="matrix(1.3380152,0,0,1.3380152,-5.7788734,-5.4082432)"><path
+     style="fill:#ffffff"
+     d="M 7.956,4.944 V 17.493 H 24.045 V 4.944 H 7.956 z m 3.66,2.978 h -0.695 v 6.207 h 0.695 v 1.112 H 8.314 V 14.129 H 9.01 V 7.922 H 8.314 V 6.809 h 3.301 v 1.113 z m 2.247,7.412 c -0.648,0 -1.32,-0.081 -1.946,-0.231 v -1.147 c 0.591,0.15 1.193,0.267 1.818,0.267 0.915,0 1.355,-0.429 1.355,-1.112 0,-0.717 -0.417,-0.984 -1.529,-1.609 -0.949,-0.532 -1.633,-1.17 -1.633,-2.432 0,-1.587 1.204,-2.352 2.872,-2.352 0.591,0 1.182,0.058 1.772,0.174 V 8.015 C 16.039,7.9 15.622,7.829 15.055,7.829 c -0.753,0 -1.205,0.348 -1.205,0.974 0,0.672 0.486,0.984 1.332,1.425 1.123,0.59 1.83,1.263 1.83,2.502 0.002,1.839 -1.261,2.604 -3.149,2.604 z m 6.719,0 c -2.815,0 -3.268,-2.433 -3.268,-4.425 0,-1.98 0.521,-4.192 3.268,-4.192 2.744,0 3.254,2.212 3.254,4.192 0,2.005 -0.44,4.425 -3.254,4.425 z"
+     id="path3001"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 20.582,7.828 c -1.193,0 -1.286,1.506 -1.286,3.081 0,1.575 0.139,3.313 1.286,3.313 1.192,0 1.273,-1.714 1.273,-3.313 0,-1.575 -0.115,-3.081 -1.273,-3.081 z"
+     id="path3003"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="M 12.547,26.975 H 7.196 v -0.741 c 0,-1.772 1.077,-2.791 2.154,-3.694 0.729,-0.613 1.216,-1.054 1.216,-1.772 0,-0.775 -0.382,-1.204 -1.297,-1.204 -0.648,0 -1.228,0.186 -1.784,0.383 V 18.8 c 0.741,-0.22 1.494,-0.347 2.258,-0.347 1.691,0 2.745,0.683 2.745,2.246 0,1.251 -0.684,1.923 -1.668,2.757 -1.042,0.88 -1.726,1.494 -1.807,2.409 h 3.532 v 1.11 z"
+     id="path3005"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 16.231,27.056 c -2.629,0 -2.849,-2.235 -2.849,-4.401 0,-1.957 0.313,-4.203 2.896,-4.203 2.548,0 2.826,2.223 2.826,4.203 0,2.189 -0.267,4.401 -2.873,4.401 z m 0,-7.551 c -0.915,0 -0.973,1.228 -0.973,3.149 0,2.236 0.093,3.348 0.973,3.348 0.869,0 0.95,-1.111 0.95,-3.348 0,-1.933 -0.046,-3.149 -0.95,-3.149 z"
+     id="path3007"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 22.486,27.056 c -2.629,0 -2.85,-2.235 -2.85,-4.401 0,-1.957 0.313,-4.203 2.896,-4.203 2.548,0 2.826,2.223 2.826,4.203 0,2.189 -0.266,4.401 -2.872,4.401 z m 0,-7.551 c -0.915,0 -0.973,1.228 -0.973,3.149 0,2.236 0.092,3.348 0.973,3.348 0.868,0 0.949,-1.111 0.949,-3.348 0.001,-1.933 -0.045,-3.149 -0.949,-3.149 z"
+     id="path3009"
+     inkscape:connector-curvature="0" /></g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-iso-400.svg b/icons/icon-m-camera-iso-400.svg
new file mode 100644
index 0000000..ca2a7b6
--- /dev/null
+++ b/icons/icon-m-camera-iso-400.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-iso-400-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-iso-400.svg"><metadata
+   id="metadata3035"><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><defs
+   id="defs3033">
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3031"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-iso-400-layer" />
+<rect
+   y="0"
+   x="0"
+   id="rect3019"
+   height="32"
+   width="32"
+   style="fill:none" /><path
+   inkscape:connector-curvature="0"
+   id="path3021"
+   d="M 5.1954294,1.3590715 V 17.977108 H 26.501318 V 1.3590715 H 5.1954294 z M 10.04219,5.3026935 H 9.1218365 V 13.522325 H 10.04219 v 1.472568 H 5.6695116 V 13.522325 H 6.5911909 V 5.3026935 H 5.6695116 V 3.8288012 h 4.3713544 v 1.4738923 z m 2.975594,9.8153555 c -0.858114,0 -1.748012,-0.107264 -2.576993,-0.305903 v -1.518917 c 0.782633,0.198637 1.579832,0.353575 2.40749,0.353575 1.21169,0 1.794361,-0.568104 1.794361,-1.472569 0,-0.949488 -0.552213,-1.303063 -2.024781,-2.130721 -1.256716,-0.7045014 -2.162504,-1.5493733 -2.162504,-3.2205793 0,-2.1015878 1.5944,-3.1146405 3.803252,-3.1146405 0.782633,0 1.565265,0.076806 2.346574,0.2304199 v 1.4871348 c -0.705827,-0.152289 -1.258038,-0.2463108 -2.008889,-0.2463108 -0.997161,0 -1.595723,0.4608396 -1.595723,1.2898213 0,0.8898968 0.643586,1.3030634 1.763903,1.8870585 1.487133,0.7813084 2.423381,1.6725291 2.423381,3.3132781 0.0027,2.435299 -1.669881,3.448352 -4.170069,3.448352 z m 8.89765,0 c -3.727769,0 -4.327656,-3.221905 -4.327656,-5.8598157 0,-2.622018 0.689935,-5.5512633 4.327656,-5.5512633 3.633747,0 4.309115,2.9292453 4.309115,5.5512633 0,2.6551267 -0.58267,5.8598157 -4.309115,5.8598157 z"
+   style="fill:#ffffff" /><path
+   inkscape:connector-curvature="0"
+   id="path3023"
+   d="m 21.915434,5.1782138 c -1.579834,0 -1.702989,1.994323 -1.702989,4.0800195 0,2.0856977 0.184071,4.3872477 1.702989,4.3872477 1.578507,0 1.685772,-2.269768 1.685772,-4.3872477 0,-2.0856965 -0.15229,-4.0800195 -1.685772,-4.0800195 z"
+   style="fill:#ffffff" /><path
+   inkscape:connector-curvature="0"
+   id="path3025"
+   d="M 11.750476,28.171199 H 10.599701 V 30.53234 H 8.1312958 V 28.171199 H 3.7599404 v -1.411653 l 4.4945103,-7.436997 h 2.3452503 v 7.376082 h 1.150775 v 1.472568 z M 8.1312958,26.69863 V 22.189554 L 5.4788193,26.69863 h 2.6524765 z"
+   style="fill:#ffffff" /><path
+   inkscape:connector-curvature="0"
+   id="path3027"
+   d="m 16.153613,30.640928 c -3.481458,0 -3.772792,-2.959703 -3.772792,-5.828032 0,-2.591562 0.41449,-5.56583 3.835032,-5.56583 3.374193,0 3.742335,2.943811 3.742335,5.56583 0,2.898787 -0.353574,5.828032 -3.804575,5.828032 z m 0,-9.999425 c -1.211691,0 -1.288497,1.626182 -1.288497,4.170069 0,2.961028 0.123155,4.433594 1.288497,4.433594 1.150775,0 1.258041,-1.471243 1.258041,-4.433594 0,-2.55978 -0.06092,-4.170069 -1.258041,-4.170069 z"
+   style="fill:#ffffff" /><path
+   inkscape:connector-curvature="0"
+   id="path3029"
+   d="m 24.436808,30.640928 c -3.481458,0 -3.774118,-2.959703 -3.774118,-5.828032 0,-2.591562 0.414491,-5.56583 3.835035,-5.56583 3.374193,0 3.742335,2.943811 3.742335,5.56583 0,2.898787 -0.35225,5.828032 -3.803251,5.828032 z m 0,-9.999425 c -1.211689,0 -1.288496,1.626182 -1.288496,4.170069 0,2.961028 0.121831,4.433594 1.288496,4.433594 1.149451,0 1.256715,-1.471243 1.256715,-4.433594 0.0013,-2.55978 -0.05959,-4.170069 -1.256715,-4.170069 z"
+   style="fill:#ffffff" />
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-iso-800.svg b/icons/icon-m-camera-iso-800.svg
new file mode 100644
index 0000000..f57b8b3
--- /dev/null
+++ b/icons/icon-m-camera-iso-800.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-iso-800-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-iso-800.svg"><metadata
+   id="metadata3055"><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><defs
+   id="defs3053">
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3051"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-iso-800-layer" />
+<rect
+   y="0"
+   x="0"
+   id="rect3039"
+   height="32"
+   width="32"
+   style="fill:none" /><g
+   id="g3122"
+   transform="matrix(1.3322871,0,0,1.3322871,-5.578388,-5.3165936)"><path
+     style="fill:#ffffff"
+     d="M 7.956,4.944 V 17.493 H 24.045 V 4.944 H 7.956 z m 3.66,2.978 h -0.695 v 6.207 h 0.695 v 1.112 H 8.314 V 14.129 H 9.01 V 7.922 H 8.314 V 6.809 h 3.301 v 1.113 z m 2.247,7.412 c -0.648,0 -1.32,-0.081 -1.946,-0.231 v -1.147 c 0.591,0.15 1.193,0.267 1.818,0.267 0.915,0 1.355,-0.429 1.355,-1.112 0,-0.717 -0.417,-0.984 -1.529,-1.609 -0.949,-0.532 -1.633,-1.17 -1.633,-2.432 0,-1.587 1.204,-2.352 2.872,-2.352 0.591,0 1.182,0.058 1.772,0.174 V 8.015 C 16.039,7.9 15.622,7.829 15.055,7.829 c -0.753,0 -1.205,0.348 -1.205,0.974 0,0.672 0.486,0.984 1.332,1.425 1.123,0.59 1.83,1.263 1.83,2.502 0.002,1.839 -1.261,2.604 -3.149,2.604 z m 6.719,0 c -2.815,0 -3.268,-2.433 -3.268,-4.425 0,-1.98 0.521,-4.192 3.268,-4.192 2.744,0 3.254,2.212 3.254,4.192 0,2.005 -0.44,4.425 -3.254,4.425 z"
+     id="path3041"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 20.582,7.828 c -1.193,0 -1.286,1.506 -1.286,3.081 0,1.575 0.139,3.313 1.286,3.313 1.192,0 1.273,-1.714 1.273,-3.313 0,-1.575 -0.115,-3.081 -1.273,-3.081 z"
+     id="path3043"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 9.987,18.451 c 1.599,0 2.78,0.718 2.78,2.177 0,0.903 -0.395,1.599 -1.297,1.945 0.996,0.29 1.448,1.136 1.448,2.108 0,1.563 -1.158,2.374 -2.965,2.374 -1.772,0 -2.918,-0.822 -2.918,-2.374 0,-0.962 0.44,-1.842 1.436,-2.108 -0.903,-0.347 -1.286,-1.042 -1.286,-1.945 0,-1.459 1.193,-2.177 2.802,-2.177 z m -0.023,4.667 c -0.753,0 -1.054,0.602 -1.054,1.401 0,0.799 0.266,1.482 1.054,1.482 0.811,0 1.077,-0.648 1.077,-1.482 10e-4,-0.788 -0.358,-1.401 -1.077,-1.401 z m 0,-3.613 c -0.707,0 -0.938,0.579 -0.938,1.297 0,0.706 0.267,1.297 0.938,1.297 0.683,0 0.961,-0.579 0.961,-1.297 10e-4,-0.765 -0.242,-1.297 -0.961,-1.297 z"
+     id="path3045"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 16.231,27.056 c -2.629,0 -2.849,-2.235 -2.849,-4.401 0,-1.957 0.313,-4.203 2.896,-4.203 2.548,0 2.826,2.223 2.826,4.203 0,2.189 -0.267,4.401 -2.873,4.401 z m 0,-7.551 c -0.915,0 -0.973,1.228 -0.973,3.149 0,2.236 0.093,3.348 0.973,3.348 0.869,0 0.95,-1.111 0.95,-3.348 0,-1.933 -0.046,-3.149 -0.95,-3.149 z"
+     id="path3047"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 22.486,27.056 c -2.629,0 -2.85,-2.235 -2.85,-4.401 0,-1.957 0.313,-4.203 2.896,-4.203 2.548,0 2.826,2.223 2.826,4.203 0,2.189 -0.266,4.401 -2.872,4.401 z m 0,-7.551 c -0.915,0 -0.973,1.228 -0.973,3.149 0,2.236 0.092,3.348 0.973,3.348 0.868,0 0.949,-1.111 0.949,-3.348 0.001,-1.933 -0.045,-3.149 -0.949,-3.149 z"
+     id="path3049"
+     inkscape:connector-curvature="0" /></g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-iso-auto.svg b/icons/icon-m-camera-iso-auto.svg
new file mode 100644
index 0000000..289f5a3
--- /dev/null
+++ b/icons/icon-m-camera-iso-auto.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-iso-auto-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-iso-auto.svg"><metadata
+   id="metadata22"><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><defs
+   id="defs20">
+	
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview18"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-iso-auto-layer" />
+<rect
+   y="0"
+   x="0"
+   id="rect4"
+   height="32"
+   width="32"
+   style="fill:none" /><g
+   id="g3020"
+   transform="matrix(1.2378257,0,0,1.2378257,-3.6325344,-1.0411312)"><path
+     style="fill:#ffffff"
+     d="M 11.325839,25.738538 H 9.6581835 L 9.3151823,24.29955 H 7.429253 l -0.3533952,1.438988 h -1.42051 l 1.9436735,-6.937401 h 1.9067172 l 1.8201005,6.937401 z M 9.124626,23.38488 8.3820342,20.125791 7.6198093,23.38488 H 9.124626 z"
+     id="path6"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="M 15.432615,24.918569 C 15.002997,25.538743 14.470594,25.824 13.736087,25.824 c -1.181449,0 -1.771596,-0.666369 -1.771596,-1.801623 v -3.754535 h 1.533689 v 3.61133 c 0,0.562429 0.08546,1.030158 0.65713,1.030158 0.724114,0 0.896192,-0.724114 0.896192,-1.372005 v -3.268328 h 1.534844 v 5.469541 h -0.934303 l -0.219428,-0.819969 z"
+     id="path8"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 20.767034,25.624205 c -0.437702,0.114333 -0.952781,0.190556 -1.400877,0.190556 -0.904276,0 -1.419355,-0.362634 -1.419355,-1.306176 v -3.40114 h -0.666369 v -0.51508 l 1.563716,-1.5718 h 0.638652 v 1.248432 h 1.199926 v 0.839602 h -1.199926 v 3.182867 c 0,0.428463 0.06698,0.65713 0.504685,0.65713 0.286412,0 0.543951,-0.05774 0.781858,-0.123573 v 0.799182 z"
+     id="path10"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 23.559549,25.814761 c -1.857057,0 -2.496864,-1.277304 -2.496864,-2.89761 0,-1.600672 0.868475,-2.724376 2.516497,-2.724376 1.705767,0 2.48647,1.132943 2.48647,2.763642 0,1.704613 -0.789942,2.858344 -2.506103,2.858344 z m 0,-4.783539 c -0.847686,0 -0.91467,1.048637 -0.91467,1.858212 0,0.818814 0.03811,2.08688 0.91467,2.08688 0.877714,0 0.925064,-1.12486 0.925064,-2.08688 0,-0.752986 -0.114334,-1.858212 -0.925064,-1.858212 z"
+     id="path12"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="M 6.7317017,1.7099754 V 16.202643 H 25.312666 V 1.7099754 H 6.7317017 z m 4.2268833,3.4392512 h -0.802646 v 7.1683784 h 0.802646 v 1.284234 H 7.145151 V 12.317605 H 7.9489518 V 5.1492266 H 7.145151 V 3.8638382 h 3.812279 v 1.2853884 z m 2.59503,8.5600164 c -0.748367,0 -1.52445,-0.09355 -2.247409,-0.266778 V 12.11781 c 0.682538,0.173233 1.377779,0.308355 2.099583,0.308355 1.056721,0 1.564871,-0.495446 1.564871,-1.284234 0,-0.828053 -0.481587,-1.136408 -1.765821,-1.8582117 C 12.108852,8.6693198 11.31891,7.9325024 11.31891,6.475036 c 0,-1.8328045 1.390483,-2.7162924 3.316833,-2.7162924 0.682538,0 1.365076,0.066983 2.046459,0.2009502 V 5.256631 C 16.066647,5.1238191 15.58506,5.0418222 14.930239,5.0418222 c -0.869629,0 -1.391638,0.4019004 -1.391638,1.1248592 0,0.7760835 0.561275,1.136408 1.538309,1.6457128 1.296937,0.6813829 2.113442,1.4586214 2.113442,2.8895258 0.0023,2.123835 -1.456312,3.007323 -3.636737,3.007323 z m 7.75968,0 c -3.251004,0 -3.774168,-2.809838 -3.774168,-5.1103712 0,-2.2866748 0.601696,-4.8412831 3.774168,-4.8412831 3.169008,0 3.758,2.5546083 3.758,4.8412831 0,2.3155472 -0.50815,5.1103712 -3.758,5.1103712 z"
+     id="path14"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#ffffff"
+     d="m 21.313295,5.0406673 c -1.377779,0 -1.485183,1.7392586 -1.485183,3.5582045 0,1.8189462 0.160529,3.8261382 1.485183,3.8261382 1.376625,0 1.470171,-1.979475 1.470171,-3.8261382 0,-1.8189459 -0.132812,-3.5582045 -1.470171,-3.5582045 z"
+     id="path16"
+     inkscape:connector-curvature="0" /></g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-location.svg b/icons/icon-m-camera-location.svg
new file mode 100644
index 0000000..b95dd02
--- /dev/null
+++ b/icons/icon-m-camera-location.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-location-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-location">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M16,0.049c-5.241,0.06-9.471,3.875-9.471,8.58c0,1.503,0.433,2.914,1.19,4.143h0
+		c0.252,0.409,1.681,2.448,2.001,2.813c3.293,4.705,4.917,10.232,6.209,16.366h0.141c1.292-6.134,2.916-11.661,6.209-16.366
+		c0.32-0.365,1.749-2.404,2.001-2.813l0.001-0.001c0.757-1.229,1.189-2.64,1.189-4.143C25.471,3.924,21.241,0.108,16,0.049z
+		 M16.178,11.597c-1.711,0-3.097-1.382-3.097-3.088s1.386-3.088,3.097-3.088c1.709,0,3.097,1.382,3.097,3.088
+		S17.887,11.597,16.178,11.597z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-night-screen.svg b/icons/icon-m-camera-night-screen.svg
new file mode 100644
index 0000000..717318b
--- /dev/null
+++ b/icons/icon-m-camera-night-screen.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-night-screen-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-night-screen.svg"><metadata
+   id="metadata12"><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><defs
+   id="defs10" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="687"
+   inkscape:window-height="480"
+   id="namedview8"
+   showgrid="false"
+   inkscape:zoom="7.375"
+   inkscape:cx="16"
+   inkscape:cy="16"
+   inkscape:window-x="168"
+   inkscape:window-y="168"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="icon-m-camera-night-screen-layer" />
+<g
+   id="icon-m-camera-night-screen"
+   transform="matrix(0.89035061,0,0,0.89035061,1.7543902,1.7543902)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect4"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 21.5,0.5 c 1.441,0 3.174,0.137 4.5,0.5 -7,2 -11.5,7.5 -11.5,15 0,7.5 4.5,13 11.5,15 -1.326,0.363 -2.559,0.5 -4,0.5 C 13.5,31.5 6,25.5 5.956,16.118 5.914,7.42 12.5,0.5 21.5,0.5 z"
+   id="path6"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-ongoing-recording.svg b/icons/icon-m-camera-ongoing-recording.svg
new file mode 100644
index 0000000..3c49694
--- /dev/null
+++ b/icons/icon-m-camera-ongoing-recording.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-ongoing-recording-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-ongoing-recording">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#ED1D37;" d="M16,4.375C9.59,4.375,4.375,9.59,4.375,16S9.59,27.625,16,27.625c6.41,0,11.625-5.215,11.625-11.625
+		S22.41,4.375,16,4.375z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-roll.svg b/icons/icon-m-camera-roll.svg
new file mode 100644
index 0000000..e6c7d24
--- /dev/null
+++ b/icons/icon-m-camera-roll.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-roll-layer" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="48px" height="48px" viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<g id="icon-m-camera-roll">
+	<rect style="fill:none;" width="48" height="48"/>
+	<path style="fill:#FFFFFF;" d="M27,8.25h-7.5v-3c0-0.791-0.711-1.5-1.5-1.5h-6.75c-0.789,0-1.5,0.709-1.5,1.5v3h-7.5
+		c-2.25,0-1.5,3,0,3V42c-1.5,0-2.25,2.926,0,2.926H27c2.25,0,1.5-2.926,0-2.926V11.25C28.5,11.25,29.25,8.25,27,8.25z M10.5,42H6
+		V11.176h4.5V42z"/>
+	<path style="fill:#FFFFFF;" d="M30,12.75v27h4.5v-7.5c0-2.25,0.75-3.824,3-3.824l9.75,0.074V12.75H30z M34.5,21h-3v-6.074l3,0.074
+		V21z M39.75,21h-3v-6.074l3,0.074V21z M45,21h-3v-6.074L45,15V21z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-scene-auto-screen.svg b/icons/icon-m-camera-scene-auto-screen.svg
new file mode 100644
index 0000000..de0714c
--- /dev/null
+++ b/icons/icon-m-camera-scene-auto-screen.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-scene-auto-screen-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-scene-auto-screen.svg"><metadata
+   id="metadata14"><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><defs
+   id="defs12">
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview10"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="13.189709"
+   inkscape:cy="15.784327"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-scene-auto-screen-layer" />
+<rect
+   y="1.3157926"
+   x="1.3157926"
+   id="rect4"
+   height="29.368414"
+   width="29.368414"
+   style="fill:none" /><path
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+   d="M 16 1.15625 C 7.8037744 1.15625 1.15625 7.8037744 1.15625 16 C 1.15625 24.196226 7.8037744 30.84375 16 30.84375 C 24.196226 30.84375 30.84375 24.196226 30.84375 16 C 30.84375 7.8037744 24.196226 1.15625 16 1.15625 z M 16 3.53125 C 23.32302 3.53125 29.25 9.1135829 29.25 16 C 29.25 22.886417 23.32302 28.46875 16 28.46875 C 8.6769801 28.46875 2.75 22.886417 2.75 16 C 2.75 9.1135829 8.6769801 3.53125 16 3.53125 z "
+   id="path3013" /><path
+   inkscape:connector-curvature="0"
+   id="path6"
+   d="m 13.233862,20.22951 h 5.230332 l 1.036154,3.586618 h 2.377006 L 17.295881,8.1829539 H 14.790388 L 10.122646,23.817046 h 2.075062 l 1.036154,-3.587536 z m 2.636733,-9.707178 2.181523,8.140557 h -4.408016 l 2.226493,-8.140557 z"
+   style="fill:#ffffff;fill-opacity:1" />
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-scene-landscape-screen.svg b/icons/icon-m-camera-scene-landscape-screen.svg
new file mode 100644
index 0000000..61b94a5
--- /dev/null
+++ b/icons/icon-m-camera-scene-landscape-screen.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-scene-landscape-screen-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-scene-landscape-screen.svg"><metadata
+   id="metadata3003"><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><defs
+   id="defs3001" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="687"
+   inkscape:window-height="480"
+   id="namedview2999"
+   showgrid="false"
+   inkscape:zoom="7.375"
+   inkscape:cx="16"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="icon-m-camera-scene-landscape-screen-layer" />
+<g
+   id="icon-m-camera-scene-landscape-screen"
+   transform="matrix(0.90993086,0,0,0.90993086,1.4411062,1.4411062)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect2993"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 20.598,10.326 c 0.658,0 1.252,-0.252 1.709,-0.658 0.612,0.872 1.479,1.421 2.443,1.421 0.963,0 1.83,-0.549 2.443,-1.421 0.457,0.406 1.05,0.658 1.707,0.658 1.438,0 2.598,-1.17 2.598,-2.612 0,-1.443 -1.16,-2.613 -2.598,-2.613 -0.332,0 -0.646,0.069 -0.938,0.183 C 27.544,3.436 26.265,2.09 24.749,2.09 23.233,2.09 21.954,3.437 21.536,5.284 21.245,5.171 20.93,5.101 20.597,5.101 19.163,5.101 18,6.271 18,7.714 c 0,1.442 1.163,2.612 2.598,2.612 z"
+   id="path2995"
+   inkscape:connector-curvature="0" />
+	<path
+   style="fill:#ffffff"
+   d="M 19,20.5 C 15.128,11.546 7.753,0.303 0.499,27.5 h 31 C 31.498,27.5 25.451,6.224 19,20.5 z"
+   id="path2997"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-scene-macro-screen.svg b/icons/icon-m-camera-scene-macro-screen.svg
new file mode 100644
index 0000000..9c77d18
--- /dev/null
+++ b/icons/icon-m-camera-scene-macro-screen.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-scene-macro-screen-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-scene-macro-screen.svg"><metadata
+   id="metadata3015"><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><defs
+   id="defs3013" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="687"
+   inkscape:window-height="480"
+   id="namedview3011"
+   showgrid="false"
+   inkscape:zoom="7.375"
+   inkscape:cx="16"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="icon-m-camera-scene-macro-screen-layer" />
+<g
+   id="icon-m-camera-scene-macro-screen"
+   transform="matrix(0.93342716,0,0,0.93342716,1.0651654,1.0651654)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect3007"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 17.59,29.883 v -4.5 c 0.395,0.595 0.699,0.854 1.154,1.148 1.969,1.266 4.773,1.223 6.977,0.629 4.568,-1.225 5.869,-5.561 5.869,-9.777 -0.859,0.334 -9.338,3.768 -12.924,5.148 -0.441,0.172 -0.701,0.551 -1.076,0.852 v -7 c 3.768,-0.613 6.352,-3.85 6.352,-7.791 0,-1.943 -0.701,-3.723 -1.861,-5.1 l -2.49,6.391 -3.5,-8 -3.5,8 -2.5,-6.5 c -1.152,1.377 -2,3.275 -2,5.209 0,3.941 2.731,7.178 6.5,7.791 v 7 C 14.216,23.061 13.789,22.766 13.334,22.59 9.749,21.209 1.45,17.713 0.591,17.383 c 0,4.22 1.12,8.607 5.688,9.836 2.205,0.592 5.009,0.639 6.979,-0.629 0.469,-0.301 0.937,-0.59 1.333,-1.207 v 4.5 h 2.999 z"
+   id="path3009"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-scene-portrait-screen.svg b/icons/icon-m-camera-scene-portrait-screen.svg
new file mode 100644
index 0000000..07347ba
--- /dev/null
+++ b/icons/icon-m-camera-scene-portrait-screen.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-scene-portrait-screen-layer"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-scene-portrait-screen.svg"><metadata
+   id="metadata3031"><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><defs
+   id="defs3029" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3027"
+   showgrid="false"
+   inkscape:zoom="9.6458333"
+   inkscape:cx="7.4643629"
+   inkscape:cy="24"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-scene-portrait-screen-layer" />
+<g
+   id="icon-m-camera-scene-portrait-screen"
+   transform="matrix(1.3644545,0,0,1.3644545,2.168728,2.168728)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect3019"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="M 19.854,10.478 19.85,8.904 C 18.324,8.685 17.211,7.929 16.371,7.201 c -0.089,0.18 -0.189,0.359 -0.3,0.535 -0.306,0.488 -0.68,0.941 -1.112,1.346 -1.418,1.332 -3.012,1.486 -4.086,1.486 -0.303,0 -0.598,-0.016 -0.887,-0.029 -0.008,0.119 -0.022,0.232 -0.022,0.357 0,3.432 3.391,7.865 6.018,7.865 2.627,0 5.869,-4.703 5.869,-8.135 0,-0.051 -0.008,-0.094 -0.009,-0.145 l -1.988,-0.003 z"
+   id="path3021"
+   inkscape:connector-curvature="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 15.818,0.762 c -3.936,0 -7.125,3.189 -7.125,7.123 0,0.23 0.014,0.455 0.034,0.682 1.794,0 3.468,0.475 4.918,-0.885 0.294,-0.277 0.572,-0.605 0.798,-0.965 0.253,-0.404 0.44,-0.85 0.512,-1.307 0.025,-0.156 0.135,-1.789 0.01,-1.855 0.841,0.439 1.402,1.002 1.976,1.555 0.897,0.863 2.013,1.938 3.803,1.938 0.333,0 0.672,-0.039 1.02,-0.117 0,0.002 0,0.002 0,0.004 l 0.012,-0.008 v 1.637 l 1.131,0.004 C 22.928,8.341 22.942,8.117 22.942,7.886 22.941,3.951 19.752,0.762 15.818,0.762 z"
+   id="path3023"
+   inkscape:connector-curvature="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 23,17.5 -7,11 -7,-11 C 5.5,19 3.5,22 3.5,26 v 5.5 h 25 L 28.492,25.953 C 28.5,22.5 26.5,19 23,17.5 z"
+   id="path3025"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-scene-sports-screen.svg b/icons/icon-m-camera-scene-sports-screen.svg
new file mode 100644
index 0000000..fce1c74
--- /dev/null
+++ b/icons/icon-m-camera-scene-sports-screen.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-camera-scene-sports-screen-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-camera-scene-sports-screen.svg"><metadata
+   id="metadata3045"><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><defs
+   id="defs3043" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview3041"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-camera-scene-sports-screen-layer" />
+<g
+   id="icon-m-camera-scene-sports-screen"
+   transform="matrix(0.93711619,0,0,0.93711619,1.006141,1.006141)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect3035"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="m 28.945,17.43 h -1.508 c -0.826,0 -1.619,-0.658 -1.766,-1.465 L 25.405,14.526 C 25.259,13.721 24.661,12.59 24.073,12.012 L 20.053,8.055 C 19.467,7.477 18.326,6.858 17.522,6.682 L 15.467,6.225 C 14.661,6.047 13.513,6.362 12.913,6.924 L 10.268,9.4 c -0.601,0.564 -0.661,1.486 -0.137,2.053 0.521,0.563 1.465,0.588 2.091,0.053 l 1.602,-1.371 c 0.625,-0.535 1.353,-0.725 1.611,-0.42 0.259,0.305 0.013,1.039 -0.559,1.629 l -3.707,3.85 C 10.6,15.792 10.052,16.936 9.953,17.753 L 9.72,19.686 C 9.619,20.499 9.005,21.575 8.352,22.075 L 2.016,26.93 c -0.651,0.5 -0.836,1.482 -0.408,2.182 l 0.412,0.674 c 0.432,0.699 1.327,0.885 1.995,0.4 l 7.817,-5.613 c 0.669,-0.479 1.405,-0.656 1.64,-0.396 0.233,0.26 -0.103,0.893 -0.745,1.4 l -1.896,1.512 c -0.646,0.514 -0.749,1.455 -0.232,2.094 l 0.375,0.461 c 0.521,0.639 1.479,0.756 2.129,0.256 l 6.479,-4.926 c 0.65,-0.498 0.76,-1.422 0.23,-2.053 l -1.818,-2.184 c -0.525,-0.629 -0.479,-1.621 0.104,-2.195 l 3.074,-3.059 c 0.584,-0.578 1.203,-0.395 1.381,0.402 l 0.633,2.883 c 0.178,0.799 0.996,1.455 1.82,1.455 h 3.941 c 0.824,0 1.5,-0.627 1.5,-1.396 C 30.445,18.059 29.77,17.43 28.945,17.43 z"
+   id="path3037"
+   inkscape:connector-curvature="0" />
+	<ellipse
+   style="fill:#ffffff"
+   cx="25.976999"
+   cy="5.4699998"
+   rx="4.23"
+   ry="4.2020001"
+   id="ellipse3039"
+   d="m 30.206999,5.4699998 c 0,2.3207006 -1.893835,4.2020001 -4.23,4.2020001 -2.336164,0 -4.23,-1.8812995 -4.23,-4.2020001 0,-2.3207006 1.893836,-4.2020002 4.23,-4.2020002 2.336165,0 4.23,1.8812996 4.23,4.2020002 z"
+   sodipodi:cx="25.976999"
+   sodipodi:cy="5.4699998"
+   sodipodi:rx="4.23"
+   sodipodi:ry="4.2020001" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icon-m-camera-video-fine-resolution.svg b/icons/icon-m-camera-video-fine-resolution.svg
new file mode 100644
index 0000000..a4da9a9
--- /dev/null
+++ b/icons/icon-m-camera-video-fine-resolution.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-video-fine-resolution-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-video-fine-resolution">
+	<rect style="fill:none;" width="32" height="32"/>
+	<polygon style="fill:#FFFFFF;" points="27.25,27.25 27.25,14.443 24.688,14.443 24.688,17.004 22.127,17.004 22.127,19.566 
+		19.565,19.566 19.565,22.127 17.004,22.127 17.004,24.688 14.443,24.688 14.443,27.25 	"/>
+	<path style="fill:#FFFFFF;" d="M14.895,20.018h2.562v-2.561h2.562v-1.061l-9.439,0.01v-0.011h-0.005V9.408h0.005V9.397h9.894v5.497
+		h2.038V9.408h0.873V8.535h-0.937c-0.191,0-0.348-0.468-0.348-0.659V6.485c0-0.191,0.156-0.348,0.348-0.348h0.937V4.75H4.75v1.371
+		v0.017h0.945c0.191,0,0.348,0.156,0.348,0.348V7.86c0,0.19-0.157,0.658-0.348,0.658H4.75v0.017v0.862v0.011h4.076v6.987H4.75v0.011
+		v1.154v0.016h0.945c0.191,0,0.348,0.157,0.348,0.348V19.3c0,0.19-0.157,0.347-0.348,0.347H4.75v0.017v1.1h10.145V20.018z
+		 M17.577,6.485c0-0.191,0.156-0.348,0.349-0.348h1.391c0.19,0,0.348,0.156,0.348,0.348v1.391c0,0.191-0.157,0.659-0.348,0.659
+		h-1.391c-0.192,0-0.349-0.468-0.349-0.659V6.485z M13.041,6.485c0-0.191,0.158-0.348,0.349-0.348h1.391
+		c0.191,0,0.348,0.156,0.348,0.348v1.391c0,0.191-0.156,0.659-0.348,0.659h-1.391c-0.191,0-0.349-0.468-0.349-0.659V6.485z
+		 M8.492,7.86V6.485c0-0.191,0.156-0.348,0.347-0.348h1.391c0.192,0,0.348,0.156,0.348,0.348V7.86c0,0.19-0.156,0.658-0.348,0.658
+		H8.839C8.647,8.519,8.492,8.051,8.492,7.86z M10.578,19.3c0,0.19-0.156,0.347-0.348,0.347H8.839c-0.191,0-0.347-0.156-0.347-0.347
+		v-1.376c0-0.19,0.156-0.348,0.347-0.348h1.391c0.192,0,0.348,0.157,0.348,0.348V19.3z M13.041,19.3v-1.392
+		c0-0.191,0.158-0.348,0.349-0.348h1.391c0.191,0,0.348,0.156,0.348,0.348V19.3c0,0.19-0.156,0.347-0.348,0.347h-1.391
+		C13.198,19.646,13.041,19.49,13.041,19.3z"/>
+	<path style="fill:none;" d="M23.739,8.037c0.046,0.015,0.091,0.031,0.136,0.046V8.037H23.739z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-video-high-resolution.svg b/icons/icon-m-camera-video-high-resolution.svg
new file mode 100644
index 0000000..181a53c
--- /dev/null
+++ b/icons/icon-m-camera-video-high-resolution.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-video-high-resolution-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-video-high-resolution">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M27.25,27.25V14.443c-7.073,0-12.807,5.733-12.807,12.807H27.25z"/>
+	<path style="fill:#FFFFFF;" d="M14.424,19.646h-1.035c-0.191,0-0.349-0.156-0.349-0.347v-1.392c0-0.191,0.158-0.348,0.349-0.348
+		h1.391c0.191,0,0.348,0.156,0.348,0.348v0.666c0.563-0.785,1.2-1.514,1.902-2.175l-6.452,0.008v-0.012h-0.005V9.408h0.005V9.397
+		h9.894v4.572c0.653-0.335,1.333-0.622,2.038-0.859V9.408h0.873V8.535h-0.937c-0.192,0-0.348-0.467-0.348-0.658V6.485
+		c0-0.191,0.155-0.348,0.348-0.348h0.937V4.75H4.75v1.371v0.017h0.945c0.191,0,0.348,0.156,0.348,0.348V7.86
+		c0,0.19-0.157,0.658-0.348,0.658H4.75v0.017v0.862v0.011h4.076v6.987H4.75v0.012v1.153v0.016h0.945
+		c0.191,0,0.348,0.156,0.348,0.348V19.3c0,0.19-0.157,0.347-0.348,0.347H4.75v0.017v1.1h9.07
+		C14.005,20.381,14.208,20.01,14.424,19.646z M17.577,6.485c0-0.191,0.156-0.348,0.349-0.348h1.391c0.19,0,0.348,0.156,0.348,0.348
+		v1.392c0,0.191-0.157,0.658-0.348,0.658h-1.391c-0.192,0-0.349-0.467-0.349-0.658V6.485z M13.041,6.485
+		c0-0.191,0.158-0.348,0.349-0.348h1.391c0.191,0,0.348,0.156,0.348,0.348v1.392c0,0.191-0.156,0.658-0.348,0.658h-1.391
+		c-0.191,0-0.349-0.467-0.349-0.658V6.485z M8.492,7.86V6.485c0-0.191,0.156-0.348,0.347-0.348h1.392
+		c0.191,0,0.348,0.156,0.348,0.348V7.86c0,0.19-0.156,0.658-0.348,0.658H8.839C8.647,8.519,8.492,8.051,8.492,7.86z M10.578,19.3
+		c0,0.19-0.156,0.347-0.348,0.347H8.839c-0.191,0-0.347-0.156-0.347-0.347v-1.376c0-0.191,0.156-0.348,0.347-0.348h1.392
+		c0.191,0,0.348,0.156,0.348,0.348V19.3z"/>
+	<path style="fill:none;" d="M23.739,8.037c0.046,0.015,0.091,0.031,0.136,0.046V8.037H23.739z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-video-low-resolution.svg b/icons/icon-m-camera-video-low-resolution.svg
new file mode 100644
index 0000000..514a264
--- /dev/null
+++ b/icons/icon-m-camera-video-low-resolution.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-video-low-resolution-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-video-low-resolution">
+	<rect style="fill:none;" width="32" height="32"/>
+	<polygon style="fill:#FFFFFF;" points="27.25,27.249 27.25,13.499 22.664,13.499 22.664,18.084 18.078,18.084 18.078,22.671 
+		18.078,22.67 13.493,22.67 13.493,27.25 	"/>
+	<path style="fill:#FFFFFF;" d="M20.555,11.39h1.955V9.408h0.873V8.535h-0.937c-0.191,0-0.348-0.468-0.348-0.659V6.485
+		c0-0.191,0.156-0.348,0.348-0.348h0.937V4.75H4.75v1.371v0.017h0.945c0.191,0,0.348,0.156,0.348,0.348V7.86
+		c0,0.19-0.157,0.658-0.348,0.658H4.75v0.017v0.862v0.011h4.076v6.987H4.75v0.011v1.154v0.016h0.945
+		c0.191,0,0.348,0.157,0.348,0.348V19.3c0,0.19-0.157,0.347-0.348,0.347H4.75v0.017v1.1h6.633v-0.202h4.585V16.4l-5.391,0.006
+		v-0.011h-0.005V9.408h0.005V9.397h9.894 M13.041,17.908c0-0.191,0.158-0.348,0.349-0.348h1.391c0.191,0,0.348,0.156,0.348,0.348
+		V19.3c0,0.19-0.156,0.347-0.348,0.347h-1.391c-0.191,0-0.349-0.156-0.349-0.347V17.908z M17.577,6.485
+		c0-0.191,0.156-0.348,0.349-0.348h1.391c0.19,0,0.348,0.156,0.348,0.348v1.391c0,0.191-0.157,0.659-0.348,0.659h-1.391
+		c-0.192,0-0.349-0.468-0.349-0.659V6.485z M13.041,6.485c0-0.191,0.158-0.348,0.349-0.348h1.391c0.191,0,0.348,0.156,0.348,0.348
+		v1.391c0,0.191-0.156,0.659-0.348,0.659h-1.391c-0.191,0-0.349-0.468-0.349-0.659V6.485z M8.492,7.86V6.485
+		c0-0.191,0.156-0.348,0.347-0.348h1.391c0.192,0,0.348,0.156,0.348,0.348V7.86c0,0.19-0.156,0.658-0.348,0.658H8.839
+		C8.647,8.519,8.492,8.051,8.492,7.86z M10.578,19.3c0,0.19-0.156,0.347-0.348,0.347H8.839c-0.191,0-0.347-0.156-0.347-0.347v-1.376
+		c0-0.19,0.156-0.348,0.347-0.348h1.391c0.192,0,0.348,0.157,0.348,0.348V19.3z"/>
+	<path style="fill:none;" d="M23.739,8.037c0.046,0.015,0.091,0.031,0.136,0.046V8.037H23.739z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-video-night-screen.svg b/icons/icon-m-camera-video-night-screen.svg
new file mode 100644
index 0000000..aceabd0
--- /dev/null
+++ b/icons/icon-m-camera-video-night-screen.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-video-night-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-video-night-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M29.848,0.74c0.571,0,1.124,0.078,1.649,0.223c-2.649,0.723-4.506,3.146-4.506,6.027
+		c0,2.879,1.856,5.303,4.506,6.027c-0.525,0.145-1.078,0.223-1.649,0.223c-3.452,0-6.189-2.799-6.189-6.25S26.396,0.74,29.848,0.74z
+		"/>
+	<path style="fill:#FFFFFF;" d="M30.59,17.24l-4,1c0,0-0.5,0-0.5,1v0.5h-3.5v-1.5c0-0.465-0.537-1-1-1h-16c-0.5,0-0.5,0.5-0.5,0.5
+		l-4-1c0,0-0.5,0.035-0.5,0.5v4.5c0,0.5,0.5,0.5,0.5,0.5l4-1v9.5c0,1,1.5,0.949,1.5,0.949h14.5c1,0,1.5-0.949,1.5-0.949v-6.051h3.5
+		v0.551c0,1,1,1.5,1,1.5l3.5,0.5c0,0,1,0,1-0.5v-9C31.59,17.24,30.59,17.24,30.59,17.24z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-video.svg b/icons/icon-m-camera-video.svg
new file mode 100644
index 0000000..c21382a
--- /dev/null
+++ b/icons/icon-m-camera-video.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-video-layer" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="48px" height="48px" viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<g id="icon-m-camera-video">
+	<rect style="fill:none;" width="48" height="48"/>
+	<path style="fill:#FFFFFF;" d="M45.884,13.537l-6,1.5c0,0-0.75,0-0.75,1.5v0.75h-5.25v-2.25c0-0.695-0.805-1.5-1.5-1.5h-24
+		c-0.75,0-0.75,0.75-0.75,0.75l-6-1.5c0,0-0.75,0.055-0.75,0.75v6.75c0,0.75,0.75,0.75,0.75,0.75l6-1.5v14.25
+		c0,1.5,2.25,1.425,2.25,1.425h21.75c1.5,0,2.25-1.425,2.25-1.425v-9.075h5.25v0.825c0,1.5,1.5,2.25,1.5,2.25l5.25,0.75
+		c0,0,1.5,0,1.5-0.75v-13.5C47.384,13.537,45.884,13.537,45.884,13.537z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-whitebalance-auto-screen.svg b/icons/icon-m-camera-whitebalance-auto-screen.svg
new file mode 100644
index 0000000..1205f05
--- /dev/null
+++ b/icons/icon-m-camera-whitebalance-auto-screen.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-whitebalance-auto-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-whitebalance-auto-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M12.41,9.028c1.818,0,3.296,1.479,3.296,3.296s-1.479,3.297-3.296,3.297
+		c-1.817,0-3.296-1.479-3.296-3.297S10.593,9.028,12.41,9.028 M12.41,7.028c-2.925,0-5.296,2.371-5.296,5.296
+		c0,2.926,2.371,5.297,5.296,5.297c2.924,0,5.296-2.371,5.296-5.297C17.706,9.399,15.333,7.028,12.41,7.028L12.41,7.028z"/>
+	<path style="fill:#FFFFFF;" d="M13.625,4.586V1.773c0-0.507-0.441-0.948-0.946-0.946l-0.356-0.002
+		c-0.522,0.002-0.948,0.426-0.948,0.947v2.814c0,0.253,0.098,0.49,0.279,0.67c0.178,0.18,0.417,0.278,0.668,0.277h0.355
+		c0.252,0,0.49-0.1,0.67-0.277C13.526,5.077,13.625,4.839,13.625,4.586z"/>
+	<path style="fill:#FFFFFF;" d="M4.628,11.375H1.814c-0.505,0-0.947,0.442-0.947,0.946l0,0.357c0,0.521,0.426,0.946,0.947,0.946
+		h2.814c0.253,0,0.49-0.099,0.67-0.278c0.178-0.179,0.277-0.416,0.277-0.668v-0.357c0-0.251-0.099-0.489-0.278-0.669
+		C5.118,11.474,4.88,11.375,4.628,11.375z"/>
+	<path style="fill:#FFFFFF;" d="M23.054,11.375H20.24c-0.506,0-0.949,0.442-0.947,0.946l-0.002,0.357
+		c0.002,0.521,0.427,0.946,0.948,0.946h2.814c0.253,0,0.49-0.099,0.67-0.278C23.902,13.168,24,12.931,24,12.679v-0.357
+		c0-0.251-0.098-0.489-0.277-0.669C23.543,11.474,23.305,11.375,23.054,11.375z"/>
+	<path style="fill:#FFFFFF;" d="M7.726,6.093l-1.99-1.99c-0.357-0.356-0.983-0.356-1.339,0L4.146,4.355
+		c-0.37,0.37-0.37,0.97,0,1.339l1.989,1.99c0.179,0.179,0.416,0.276,0.67,0.276s0.492-0.098,0.67-0.276l0.251-0.251
+		c0.179-0.179,0.277-0.418,0.277-0.671C8.003,6.509,7.905,6.272,7.726,6.093z"/>
+	<path style="fill:#FFFFFF;" d="M20.834,4.355l-0.252-0.253c-0.356-0.356-0.981-0.356-1.338,0l-1.99,1.99
+		c-0.37,0.369-0.37,0.97,0,1.341l0.252,0.251c0.178,0.179,0.416,0.276,0.67,0.276c0.253,0,0.49-0.098,0.67-0.276l1.988-1.99
+		C21.203,5.325,21.203,4.726,20.834,4.355z"/>
+	<path style="fill:#FFFFFF;" d="M13.625,22.878v-2.814c0-0.505-0.441-0.947-0.946-0.946l-0.356-0.001
+		c-0.522,0.001-0.948,0.426-0.948,0.947v2.814c0,0.254,0.098,0.49,0.279,0.67c0.178,0.179,0.417,0.277,0.668,0.277h0.355
+		c0.252,0,0.49-0.099,0.67-0.278C13.526,23.367,13.625,23.13,13.625,22.878z"/>
+	<path style="fill:#FFFFFF;" d="M17.254,18.558l1.99,1.989c0.356,0.356,0.982,0.356,1.338,0l0.252-0.251
+		c0.369-0.37,0.369-0.972,0-1.34l-1.988-1.99c-0.182-0.178-0.417-0.277-0.671-0.277c-0.253,0-0.491,0.1-0.669,0.277l-0.252,0.252
+		c-0.179,0.178-0.277,0.416-0.277,0.669C16.977,18.141,17.075,18.379,17.254,18.558z"/>
+	<path style="fill:#FFFFFF;" d="M4.146,20.296l0.252,0.251c0.356,0.356,0.981,0.356,1.339,0l1.99-1.989
+		c0.369-0.37,0.369-0.971,0-1.34l-0.252-0.252c-0.178-0.178-0.416-0.277-0.669-0.277s-0.492,0.1-0.67,0.277l-1.989,1.99
+		C3.775,19.324,3.775,19.926,4.146,20.296z"/>
+	<path style="fill:#FFFFFF;" d="M27.159,18h-3.13L20,31.5h2.273l0.896-3.097h4.516l0.896,3.097h2.534L27.159,18z M23.603,26.694
+		l1.845-6.672l1.826,6.701L23.603,26.694z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-whitebalance-cloudy-screen.svg b/icons/icon-m-camera-whitebalance-cloudy-screen.svg
new file mode 100644
index 0000000..acde7d7
--- /dev/null
+++ b/icons/icon-m-camera-whitebalance-cloudy-screen.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-whitebalance-cloudy-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-whitebalance-cloudy-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M10.007,17.04c0.301-0.652,0.621-1.238,0.953-1.759c-1.091-0.538-1.847-1.659-1.847-2.957
+		c0-1.817,1.479-3.296,3.296-3.296c1.498,0,2.763,1.004,3.163,2.375c0.71-0.242,1.378-0.353,1.965-0.388
+		c-0.585-2.292-2.655-3.987-5.127-3.987c-2.925,0-5.296,2.371-5.296,5.296C7.113,14.383,8.291,16.164,10.007,17.04z"/>
+	<path style="fill:#FFFFFF;" d="M13.625,4.586V1.773c0-0.505-0.441-0.948-0.946-0.948h-0.356c-0.522,0-0.948,0.426-0.948,0.947
+		v2.814c0,0.253,0.098,0.49,0.279,0.67c0.178,0.178,0.417,0.278,0.668,0.277h0.355c0.252,0,0.49-0.1,0.67-0.277
+		C13.526,5.077,13.625,4.839,13.625,4.586z"/>
+	<path style="fill:#FFFFFF;" d="M4.628,11.375H1.814c-0.505,0-0.947,0.442-0.947,0.946l0,0.355c0,0.523,0.426,0.948,0.947,0.948
+		h2.814c0.253,0,0.49-0.099,0.67-0.278c0.178-0.179,0.277-0.416,0.277-0.67v-0.354c0-0.253-0.099-0.491-0.278-0.671
+		C5.118,11.474,4.88,11.375,4.628,11.375z"/>
+	<path style="fill:#FFFFFF;" d="M7.726,6.093l-1.99-1.988c-0.357-0.358-0.983-0.358-1.339,0L4.146,4.355
+		c-0.37,0.368-0.37,0.97,0,1.339l1.989,1.99c0.179,0.179,0.416,0.276,0.67,0.276s0.492-0.098,0.67-0.276l0.251-0.251
+		c0.179-0.179,0.277-0.418,0.277-0.671C8.003,6.509,7.905,6.271,7.726,6.093z"/>
+	<path style="fill:#FFFFFF;" d="M20.834,4.355l-0.252-0.251c-0.356-0.358-0.981-0.358-1.338,0l-1.99,1.988
+		c-0.37,0.369-0.37,0.97,0,1.341l0.252,0.251c0.178,0.179,0.416,0.276,0.67,0.276c0.253,0,0.49-0.098,0.67-0.276l1.988-1.99
+		C21.203,5.325,21.203,4.724,20.834,4.355z"/>
+	<path style="fill:#FFFFFF;" d="M18.5,31.5c-1.718,0-3.643-0.474-4.936-1.886C12.672,30.144,11.529,30.5,10.5,30.5
+		c-3.215,0-5.5-2.771-5.5-6s2.416-5.786,5.632-5.786c0.331,0,1.051,0.23,1.368,0.286c1.13-3.394,3.065-5.5,6-5.5
+		c2.934,0,5.369,2.106,6.5,5.5c0.316-0.056,1-0.286,1.33-0.286c3.216,0,5.67,2.557,5.67,5.786s-2.285,6-5.5,6
+		c-1.027,0-2.205-0.356-3.094-0.884C21.602,31.043,20.241,31.5,18.5,31.5L18.5,31.5z M13.953,26.559l0.687,0.978
+		c0.969,1.377,2.244,2.136,3.593,2.136c1.342,0,2.622-0.761,3.604-2.141l0.689-0.972l0.894,0.789
+		c0.683,0.602,1.54,0.936,2.411,0.936c2.032,0,3.687-1.666,3.687-3.713c0-2.048-1.654-3.715-3.687-3.715
+		c-0.457,0-0.893,0.088-1.296,0.257l-1.179,0.496l-0.283-1.246c-0.671-2.958-2.662-4.863-4.84-4.863c-2.18,0-4.17,1.905-4.839,4.863
+		l-0.283,1.246l-1.178-0.496c-0.405-0.169-0.842-0.257-1.301-0.257c-2.034,0-3.688,1.667-3.688,3.715
+		c0,2.047,1.654,3.713,3.688,3.713c0.875,0,1.736-0.334,2.424-0.938L13.953,26.559L13.953,26.559z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-whitebalance-fluorescent-screen.svg b/icons/icon-m-camera-whitebalance-fluorescent-screen.svg
new file mode 100644
index 0000000..699da40
--- /dev/null
+++ b/icons/icon-m-camera-whitebalance-fluorescent-screen.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-whitebalance-fluorescent-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-whitebalance-fluorescent-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M4.5,11.5c-0.48,0-1,0.52-1,1v7c0,0.48,0.52,1,1,1h23c0.48,0,1-0.52,1-1v-7c0-0.48-0.52-1-1-1H4.5z
+		 M26.5,18.5h-21v-5.05l21,0.05V18.5z"/>
+	<path style="fill:#FFFFFF;" d="M29.5,12.5c0-1.125,2-1.125,2,0v7c0,1.125-2,1-2,0V12.5z"/>
+	<path style="fill:#FFFFFF;" d="M0.5,12.5c0-1,2-1,2,0v7c0,1.125-2,1.125-2,0V12.5z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-whitebalance-sunny-screen.svg b/icons/icon-m-camera-whitebalance-sunny-screen.svg
new file mode 100644
index 0000000..5f178a2
--- /dev/null
+++ b/icons/icon-m-camera-whitebalance-sunny-screen.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-whitebalance-sunny-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-whitebalance-sunny-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M16,11.25c2.619,0,4.75,2.13,4.75,4.75s-2.131,4.75-4.75,4.75s-4.75-2.13-4.75-4.75
+		S13.381,11.25,16,11.25 M16,9c-3.864,0-7,3.121-7,7c0,3.878,3.136,7,7,7s7-3.122,7-7C23,12.121,19.864,9,16,9L16,9z"/>
+	<path style="fill:#FFFFFF;" d="M16,0.5c-1,0-1.5,0.5-1.5,1V6c0,0.5,0.5,1,1.5,1s1.5-0.5,1.5-1V1.5C17.5,1,17,0.5,16,0.5z"/>
+	<path style="fill:#FFFFFF;" d="M7,16.003C7,15,6.5,14.5,6,14.5H1.5c-0.5,0-1,0.5-1,1.499C0.5,17,1,17.5,1.5,17.5H6
+		C6.5,17.5,7,17,7,16.003z"/>
+	<path style="fill:#FFFFFF;" d="M31.5,16.003c0-1.003-0.5-1.503-1-1.503H26c-0.5,0-1,0.5-1,1.499C25,17,25.5,17.5,26,17.5h4.5
+		C31,17.5,31.5,17,31.5,16.003z"/>
+	<path style="fill:#FFFFFF;" d="M9.724,7.754L7.095,5.116c-0.473-0.473-1.299-0.473-1.77,0L4.992,5.449
+		c-0.487,0.489-0.487,1.288,0,1.776l2.629,2.639c0.236,0.237,0.55,0.366,0.884,0.366c0.335,0,0.65-0.129,0.885-0.366l0.333-0.333
+		c0.235-0.237,0.365-0.554,0.365-0.888C10.089,8.306,9.958,7.991,9.724,7.754z"/>
+	<path style="fill:#FFFFFF;" d="M27.041,5.449L26.71,5.116c-0.473-0.475-1.3-0.475-1.771,0l-2.629,2.638
+		c-0.488,0.491-0.488,1.286,0,1.777l0.333,0.333c0.235,0.237,0.55,0.366,0.884,0.366c0.336,0,0.65-0.129,0.886-0.366l2.628-2.639
+		C27.529,6.737,27.529,5.938,27.041,5.449z"/>
+	<path style="fill:#FFFFFF;" d="M16,31.5c1,0,1.5-0.5,1.5-1V26c0-0.5-0.5-1-1.5-1s-1.5,0.5-1.5,1v4.5C14.5,31,15,31.5,16,31.5z"/>
+	<path style="fill:#FFFFFF;" d="M22.311,24.282l2.629,2.639c0.471,0.474,1.299,0.474,1.77,0l0.332-0.334
+		c0.488-0.489,0.488-1.287,0-1.777l-2.628-2.638c-0.235-0.237-0.551-0.367-0.886-0.367c-0.334,0-0.648,0.13-0.884,0.367
+		l-0.333,0.333c-0.236,0.237-0.365,0.554-0.365,0.889C21.945,23.73,22.074,24.046,22.311,24.282z"/>
+	<path style="fill:#FFFFFF;" d="M4.992,26.587l0.332,0.334c0.472,0.474,1.298,0.474,1.771,0l2.627-2.637
+		c0.489-0.491,0.489-1.288,0-1.779l-0.332-0.333c-0.235-0.237-0.55-0.366-0.885-0.366c-0.334,0-0.649,0.129-0.884,0.366l-2.629,2.64
+		C4.504,25.3,4.504,26.098,4.992,26.587z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-camera-whitebalance-tungsten-screen.svg b/icons/icon-m-camera-whitebalance-tungsten-screen.svg
new file mode 100644
index 0000000..021e698
--- /dev/null
+++ b/icons/icon-m-camera-whitebalance-tungsten-screen.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-camera-whitebalance-tungsten-screen-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-camera-whitebalance-tungsten-screen">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M20.174,26.844c0,0.552-0.447,1-1,1h-6.348c-0.551,0-1-0.448-1-1l0,0c0-0.554,0.449-1,1-1h6.348
+		C19.727,25.844,20.174,26.29,20.174,26.844L20.174,26.844z"/>
+	<path style="fill:#FFFFFF;" d="M20.174,30.427c0,0.553-0.447,1-1,1h-6.348c-0.551,0-1-0.447-1-1l0,0c0-0.552,0.449-1,1-1h6.348
+		C19.727,29.427,20.174,29.875,20.174,30.427L20.174,30.427z"/>
+	<path style="fill:#FFFFFF;" d="M17.867,24.278h-3.733c-1.908,0-3.46-1.579-3.46-3.523v0.59c0-1.13-0.878-2.168-1.991-3.482
+		c-1.608-1.897-3.607-4.253-3.607-8.019c0-4.458,4.176-9.271,10.924-9.271c6.748,0,10.923,4.813,10.923,9.271
+		c0,3.767-1.998,6.121-3.605,8.015c-1.117,1.321-1.992,2.36-1.992,3.486v-0.59C21.326,22.699,19.773,24.278,17.867,24.278
+		L17.867,24.278z M16,2.751c-5.403,0-8.748,3.682-8.748,7.093c0,2.965,1.57,4.816,3.089,6.605c1.293,1.53,2.51,2.969,2.51,4.896
+		v-0.59c0,0.742,0.576,1.347,1.283,1.347h3.733c0.705,0,1.281-0.604,1.281-1.347v0.59c0-1.923,1.213-3.36,2.5-4.883
+		c1.529-1.802,3.1-3.65,3.1-6.618C24.748,6.433,21.404,2.751,16,2.751L16,2.751z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-settings-reset.svg b/icons/icon-m-settings-reset.svg
new file mode 100644
index 0000000..98e4973
--- /dev/null
+++ b/icons/icon-m-settings-reset.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-settings-battery-layer"
+   x="0px"
+   y="0px"
+   width="64px"
+   height="64px"
+   viewBox="0 0 64 64"
+   style="enable-background:new 0 0 64 64;"
+   xml:space="preserve"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="icon-m-settings-reset.svg"><metadata
+   id="metadata16"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs14"><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 32 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="64 : 32 : 1"
+     inkscape:persp3d-origin="32 : 21.333333 : 1"
+     id="perspective18" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1123"
+   inkscape:window-height="799"
+   id="namedview12"
+   showgrid="false"
+   inkscape:zoom="4.9107143"
+   inkscape:cx="36.5"
+   inkscape:cy="39.129591"
+   inkscape:window-x="186"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="icon-m-settings-battery-layer"><inkscape:grid
+     type="xygrid"
+     id="grid3603" /></sodipodi:namedview>
+
+<g
+   id="g3740"><rect
+     y="-7.5200263e-16"
+     x="0"
+     height="64"
+     width="64"
+     id="rect3639"
+     style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0" /><g
+     style="fill:#505050;fill-opacity:1"
+     id="g3610"><g
+       style="fill:#505050;fill-opacity:1"
+       id="icon-m-settings-battery">
+	<rect
+   style="opacity:0;fill:#505050;fill-opacity:1"
+   width="64"
+   height="64"
+   id="rect4"
+   x="0"
+   y="0" />
+	<g
+   style="fill:#505050;fill-opacity:1"
+   id="g6">
+		
+		
+	</g>
+</g></g><g
+     transform="matrix(0.83787863,0,0,0.83787863,5.2830379,4.9107944)"
+     id="g3736"><path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 14.6875,40.625 c 3.308294,6.276588 9.911769,10.53125 17.5,10.53125 10.90913,0 19.75,-8.84087 19.75,-19.75 0,-10.90913 -8.84087,-19.75 -19.75,-19.75 -7.972797,0 -14.848313,4.729978 -17.96875,11.53125"
+       id="path3725"
+       sodipodi:nodetypes="csscc" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 13.236363,9.4254546 14.050909,23.06909 26.676363,22.458181"
+       id="path3730" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/icon-m-toolbar-delete.svg b/icons/icon-m-toolbar-delete.svg
new file mode 100644
index 0000000..ae6b42d
--- /dev/null
+++ b/icons/icon-m-toolbar-delete.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-delete-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-delete">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M26.593,3.814h-6.459v-1.98c0-0.568-0.465-1.033-1.034-1.033H12.9c-0.569,0-1.034,0.465-1.034,1.033
+		v1.98H5.408c-0.569,0-1.033,0.465-1.033,1.033v3.359h23.251V4.848C27.626,4.279,27.161,3.814,26.593,3.814z"/>
+	<path style="fill:#FFFFFF;" d="M5.021,13.15l1.551,17.018c0,0.567,0.464,1.032,1.032,1.032h16.793c0.568,0,1.033-0.465,1.033-1.032
+		L26.98,13.15H5.021z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-favorite-mark.svg b/icons/icon-m-toolbar-favorite-mark.svg
new file mode 100644
index 0000000..0ec1dc3
--- /dev/null
+++ b/icons/icon-m-toolbar-favorite-mark.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-favorite-mark-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-favorite-mark_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M31.396,12.717c0.445-0.334,0.357-0.605-0.201-0.605H20.922c-0.556,0-1.158-0.433-1.334-0.959
+		l-3.266-9.734c-0.177-0.527-0.467-0.527-0.644,0l-3.269,9.734c-0.176,0.526-0.777,0.959-1.334,0.959H0.804
+		c-0.558,0-0.647,0.271-0.199,0.605l8.215,6.105c0.448,0.332,0.668,1.036,0.491,1.564L5.94,30.428
+		c-0.178,0.527,0.055,0.708,0.52,0.399l8.697-5.794c0.464-0.309,1.223-0.309,1.687,0l8.694,5.794
+		c0.465,0.309,0.699,0.128,0.521-0.399l-3.371-10.041c-0.176-0.528,0.045-1.232,0.492-1.564L31.396,12.717z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-favorite-unmark.svg b/icons/icon-m-toolbar-favorite-unmark.svg
new file mode 100644
index 0000000..2bf46ab
--- /dev/null
+++ b/icons/icon-m-toolbar-favorite-unmark.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-favorite-unmark-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-favorite-unmark_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M25.333,31.02L25.333,31.02c-0.277,0-0.572-0.101-0.867-0.296l-8.183-5.455
+		c-0.037-0.022-0.135-0.062-0.282-0.062c-0.149,0-0.248,0.04-0.284,0.062l-8.184,5.455c-0.681,0.451-1.399,0.354-1.766-0.157
+		c-0.168-0.234-0.324-0.647-0.111-1.281l3.174-9.45c0.038-0.116-0.038-0.364-0.138-0.439l-7.733-5.747
+		c-0.769-0.57-0.666-1.19-0.587-1.432c0.08-0.24,0.369-0.799,1.325-0.799h9.666c0.127,0,0.342-0.154,0.382-0.274l3.077-9.16
+		c0.301-0.904,0.923-1.001,1.177-1.001c0.252,0,0.873,0.097,1.177,1l3.073,9.16c0.042,0.121,0.256,0.275,0.383,0.275h9.669
+		c0.956,0,1.245,0.559,1.323,0.799c0.08,0.241,0.183,0.861-0.586,1.432l-7.733,5.747c-0.099,0.075-0.177,0.323-0.137,0.44
+		l3.173,9.449c0.212,0.635,0.057,1.047-0.113,1.283C26.023,30.854,25.696,31.02,25.333,31.02L25.333,31.02z M16.001,23.361
+		c0.479,0,0.942,0.132,1.305,0.373l6.73,4.485l-2.615-7.797c-0.293-0.878,0.043-1.956,0.787-2.507l6.259-4.652l-7.833-0.001
+		c-0.922,0-1.838-0.659-2.131-1.534l-2.502-7.454l-2.505,7.454c-0.293,0.875-1.209,1.534-2.131,1.534h-7.83l6.258,4.653
+		c0.743,0.553,1.083,1.629,0.788,2.507l-2.618,7.796l6.734-4.484C15.057,23.493,15.52,23.361,16.001,23.361L16.001,23.361z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-mediacontrol-pause.svg b/icons/icon-m-toolbar-mediacontrol-pause.svg
new file mode 100644
index 0000000..c8836a1
--- /dev/null
+++ b/icons/icon-m-toolbar-mediacontrol-pause.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-mediacontrol-pause-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-mediacontrol-pause_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<g>
+		<path style="fill:#FFFFFF;" d="M13.15,28.25c0,1.1-0.9,2-2,2H4.462c-1.1,0-2-0.9-2-2V3.75c0-1.1,0.9-2,2-2h6.688c1.1,0,2,0.9,2,2
+			V28.25z"/>
+	</g>
+	<g>
+		<path style="fill:#FFFFFF;" d="M29.537,28.25c0,1.1-0.9,2-2,2H20.85c-1.1,0-2-0.9-2-2V3.75c0-1.1,0.9-2,2-2h6.688c1.1,0,2,0.9,2,2
+			V28.25z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-mediacontrol-play.svg b/icons/icon-m-toolbar-mediacontrol-play.svg
new file mode 100644
index 0000000..38d1075
--- /dev/null
+++ b/icons/icon-m-toolbar-mediacontrol-play.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-mediacontrol-play-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-mediacontrol-play_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<g>
+		<path style="fill:#FFFFFF;" d="M2.861,3c0-1.1,0.782-1.554,1.737-1.009l22.803,13.018c0.956,0.545,0.956,1.438,0,1.982
+			L4.598,30.009C3.643,30.554,2.861,30.1,2.861,29V3z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-mediacontrol-stop.svg b/icons/icon-m-toolbar-mediacontrol-stop.svg
new file mode 100644
index 0000000..775ffde
--- /dev/null
+++ b/icons/icon-m-toolbar-mediacontrol-stop.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-mediacontrol-stop-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-mediacontrol-stop_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<g>
+		<path style="fill:#FFFFFF;" d="M30.25,28.25c0,1.1-0.9,2-2,2H3.75c-1.1,0-2-0.9-2-2V3.75c0-1.1,0.9-2,2-2h24.5c1.1,0,2,0.9,2,2
+			V28.25z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-share.svg b/icons/icon-m-toolbar-share.svg
new file mode 100644
index 0000000..fca965e
--- /dev/null
+++ b/icons/icon-m-toolbar-share.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-share-layer" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-share_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path id="Share_2_" style="fill:#FFFFFF;" d="M26.334,19.094c-1.861,0-3.508,0.877-4.539,2.229l-10.493-4.707
+		c0.017-0.171,0.027-0.343,0.027-0.519c0-0.196-0.012-0.392-0.033-0.582l10.592-4.714c1.035,1.281,2.641,2.105,4.445,2.105
+		c3.129,0,5.666-2.469,5.666-5.513s-2.537-5.511-5.666-5.511S20.67,4.35,20.67,7.394c0,0.346,0.037,0.684,0.1,1.011l-10.398,4.627
+		c-1.017-1.475-2.744-2.445-4.708-2.445C2.535,10.586,0,13.053,0,16.097s2.535,5.512,5.663,5.512c1.984,0,3.729-0.993,4.739-2.496
+		l10.344,4.636c-0.047,0.28-0.076,0.564-0.076,0.858c0,3.046,2.535,5.513,5.664,5.513S32,27.652,32,24.606
+		S29.463,19.094,26.334,19.094z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-volume-off.svg b/icons/icon-m-toolbar-volume-off.svg
new file mode 100644
index 0000000..bd662c1
--- /dev/null
+++ b/icons/icon-m-toolbar-volume-off.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-volume-off-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-volume-off_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	
+		<rect x="13.118" y="1.61" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.1779 14.6691)" style="fill:#FFFFFF;" width="2" height="28.779"/>
+	<path style="fill:#FFFFFF;" d="M15.134,8.48l0.013,15.04l-5.189-4.288l-0.555-0.457H8.684H2v-5.611h6.759h0.721l0.555-0.461
+		L15.134,8.48 M16.954,4.883h-0.43c-0.1,0-0.246,0.054-0.325,0.117l-7.441,6.164H0v9.611h8.684L16.218,27
+		c0.079,0.068,0.225,0.119,0.325,0.119h0.43c0.096,0,0.178-0.095,0.178-0.21l-0.02-21.815C17.131,4.978,17.05,4.883,16.954,4.883
+		L16.954,4.883z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-toolbar-volume.svg b/icons/icon-m-toolbar-volume.svg
new file mode 100644
index 0000000..03f92ad
--- /dev/null
+++ b/icons/icon-m-toolbar-volume.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-toolbar-volume-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<g id="icon-m-toolbar-volume_1_">
+	<rect style="fill:none;" width="32" height="32"/>
+	<path style="fill:#FFFFFF;" d="M16.954,4.883h-0.43c-0.1,0-0.246,0.054-0.325,0.117l-7.441,6.164H0v9.611h8.684l7.535,6.226
+		c0.079,0.067,0.225,0.118,0.325,0.118h0.429c0.096,0,0.178-0.095,0.178-0.21l-0.02-21.815C17.131,4.978,17.05,4.883,16.954,4.883z"
+		/>
+	<path style="fill:#FFFFFF;" d="M27.588,5.25c-0.357-0.271-0.865-0.192-1.139,0.168c-0.268,0.363-0.189,0.881,0.176,1.155
+		c2.311,1.751,3.755,5.207,3.755,9.022c0,3.808-1.444,7.272-3.755,9.021c-0.365,0.27-0.443,0.781-0.176,1.146
+		c0.273,0.364,0.781,0.439,1.139,0.172C30.307,23.872,32,19.913,32,15.596C32,11.27,30.307,7.312,27.588,5.25z"/>
+	<path style="fill:#FFFFFF;" d="M25.254,11.162c0,0-0.02-0.059-0.034-0.087c-0.171-0.403-0.577-1.141-0.577-1.141
+		c-0.438-0.757-0.881-1.337-1.547-1.962c-0.236-0.229-0.499-0.426-0.754-0.621c-0.055-0.042-0.115-0.072-0.179-0.096
+		C21.814,7.066,21.369,7.16,21.118,7.5C20.9,7.799,20.91,8.201,21.116,8.496c0.056,0.102,0.167,0.208,0.228,0.266
+		c0.383,0.352,0.791,0.694,1.143,1.115c0.129,0.158,0.254,0.322,0.377,0.495c0.908,1.403,1.453,3.279,1.453,5.288
+		c0,1.984-0.516,3.844-1.41,5.248c-0.457,0.632-0.979,1.145-1.545,1.625c-0.355,0.303-0.451,0.818-0.178,1.192
+		c0.277,0.374,0.787,0.472,1.176,0.218c0.268-0.176,0.518-0.351,0.752-0.578c0.74-0.622,1.322-1.542,1.818-2.483h-0.012
+		c0.766-1.499,1.2-3.314,1.2-5.222C26.118,14.05,25.809,12.506,25.254,11.162z"/>
+</g>
+</svg>
diff --git a/icons/icon-m-viewfinder-camera.svg b/icons/icon-m-viewfinder-camera.svg
new file mode 100644
index 0000000..aceef1a
--- /dev/null
+++ b/icons/icon-m-viewfinder-camera.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="icon-m-viewfinder-camera-layer"
+   x="0px"
+   y="0px"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   style="enable-background:new 0 0 32 32;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-m-viewfinder-camera.svg"><metadata
+   id="metadata2999"><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><defs
+   id="defs2997" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1024"
+   inkscape:window-height="686"
+   id="namedview2995"
+   showgrid="false"
+   inkscape:zoom="13.914551"
+   inkscape:cx="4.5371794"
+   inkscape:cy="16"
+   inkscape:window-x="0"
+   inkscape:window-y="30"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="icon-m-viewfinder-camera-layer" />
+<g
+   id="icon-m-viewfinder-camera"
+   transform="matrix(0.95732884,0,0,0.95732884,0.68273856,0.68273856)">
+	<rect
+   style="fill:none"
+   width="32"
+   height="32"
+   id="rect2991"
+   x="0"
+   y="0" />
+	<path
+   style="fill:#ffffff"
+   d="M 30.4,4.783 H 1.6 C 0.723,4.783 0,5.505 0,6.385 v 19.229 c 0,0.881 0.723,1.604 1.6,1.604 h 28.8 c 0.877,0 1.6,-0.723 1.6,-1.604 V 6.385 C 32,5.505 31.277,4.783 30.4,4.783 z M 16,23.5 c -3.976,0 -7.201,-3.233 -7.201,-7.212 0,-3.982 3.225,-7.21 7.201,-7.21 3.978,0 7.199,3.228 7.199,7.21 0,3.98 -3.221,7.212 -7.199,7.212 z M 29.953,10.998 H 23.76 v -4.15 h 6.193 v 4.15 z"
+   id="path2993"
+   inkscape:connector-curvature="0" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/icons/icons.txt b/icons/icons.txt
new file mode 100644
index 0000000..42de8c9
--- /dev/null
+++ b/icons/icons.txt
@@ -0,0 +1,53 @@
+icon-l-camera-standby 132 132 leftover_bacon_Camera_Lens.svg
+icon-m-camera-face-detection-screen 32 32 icon-m-camera-face-detection-screen.svg
+icon-m-camera-flash-always 48 48 icon-m-camera-flash-always-screen.svg
+icon-m-camera-flash-auto 48 48 icon-m-camera-flash-auto-screen.svg
+icon-m-camera-flash-off 48 48 icon-m-camera-flash-off-screen.svg
+icon-m-camera-flash-red-eye 48 48 icon-m-camera-flash-red-eye-screen.svg
+icon-m-camera-iso-100 48 48 icon-m-camera-iso-100.svg
+icon-m-camera-iso-200 48 48 icon-m-camera-iso-200.svg
+icon-m-camera-iso-400 48 48 icon-m-camera-iso-400.svg
+icon-m-camera-iso-800 48 48 icon-m-camera-iso-800.svg
+icon-m-camera-iso-auto 48 48 icon-m-camera-iso-auto.svg
+icon-m-camera-location 32 32 icon-m-camera-location.svg
+icon-m-camera-night 48 48 icon-m-camera-night-screen.svg
+icon-m-camera-ongoing-recording 32 32 icon-m-camera-ongoing-recording.svg
+icon-m-camera-scene-landscape 48 48 icon-m-camera-scene-landscape-screen.svg
+icon-m-camera-scene-macro 48 48 icon-m-camera-scene-macro-screen.svg
+icon-m-camera-scene-portrait 48 48 icon-m-camera-scene-portrait-screen.svg
+icon-m-camera-scene-sports 48 48 icon-m-camera-scene-sports-screen.svg
+icon-m-camera-video-night 48 48 icon-m-camera-video-night-screen.svg
+icon-m-camera-video 48 48 icon-m-camera-video.svg
+icon-m-camera-whitebalance-auto 48 48 icon-m-camera-whitebalance-auto-screen.svg
+icon-m-camera-whitebalance-cloudy 48 48 icon-m-camera-whitebalance-cloudy-screen.svg
+icon-m-camera-whitebalance-fluorescent 48 48 icon-m-camera-whitebalance-fluorescent-screen.svg
+icon-m-camera-whitebalance-sunny 48 48 icon-m-camera-whitebalance-sunny-screen.svg
+icon-m-camera-whitebalance-tungsten 48 48 icon-m-camera-whitebalance-tungsten-screen.svg
+icon-m-toolbar-delete-white 40 40 icon-m-toolbar-delete.svg
+icon-m-toolbar-favorite-mark-white 40 40 icon-m-toolbar-favorite-mark.svg
+icon-m-toolbar-favorite-unmark-white 40 40 icon-m-toolbar-favorite-unmark.svg
+icon-m-toolbar-mediacontrol-pause-white 40 40 icon-m-toolbar-mediacontrol-pause.svg
+icon-m-toolbar-mediacontrol-play-white 40 40 icon-m-toolbar-mediacontrol-play.svg
+icon-m-toolbar-mediacontrol-stop-white 40 40 icon-m-toolbar-mediacontrol-stop.svg
+icon-m-toolbar-share-white 40 40 icon-m-toolbar-share.svg
+icon-m-toolbar-volume-off-white-selected 40 40 icon-m-toolbar-volume-off.svg
+icon-m-toolbar-volume-white-selected 40 40 icon-m-toolbar-volume.svg
+icon-m-viewfinder-camera 48 48 icon-m-viewfinder-camera.svg
+icon-m-camera-roll 40 40 icon-m-camera-roll.svg
+icon-m-camera-scene-auto 48 48 icon-m-camera-scene-auto-screen.svg
+icon-m-camera-video-record 64 64 icon-m-camera-video.svg
+icon-m-camera-video-fine-resolution 32 32 icon-m-camera-video-fine-resolution.svg
+icon-m-camera-video-high-resolution 32 32 icon-m-camera-video-high-resolution.svg
+icon-m-camera-video-low-resolution 32 32 icon-m-camera-video-low-resolution.svg
+icon-m-camera-manual-exposure 48 48 exposure.svg
+icon-m-camera-filter-black-white 48 48 filter-black-white.svg
+icon-m-camera-filter-negative 48 48 filter-negative.svg
+icon-m-camera-filter-sepia 48 48 filter-sepia.svg
+icon-m-camera-filter-solarize 48 48 filter-solarize.svg
+icon-m-camera-filter-vivid 48 48 filter-vivid.svg
+icon-m-camera-no-filter 48 48 filter-none.svg
+icon-m-toolbar-back-white 52 52 arrow-black.svg
+icon-m-camera-shutter 64 64 shutter.svg
+icon-m-camera-torch-off 48 48 torch-off.svg
+icon-m-camera-torch-on 48 48 torch-on.svg
+icon-m-settings-reset 48 48 icon-m-settings-reset.svg
diff --git a/icons/leftover_bacon_Camera_Lens.svg b/icons/leftover_bacon_Camera_Lens.svg
new file mode 100644
index 0000000..03d83b7
--- /dev/null
+++ b/icons/leftover_bacon_Camera_Lens.svg
@@ -0,0 +1,565 @@
+<?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="448.21634"
+   height="448.21634"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="C:\#graphics\shapes\svg"
+   sodipodi:docname="leftover_bacon_camera_lens.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   inkscape:export-filename="C:\#graphics\shapes\svg\Glossy_lens.png"
+   inkscape:export-xdpi="72"
+   inkscape:export-ydpi="72">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4211859"
+     inkscape:cx="266.56177"
+     inkscape:cy="239.91638"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer6"
+     inkscape:window-width="1280"
+     inkscape:window-height="968"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient10618">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop10620" />
+      <stop
+         id="stop10626"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.30208334;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10622" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5437">
+      <stop
+         offset="0"
+         style="stop-color:#5a5a5a;stop-opacity:1;"
+         id="stop5439" />
+      <stop
+         offset="1"
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         id="stop5441" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7503">
+      <stop
+         offset="0"
+         style="stop-color:#6fff55;stop-opacity:1;"
+         id="stop7505" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;"
+         id="stop7507" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14176">
+      <stop
+         offset="0"
+         style="stop-color:#9fd7ff;stop-opacity:0.78125;"
+         id="stop14178" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop14180" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11163">
+      <stop
+         offset="0"
+         style="stop-color:#83c2f0;stop-opacity:1;"
+         id="stop11165" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;"
+         id="stop11167" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10084">
+      <stop
+         offset="0"
+         style="stop-color:#f36ff3;stop-opacity:1;"
+         id="stop10086" />
+      <stop
+         offset="1"
+         style="stop-color:#f3bef3;stop-opacity:0.22745098;"
+         id="stop10088" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7124">
+      <stop
+         offset="0"
+         style="stop-color:#69f931;stop-opacity:1;"
+         id="stop7126" />
+      <stop
+         offset="1"
+         style="stop-color:#f1fee4;stop-opacity:0.04347826;"
+         id="stop7128" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4198">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;"
+         id="stop4200" />
+      <stop
+         offset="1"
+         style="stop-color:#2a2a2a;stop-opacity:0.59375;"
+         id="stop4202" />
+    </linearGradient>
+    <filter
+       id="filter14172"
+       width="1.1020039"
+       y="-0.19546671"
+       x="-0.05100197"
+       height="1.3909334"
+       inkscape:collect="always">
+      <feGaussianBlur
+         stdDeviation="8.8998435"
+         id="feGaussianBlur14174"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter15171"
+       width="1.1374978"
+       y="-0.15424021"
+       x="-0.068748891"
+       height="1.3084804"
+       inkscape:collect="always">
+      <feGaussianBlur
+         stdDeviation="14.5275"
+         id="feGaussianBlur15173"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter3537"
+       inkscape:collect="always">
+      <feGaussianBlur
+         stdDeviation="3.055"
+         id="feGaussianBlur3539"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter7479"
+       inkscape:collect="always">
+      <feGaussianBlur
+         stdDeviation="1.533681"
+         id="feGaussianBlur7481"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter7707"
+       width="2.2133333"
+       y="-0.60666667"
+       x="-0.60666667"
+       height="2.2133333"
+       inkscape:collect="always">
+      <feGaussianBlur
+         stdDeviation="2.7040298"
+         id="feGaussianBlur7709"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient8846"
+       gradientUnits="userSpaceOnUse"
+       inkscape:collect="always"
+       x1="345.29486"
+       x2="345.29486"
+       xlink:href="#linearGradient4198"
+       y1="216.60402"
+       y2="659.35962" />
+    <radialGradient
+       r="174.5"
+       id="radialGradient8862"
+       fx="351.84375"
+       fy="610.375"
+       gradientUnits="userSpaceOnUse"
+       inkscape:collect="always"
+       cy="610.375"
+       cx="351.84375"
+       xlink:href="#linearGradient10084"
+       gradientTransform="matrix(1.2586048,0,0,0.2446767,-90.988493,461.03045)" />
+    <radialGradient
+       r="211.3125"
+       id="radialGradient8866"
+       fx="359.44235"
+       fy="404.74509"
+       gradientUnits="userSpaceOnUse"
+       inkscape:collect="always"
+       cy="404.74509"
+       cx="359.44235"
+       xlink:href="#linearGradient10084"
+       gradientTransform="matrix(1.155605,-6.1141469e-5,0,0.5766614,-57.462698,53.392821)" />
+    <radialGradient
+       r="31.345461"
+       id="radialGradient8896"
+       fx="-298.77698"
+       fy="227.55424"
+       gradientUnits="userSpaceOnUse"
+       inkscape:collect="always"
+       cy="227.55424"
+       cx="-298.77698"
+       xlink:href="#linearGradient7503" />
+    <radialGradient
+       r="174.5"
+       id="radialGradient10840"
+       fx="351.84375"
+       fy="610.375"
+       gradientUnits="userSpaceOnUse"
+       inkscape:collect="always"
+       cy="610.375"
+       cx="351.84375"
+       xlink:href="#linearGradient10084"
+       gradientTransform="matrix(1.2586048,0,0,0.2446767,-90.988493,421.62674)" />
+    <linearGradient
+       id="linearGradient5443"
+       spreadMethod="pad"
+       gradientUnits="userSpaceOnUse"
+       inkscape:collect="always"
+       x1="-365.47314"
+       x2="-110.65571"
+       xlink:href="#linearGradient5437"
+       gradientTransform="translate(597.97868,188.33355)"
+       y1="66.37822"
+       y2="428.048" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10618"
+       id="radialGradient10624"
+       cx="115.39658"
+       cy="97.10112"
+       fx="115.39658"
+       fy="97.10112"
+       r="14.776392"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <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" />
+        <dc:title>Camera Lens</dc:title>
+        <dc:date>2007-11-09</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Leftover Bacon</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>camera</rdf:li>
+            <rdf:li>lens</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>A camera lens.</dc:description>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>pd</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>openclipart.org</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Water"
+     style="display:inline"
+     id="layer1"
+     transform="translate(-127.71426,-219.17851)"
+     inkscape:groupmode="layer">
+    <g
+       inkscape:label="Shape"
+       style="display:inline"
+       id="layer7"
+       inkscape:groupmode="layer" />
+    <g
+       inkscape:label="Highlights-Water"
+       style="display:inline"
+       id="layer6"
+       inkscape:groupmode="layer">
+      <path
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path11159"
+         sodipodi:cx="340.26733"
+         sodipodi:cy="441.46219"
+         sodipodi:type="arc"
+         d="M 564.3755 441.46219 A 224.10817 224.10817 0 1 1  116.15916,441.46219 A 224.10817 224.10817 0 1 1  564.3755 441.46219 z"
+         transform="translate(11.5551,1.82449)"
+         sodipodi:rx="224.10817"
+         sodipodi:ry="224.10817" />
+      <path
+         style="color:#000000;fill:url(#linearGradient8846);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path2241"
+         sodipodi:cx="340.26733"
+         sodipodi:cy="441.46219"
+         sodipodi:type="arc"
+         d="M 564.3755 441.46219 A 224.10817 224.10817 0 1 1  116.15916,441.46219 A 224.10817 224.10817 0 1 1  564.3755 441.46219 z"
+         transform="translate(11.5551,1.82449)"
+         sodipodi:rx="224.10817"
+         sodipodi:ry="224.10817" />
+      <g
+         id="g8890"
+         transform="matrix(0.6730904,0,0,0.6730904,116.7816,146.17765)">
+        <path
+           style="fill:url(#radialGradient8896);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path7501"
+           sodipodi:cx="-298.77698"
+           sodipodi:cy="227.55424"
+           sodipodi:type="arc"
+           d="M -267.43152 227.55424 A 31.345461 31.345461 0 1 1  -330.12244,227.55424 A 31.345461 31.345461 0 1 1  -267.43152 227.55424 z"
+           transform="translate(647.70253,212.26285)"
+           sodipodi:rx="31.345461"
+           sodipodi:ry="31.345461" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter7707)"
+           id="path7513"
+           sodipodi:cx="-352.63644"
+           sodipodi:cy="193.59666"
+           sodipodi:type="arc"
+           d="M -347.28781 193.59666 A 5.3486304 5.3486304 0 1 1  -357.98507,193.59666 A 5.3486304 5.3486304 0 1 1  -347.28781 193.59666 z"
+           transform="matrix(0.4767442,0,0,0.4767442,505.28838,338.00543)"
+           sodipodi:rx="5.3486304"
+           sodipodi:ry="5.3486304" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path7489"
+           d="M 349.20106,407.40986 C 330.43162,407.40986 315.19158,422.64087 315.19158,441.4103 C 315.19158,460.17972 330.43162,475.41074 349.20106,475.41074 C 367.97048,475.41074 383.2015,460.17972 383.2015,441.4103 C 383.2015,422.64087 367.97048,407.40985 349.20106,407.40986 z M 349.20106,415.33667 C 363.59418,415.33667 375.27468,427.01716 375.27468,441.4103 C 375.27468,455.80343 363.59418,467.48393 349.20106,467.48393 C 334.80792,467.48392 323.12743,455.80343 323.12743,441.4103 C 323.12743,427.01716 334.80792,415.33667 349.20106,415.33667 z " />
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.31590295;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter7479)"
+           id="path7491"
+           sodipodi:cx="-307.95816"
+           sodipodi:cy="-50.005096"
+           sodipodi:type="arc"
+           d="M -217.09525 -50.005096 A 90.862907 90.862907 0 1 1  -398.82107,-50.005096 A 90.862907 90.862907 0 1 1  -217.09525 -50.005096 z"
+           transform="matrix(0.3742443,0,0,0.3742443,464.44811,460.12442)"
+           sodipodi:rx="90.862907"
+           sodipodi:ry="90.862907" />
+      </g>
+      <g
+         transform="translate(0.2967997,-5.1753636)"
+         id="g7483">
+        <path
+           style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="M 351.54125,330.77454 C 286.57366,330.77454 233.82251,383.49445 233.8225,448.46204 C 233.8225,513.42963 286.57366,566.14955 351.54125,566.14954 C 416.50884,566.14954 469.22874,513.42963 469.22875,448.46204 C 469.22875,383.49445 416.50884,330.77453 351.54125,330.77454 z M 351.54125,358.21204 C 401.36096,358.21204 441.79125,398.64233 441.79125,448.46204 C 441.79124,498.28174 401.36096,538.71204 351.54125,538.71204 C 301.72154,538.71203 261.29125,498.28175 261.29125,448.46204 C 261.29124,398.64233 301.72154,358.21204 351.54125,358.21204 z "
+           id="path7436" />
+        <path
+           style="opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.31590295;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter7479)"
+           id="path7441"
+           sodipodi:cx="-307.95816"
+           sodipodi:cy="-50.005096"
+           sodipodi:type="arc"
+           d="M -217.09525 -50.005096 A 90.862907 90.862907 0 1 1  -398.82107,-50.005096 A 90.862907 90.862907 0 1 1  -217.09525 -50.005096 z"
+           transform="matrix(1.2953911,0,0,1.2953911,750.45189,513.2382)"
+           sodipodi:rx="90.862907"
+           sodipodi:ry="90.862907" />
+      </g>
+      <path
+         style="color:#000000;fill:url(#linearGradient8846);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.62222222"
+         id="path9867"
+         sodipodi:cx="340.26733"
+         sodipodi:cy="441.46219"
+         sodipodi:type="arc"
+         d="M 564.3755 441.46219 A 224.10817 224.10817 0 1 1  116.15916,441.46219 A 224.10817 224.10817 0 1 1  564.3755 441.46219 z"
+         transform="translate(11.5551,1.82449)"
+         sodipodi:rx="224.10817"
+         sodipodi:ry="224.10817" />
+      <path
+         style="opacity:0.9;color:#000000;fill:url(#radialGradient8866);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3537);enable-background:accumulate"
+         d="M 351.84375,234.5625 C 242.54487,234.5625 152.57356,316.88479 140.5,422.9375 C 195.92598,389.0005 270.19663,368.21875 351.8125,368.21875 C 433.42264,368.21875 507.70027,389.00473 563.125,422.9375 C 551.0544,316.88435 461.14201,234.5625 351.84375,234.5625 z "
+         id="path10070" />
+      <g
+         id="g2222"
+         transform="matrix(0.917644,0,0,0.917644,71.482188,80.358478)">
+        <g
+           id="g2224">
+          <path
+             d="M 547,395.5 C 547,460.007 521.88,520.652 476.267,566.267 C 430.652,611.88 370.007,637 305.5,637 C 240.993,637 180.347,611.88 134.733,566.267 C 89.12,520.652 64,460.007 64,395.5 C 64,330.993 89.12,270.347 134.733,224.734 C 180.347,179.121 240.993,154 305.5,154 C 370.007,154 430.652,179.121 476.267,224.734 C 521.88,270.347 547,330.993 547,395.5 z M 305.5,152 C 240.458,152 179.311,177.329 133.319,223.319 C 87.329,269.311 62,330.458 62,395.5 C 62,460.541 87.329,521.689 133.319,567.681 C 179.311,613.672 240.459,639 305.5,639 C 370.541,639 431.689,613.672 477.681,567.681 C 523.673,521.69 549,460.541 549,395.5 C 549,330.459 523.672,269.311 477.681,223.319 C 431.689,177.329 370.541,152 305.5,152 z "
+             id="path2226" />
+        </g>
+        <g
+           id="g2228">
+          <path
+             d="M 543.5,395.5 C 543.5,459.072 518.744,518.839 473.791,563.791 C 428.839,608.744 369.072,633.5 305.5,633.5 C 241.928,633.5 182.161,608.744 137.208,563.791 C 92.256,518.839 67.5,459.072 67.5,395.5 C 67.5,331.928 92.256,272.161 137.208,227.208 C 182.16,182.255 241.928,157.5 305.5,157.5 C 369.072,157.5 428.839,182.256 473.791,227.208 C 518.744,272.161 543.5,331.928 543.5,395.5 z M 305.5,155.5 C 241.394,155.5 181.125,180.464 135.794,225.794 C 90.463,271.124 65.5,331.394 65.5,395.5 C 65.5,459.606 90.464,519.876 135.794,565.206 C 181.124,610.536 241.394,635.5 305.5,635.5 C 369.606,635.5 429.876,610.536 475.206,565.206 C 520.535,519.876 545.5,459.606 545.5,395.5 C 545.5,331.394 520.535,271.125 475.206,225.794 C 429.876,180.464 369.606,155.5 305.5,155.5 z "
+             id="path2230" />
+        </g>
+        <g
+           id="g2232">
+          <path
+             d="M 540,395.5 C 540,458.137 515.607,517.025 471.316,561.316 C 427.025,605.607 368.137,630 305.5,630 C 242.863,630 183.975,605.607 139.684,561.316 C 95.392,517.025 71,458.137 71,395.5 C 71,332.863 95.392,273.975 139.684,229.684 C 183.975,185.392 242.863,161 305.5,161 C 368.137,161 427.025,185.392 471.316,229.684 C 515.607,273.975 540,332.863 540,395.5 z M 305.5,159 C 242.329,159 182.938,183.6 138.269,228.27 C 93.6,272.938 69,332.329 69,395.5 C 69,458.671 93.6,518.062 138.269,562.73 C 182.938,607.399 242.329,632 305.5,632 C 368.671,632 428.062,607.399 472.73,562.73 C 517.398,518.061 542,458.671 542,395.5 C 542,332.329 517.399,272.938 472.73,228.27 C 428.062,183.6 368.671,159 305.5,159 z "
+             id="path2234" />
+        </g>
+        <g
+           id="g2236">
+          <path
+             d="M 536.5,395.5 C 536.5,457.202 512.472,515.211 468.842,558.842 C 425.211,602.472 367.202,626.5 305.5,626.5 C 243.797,626.5 185.788,602.472 142.158,558.842 C 98.528,515.212 74.5,457.202 74.5,395.5 C 74.5,333.797 98.528,275.788 142.158,232.158 C 185.788,188.528 243.797,164.5 305.5,164.5 C 367.202,164.5 425.212,188.528 468.842,232.158 C 512.472,275.789 536.5,333.797 536.5,395.5 z M 305.5,162.5 C 243.263,162.5 184.752,186.736 140.744,230.744 C 96.736,274.752 72.5,333.263 72.5,395.5 C 72.5,457.736 96.736,516.248 140.744,560.256 C 184.752,604.264 243.263,628.5 305.5,628.5 C 367.736,628.5 426.248,604.264 470.256,560.256 C 514.264,516.248 538.5,457.736 538.5,395.5 C 538.5,333.263 514.264,274.752 470.256,230.744 C 426.248,186.736 367.736,162.5 305.5,162.5 z "
+             id="path2238" />
+        </g>
+        <g
+           id="g2240">
+          <path
+             d="M 533,395.5 C 533,456.268 509.336,513.397 466.367,556.367 C 423.397,599.336 366.268,623 305.5,623 C 244.732,623 187.602,599.336 144.633,556.367 C 101.664,513.397 78,456.268 78,395.5 C 78,334.732 101.664,277.602 144.633,234.633 C 187.602,191.664 244.732,168 305.5,168 C 366.268,168 423.397,191.664 466.367,234.633 C 509.336,277.602 533,334.732 533,395.5 z M 305.5,166 C 244.198,166 186.566,189.872 143.219,233.219 C 99.872,276.566 76,334.198 76,395.5 C 76,456.802 99.872,514.435 143.219,557.781 C 186.566,601.128 244.198,625 305.5,625 C 366.802,625 424.435,601.128 467.781,557.781 C 511.127,514.434 535,456.802 535,395.5 C 535,334.198 511.128,276.566 467.781,233.219 C 424.435,189.872 366.802,166 305.5,166 z "
+             id="path2242" />
+        </g>
+        <g
+           id="g2244">
+          <path
+             d="M 529.5,395.5 C 529.5,455.332 506.2,511.584 463.892,553.892 C 421.584,596.2 365.332,619.5 305.5,619.5 C 245.667,619.5 189.416,596.2 147.108,553.892 C 104.8,511.584 81.5,455.332 81.5,395.5 C 81.5,335.667 104.8,279.416 147.108,237.108 C 189.416,194.8 245.667,171.5 305.5,171.5 C 365.332,171.5 421.584,194.8 463.892,237.108 C 506.2,279.416 529.5,335.667 529.5,395.5 z M 305.5,169.5 C 245.133,169.5 188.379,193.008 145.694,235.694 C 103.009,278.38 79.5,335.133 79.5,395.5 C 79.5,455.866 103.008,512.62 145.694,555.306 C 188.379,597.992 245.133,621.5 305.5,621.5 C 365.866,621.5 422.62,597.992 465.306,555.306 C 507.992,512.62 531.5,455.866 531.5,395.5 C 531.5,335.133 507.992,278.38 465.306,235.694 C 422.62,193.008 365.866,169.5 305.5,169.5 z "
+             id="path2246" />
+        </g>
+        <g
+           id="g2248">
+          <path
+             d="M 526,395.5 C 526,454.397 503.064,509.771 461.417,551.417 C 419.771,593.064 364.397,616 305.5,616 C 246.603,616 191.23,593.064 149.583,551.417 C 107.936,509.771 85,454.397 85,395.5 C 85,336.603 107.936,281.23 149.583,239.583 C 191.23,197.936 246.603,175 305.5,175 C 364.397,175 419.771,197.936 461.417,239.583 C 503.064,281.23 526,336.603 526,395.5 z M 305.5,173 C 246.068,173 190.193,196.144 148.169,238.169 C 106.144,280.193 83,336.068 83,395.5 C 83,454.932 106.144,510.807 148.169,552.831 C 190.193,594.856 246.068,618 305.5,618 C 364.932,618 420.807,594.856 462.831,552.831 C 504.855,510.807 528,454.932 528,395.5 C 528,336.068 504.855,280.193 462.831,238.169 C 420.807,196.144 364.932,173 305.5,173 z "
+             id="path2250" />
+        </g>
+        <g
+           id="g2252">
+          <path
+             d="M 522.5,395.5 C 522.5,453.463 499.928,507.956 458.942,548.942 C 417.956,589.928 363.463,612.5 305.5,612.5 C 247.537,612.5 193.044,589.928 152.058,548.942 C 111.072,507.956 88.5,453.463 88.5,395.5 C 88.5,337.537 111.072,283.044 152.058,242.058 C 193.044,201.072 247.537,178.5 305.5,178.5 C 363.463,178.5 417.956,201.072 458.942,242.058 C 499.928,283.044 522.5,337.537 522.5,395.5 z M 305.5,176.5 C 247.003,176.5 192.007,199.28 150.644,240.644 C 109.281,282.008 86.5,337.003 86.5,395.5 C 86.5,453.997 109.28,508.992 150.644,550.356 C 192.007,591.72 247.003,614.5 305.5,614.5 C 363.997,614.5 418.992,591.72 460.356,550.356 C 501.72,508.992 524.5,453.997 524.5,395.5 C 524.5,337.003 501.72,282.007 460.356,240.644 C 418.992,199.28 363.997,176.5 305.5,176.5 z "
+             id="path2254" />
+        </g>
+        <g
+           id="g2256">
+          <path
+             d="M 519,395.5 C 519,513.225 423.225,609 305.5,609 C 187.776,609 92,513.225 92,395.5 C 92,277.776 187.776,182 305.5,182 C 423.225,182 519,277.776 519,395.5 z M 305.5,180 C 247.938,180 193.821,202.416 153.119,243.119 C 112.417,283.822 90,337.938 90,395.5 C 90,453.063 112.416,507.179 153.119,547.882 C 193.821,588.584 247.938,611 305.5,611 C 363.063,611 417.179,588.584 457.882,547.882 C 498.584,507.179 521,453.063 521,395.5 C 521,337.938 498.584,283.821 457.882,243.119 C 417.179,202.416 363.063,180 305.5,180 z "
+             id="path2258" />
+        </g>
+        <g
+           id="g2260">
+          <path
+             d="M 515.5,395.5 C 515.5,511.294 421.294,605.5 305.5,605.5 C 249.407,605.5 196.671,583.656 157.007,543.992 C 117.344,504.329 95.5,451.593 95.5,395.5 C 95.5,279.706 189.706,185.5 305.5,185.5 C 421.294,185.5 515.5,279.706 515.5,395.5 z M 305.5,183.5 C 188.603,183.5 93.5,278.603 93.5,395.5 C 93.5,452.127 115.552,505.365 155.593,545.406 C 195.635,585.448 248.873,607.5 305.5,607.5 C 422.397,607.5 517.5,512.397 517.5,395.5 C 517.5,278.603 422.397,183.5 305.5,183.5 z "
+             id="path2262" />
+        </g>
+        <g
+           id="g2264">
+          <path
+             d="M 512,395.5 C 512,509.364 419.364,602 305.5,602 C 191.636,602 99,509.364 99,395.5 C 99,281.636 191.636,189 305.5,189 C 419.364,189 512,281.636 512,395.5 z M 305.5,187 C 190.533,187 97,280.533 97,395.5 C 97,510.468 190.533,604 305.5,604 C 420.467,604 514,510.468 514,395.5 C 514,280.533 420.467,187 305.5,187 z "
+             id="path2266" />
+        </g>
+        <g
+           id="g2268">
+          <path
+             d="M 508.5,395.5 C 508.5,507.435 417.435,598.5 305.5,598.5 C 193.565,598.5 102.5,507.435 102.5,395.5 C 102.5,283.565 193.565,192.5 305.5,192.5 C 417.435,192.5 508.5,283.565 508.5,395.5 z M 305.5,190.5 C 192.462,190.5 100.5,282.462 100.5,395.5 C 100.5,508.537 192.462,600.5 305.5,600.5 C 418.537,600.5 510.5,508.537 510.5,395.5 C 510.5,282.462 418.537,190.5 305.5,190.5 z "
+             id="path2270" />
+        </g>
+        <g
+           id="g2272">
+          <path
+             d="M 505,395.5 C 505,505.505 415.505,595 305.5,595 C 195.495,595 106,505.505 106,395.5 C 106,285.495 195.495,196 305.5,196 C 415.505,196 505,285.495 505,395.5 z M 305.5,194 C 194.393,194 104,284.393 104,395.5 C 104,506.607 194.393,597 305.5,597 C 416.607,597 507,506.607 507,395.5 C 507,284.393 416.607,194 305.5,194 z "
+             id="path2274" />
+        </g>
+        <g
+           id="g2276">
+          <path
+             d="M 501.5,395.5 C 501.5,503.575 413.575,591.5 305.5,591.5 C 197.425,591.5 109.5,503.575 109.5,395.5 C 109.5,287.425 197.425,199.5 305.5,199.5 C 413.575,199.5 501.5,287.425 501.5,395.5 z M 305.5,197.5 C 196.322,197.5 107.5,286.322 107.5,395.5 C 107.5,504.678 196.322,593.5 305.5,593.5 C 414.678,593.5 503.5,504.678 503.5,395.5 C 503.5,286.322 414.678,197.5 305.5,197.5 z "
+             id="path2278" />
+        </g>
+        <g
+           id="g2280">
+          <path
+             d="M 498,395.5 C 498,501.645 411.645,588 305.5,588 C 199.355,588 113,501.645 113,395.5 C 113,289.355 199.355,203 305.5,203 C 411.645,203 498,289.355 498,395.5 z M 305.5,201 C 198.252,201 111,288.252 111,395.5 C 111,502.748 198.252,590 305.5,590 C 412.748,590 500,502.748 500,395.5 C 500,288.252 412.748,201 305.5,201 z "
+             id="path2282" />
+        </g>
+        <g
+           id="g2284">
+          <path
+             d="M 494.5,395.5 C 494.5,499.715 409.715,584.5 305.5,584.5 C 201.285,584.5 116.5,499.715 116.5,395.5 C 116.5,291.285 201.285,206.5 305.5,206.5 C 409.715,206.5 494.5,291.285 494.5,395.5 z M 305.5,204.5 C 200.182,204.5 114.5,290.182 114.5,395.5 C 114.5,500.817 200.182,586.5 305.5,586.5 C 410.817,586.5 496.5,500.817 496.5,395.5 C 496.5,290.182 410.817,204.5 305.5,204.5 z "
+             id="path2286" />
+        </g>
+        <g
+           id="g2288">
+          <path
+             d="M 491,395.5 C 491,497.785 407.785,581 305.5,581 C 203.215,581 120,497.785 120,395.5 C 120,293.215 203.215,210 305.5,210 C 407.785,210 491,293.215 491,395.5 z M 305.5,208 C 202.112,208 118,292.112 118,395.5 C 118,498.888 202.112,583 305.5,583 C 408.888,583 493,498.888 493,395.5 C 493,292.112 408.888,208 305.5,208 z "
+             id="path2290" />
+        </g>
+      </g>
+      <path
+         style="color:#000000;fill:#ff7a2c;fill-opacity:0.40273037;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter15171);enable-background:accumulate"
+         id="path10090"
+         sodipodi:nodetypes="ccscc"
+         d="M 351.84375,274.5625 C 242.54487,274.5625 140.10847,358.71424 144.5,462.9375 C 199.92598,429.0005 270.19663,408.21875 351.8125,408.21875 C 433.42264,408.21875 503.70027,429.00473 559.125,462.9375 C 564.12931,359.93344 461.14201,274.5625 351.84375,274.5625 z " />
+      <path
+         style="color:#000000;fill:url(#radialGradient8862);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter14172);enable-background:accumulate;opacity:0.41111111"
+         d="M 177.34375,564.84375 C 215.7652,619.89994 279.56642,655.90624 351.84375,655.90625 C 424.13089,655.90627 487.93308,619.91249 526.34375,564.84375 C 479.09106,594.93606 418.2689,613.03125 351.84375,613.03125 C 285.42899,613.03124 224.60201,594.92785 177.34375,564.84375 z "
+         id="path12141" />
+      <path
+         style="opacity:1;fill:url(#radialGradient10624);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path7728"
+         sodipodi:cx="115.39658"
+         sodipodi:cy="97.10112"
+         sodipodi:type="arc"
+         d="M 130.17298 97.10112 A 14.776392 14.776392 0 1 1  100.62019,97.10112 A 14.776392 14.776392 0 1 1  130.17298 97.10112 z"
+         transform="matrix(1.7857143,0,0,1.7857143,32.471871,143.23659)"
+         sodipodi:rx="14.776392"
+         sodipodi:ry="14.776392" />
+      <path
+         style="opacity:0.41111109;color:#000000;fill:url(#radialGradient10840);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter14172);enable-background:accumulate"
+         transform="matrix(1.2278253,0,0,1.2278253,-78.288932,-126.45493)"
+         d="M 177.34375,525.44004 C 215.7652,580.49623 279.56642,616.50253 351.84375,616.50254 C 424.13089,616.50256 487.93308,580.50878 526.34375,525.44004 C 479.09106,555.53235 418.2689,573.62754 351.84375,573.62754 C 285.42899,573.62753 224.60201,555.52414 177.34375,525.44004 z "
+         id="path10838" />
+      <path
+         style="opacity:0.28888889;fill:url(#linearGradient5443);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.09801996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 351.82243,220.39605 C 228.78302,220.39605 128.91619,320.23163 128.91618,443.27105 C 128.91618,566.31046 228.78301,666.17729 351.82243,666.1773 C 474.86184,666.1773 574.72868,566.31046 574.72868,443.27105 C 574.72868,320.23164 474.86184,220.39605 351.82243,220.39605 z M 351.82243,270.58355 C 447.15891,270.58355 524.54118,347.93456 524.54118,443.27105 C 524.54118,538.60753 447.15892,615.9898 351.82243,615.9898 C 256.48594,615.98979 179.10368,538.60754 179.10368,443.27105 C 179.10367,347.93456 256.48594,270.58355 351.82243,270.58355 z "
+         id="path3494" />
+    </g>
+  </g>
+  <g
+     inkscape:label="Continents"
+     style="display:inline"
+     id="layer3"
+     transform="translate(-127.71426,-219.17851)"
+     inkscape:groupmode="layer">
+    <g
+       inkscape:label="Shapes"
+       style="display:inline"
+       id="layer4"
+       inkscape:groupmode="layer" />
+    <g
+       inkscape:label="Highlights"
+       style="display:inline"
+       id="layer5"
+       inkscape:groupmode="layer" />
+  </g>
+</svg>
diff --git a/icons/shutter.svg b/icons/shutter.svg
new file mode 100644
index 0000000..b2e8f9a
--- /dev/null
+++ b/icons/shutter.svg
@@ -0,0 +1,61 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg5491"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="shutter.svg">
+  <defs
+     id="defs5493" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="-78.782381"
+     inkscape:cy="-14.092868"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5496">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 24.004484,1011.11 c -9.527297,0 -17.2567097,7.7293 -17.2567097,17.2566 0,9.5273 7.7294127,17.2478 17.2567097,17.2478 9.527301,0 17.247742,-7.7205 17.247742,-17.2478 0,-9.5273 -7.72044,-17.2566 -17.247741,-17.2566 z m -1.874557,0.3856 7.336789,14.2341 8.152991,-7.7494 -8.655263,13.4717 10.78096,3.1841 -15.992055,-0.7623 2.636937,10.9334 -7.336789,-14.2341 -8.15299,7.7493 8.66423,-13.4717 -10.7899287,-3.184 15.9920577,0.7713 -2.636939,-10.9424 z"
+       id="path5477" />
+  </g>
+</svg>
diff --git a/icons/torch-off.svg b/icons/torch-off.svg
new file mode 100644
index 0000000..2190a6c
--- /dev/null
+++ b/icons/torch-off.svg
@@ -0,0 +1,123 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg3846"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="torch-off.svg">
+  <defs
+     id="defs3848" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9671814"
+     inkscape:cx="21.150545"
+     inkscape:cy="24.438311"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3851">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <rect
+       style="fill:#1f1f1f;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect2997"
+       width="65.916328"
+       height="48.960682"
+       x="-9.3306217"
+       y="0.94557393"
+       transform="translate(0,1004.3622)" />
+    <g
+       id="g3780"
+       transform="matrix(0.05573128,0,0,0.05573128,53.310914,1004.5451)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         y="215.21933"
+         x="-588.57141"
+         height="520"
+         width="130"
+         id="rect3756"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(1.1097561,0,0,1,-274.669,285.71429)"
+         sodipodi:open="true"
+         sodipodi:end="3.1415927"
+         sodipodi:start="0"
+         d="m -165.71429,449.50504 c 0,42.60482 -26.22332,77.14286 -58.57143,77.14286 -32.34811,0 -58.57143,-34.53804 -58.57143,-77.14286 0,-1e-5 0,-1e-5 0,-1e-5"
+         sodipodi:ry="77.14286"
+         sodipodi:rx="58.57143"
+         sodipodi:cy="449.50504"
+         sodipodi:cx="-224.28572"
+         id="path3778"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3784"
+       sodipodi:cx="-407.14285"
+       sodipodi:cy="182.36218"
+       sodipodi:rx="184.28572"
+       sodipodi:ry="110"
+       d="m -222.85713,182.36218 c 0,60.75133 -82.50753,110 -184.28572,110 -101.7782,0 -184.28572,-49.24867 -184.28572,-110 0,0 0,0 0,0"
+       sodipodi:start="0"
+       sodipodi:end="3.1415927"
+       sodipodi:open="true"
+       transform="matrix(0.05205906,0,0,0.04919868,45.136002,1007.5765)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 24.020889,1006.9054 -0.329161,4.3208 c 0.03182,-7e-4 0.06381,0 0.09579,0 0.181256,0 0.360673,0 0.538157,0.017 l -0.304782,-4.3349 z m -3.46753,0.5381 1.029288,4.2374 c 0.194472,-0.082 0.395235,-0.1519 0.599112,-0.2125 l -1.6284,-4.0249 z m 6.931577,0.021 -1.67716,4.0822 c 0.205623,0.071 0.405439,0.155 0.600851,0.2474 l 1.076309,-4.3296 z m -10.061239,1.5657 2.354646,3.8211 c 0.159469,-0.1489 0.32585,-0.2886 0.499843,-0.4198 l -2.854489,-3.4013 z m 13.183935,0.037 -2.971177,3.4971 c 0.175541,0.142 0.343709,0.294 0.503326,0.4545 l 2.467851,-3.9516 z m -15.672683,2.4365 3.561578,3.0286 c 0.106411,-0.2017 0.223911,-0.3974 0.350063,-0.5852 l -3.911641,-2.4434 z m 18.147499,0.05 -4.09625,2.5253 c 0.127184,0.1992 0.244634,0.4059 0.350063,0.62 l 3.746187,-3.1453 z m -19.749774,3.0739 4.505525,1.8514 c 0.0397,-0.2356 0.09281,-0.4656 0.156746,-0.6915 l -4.662271,-1.1599 z m 21.334632,0.057 -4.888679,1.1877 c 0.06307,0.2334 0.114152,0.4706 0.151519,0.7142 l 0.03137,0 4.70581,-1.9019 z"
+       id="path3790" />
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="13.343792"
+       y="26.328878"
+       id="text2999"
+       sodipodi:linespacing="125%"
+       transform="translate(0,1004.3622)"><tspan
+         sodipodi:role="line"
+         id="tspan3001"></tspan></text>
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.94117647000000004;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 6.5214023,2.9521593 36.6201827,41.8373037 0,0"
+       id="path3773"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1004.3622)" />
+  </g>
+</svg>
diff --git a/icons/torch-on.svg b/icons/torch-on.svg
new file mode 100644
index 0000000..9003202
--- /dev/null
+++ b/icons/torch-on.svg
@@ -0,0 +1,99 @@
+<?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://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg3846"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="torch-on.svg">
+  <defs
+     id="defs3848" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.2828125"
+     inkscape:cx="-20.540809"
+     inkscape:cy="28.429458"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1024"
+     inkscape:window-height="686"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3851">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <g
+       id="g3780"
+       transform="matrix(0.05573128,0,0,0.05573128,53.310914,1004.5451)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         y="215.21933"
+         x="-588.57141"
+         height="520"
+         width="130"
+         id="rect3756"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(1.1097561,0,0,1,-274.669,285.71429)"
+         sodipodi:open="true"
+         sodipodi:end="3.1415927"
+         sodipodi:start="0"
+         d="m -165.71429,449.50504 c 0,42.60482 -26.22332,77.14286 -58.57143,77.14286 -32.34811,0 -58.57143,-34.53804 -58.57143,-77.14286 0,-1e-5 0,-1e-5 0,-1e-5"
+         sodipodi:ry="77.14286"
+         sodipodi:rx="58.57143"
+         sodipodi:cy="449.50504"
+         sodipodi:cx="-224.28572"
+         id="path3778"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3784"
+       sodipodi:cx="-407.14285"
+       sodipodi:cy="182.36218"
+       sodipodi:rx="184.28572"
+       sodipodi:ry="110"
+       d="m -222.85713,182.36218 a 184.28572,110 0 1 1 -368.57144,0"
+       sodipodi:start="0"
+       sodipodi:end="3.1415927"
+       sodipodi:open="true"
+       transform="matrix(0.05205906,0,0,0.04919868,45.136002,1007.5765)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 24.020889,1006.9054 -0.329161,4.3208 c 0.03182,-7e-4 0.06381,0 0.09579,0 0.181256,0 0.360673,0 0.538157,0.017 l -0.304782,-4.3349 z m -3.46753,0.5381 1.029288,4.2374 c 0.194472,-0.082 0.395235,-0.1519 0.599112,-0.2125 l -1.6284,-4.0249 z m 6.931577,0.021 -1.67716,4.0822 c 0.205623,0.071 0.405439,0.155 0.600851,0.2474 l 1.076309,-4.3296 z m -10.061239,1.5657 2.354646,3.8211 c 0.159469,-0.1489 0.32585,-0.2886 0.499843,-0.4198 l -2.854489,-3.4013 z m 13.183935,0.037 -2.971177,3.4971 c 0.175541,0.142 0.343709,0.294 0.503326,0.4545 l 2.467851,-3.9516 z m -15.672683,2.4365 3.561578,3.0286 c 0.106411,-0.2017 0.223911,-0.3974 0.350063,-0.5852 l -3.911641,-2.4434 z m 18.147499,0.05 -4.09625,2.5253 c 0.127184,0.1992 0.244634,0.4059 0.350063,0.62 l 3.746187,-3.1453 z m -19.749774,3.0739 4.505525,1.8514 c 0.0397,-0.2356 0.09281,-0.4656 0.156746,-0.6915 l -4.662271,-1.1599 z m 21.334632,0.057 -4.888679,1.1877 c 0.06307,0.2334 0.114152,0.4706 0.151519,0.7142 l 0.03137,0 4.70581,-1.9019 z"
+       id="path3790" />
+  </g>
+</svg>
diff --git a/qml/CameraTheme.qml b/qml/CameraTheme.qml
new file mode 100644
index 0000000..00b30fb
--- /dev/null
+++ b/qml/CameraTheme.qml
@@ -0,0 +1,197 @@
+// -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+import QtQuick 1.1
+import QtCamera 1.0
+
+QtObject {
+    property string standbyIcon: "image://theme/cameraplus-icon-l-camera-standby"
+
+    property string gpsIndicatorIcon: "image://theme/cameraplus-icon-m-camera-location"
+    property string faceDetectionIndicatorIcon: "image://theme/cameraplus-icon-m-camera-face-detection-screen"
+
+    property string recordingDurationIcon: "image://theme/cameraplus-icon-m-camera-ongoing-recording"
+    property string cameraTorchOnIconId: "image://theme/cameraplus-icon-m-camera-torch-on"
+    property string cameraTorchOffIconId: "image://theme/cameraplus-icon-m-camera-torch-off"
+    property string soundMuteOnIconId: "image://theme/cameraplus-icon-m-toolbar-volume-off-white-selected"
+    property string soundMuteOffIconId: "image://theme/cameraplus-icon-m-toolbar-volume-white-selected"
+    property string videoStopIconId: "image://theme/cameraplus-icon-m-toolbar-mediacontrol-stop-white"
+    property string videoPauseIconId: "image://theme/cameraplus-icon-m-toolbar-mediacontrol-pause-white"
+    property string videoPlayIconId: "image://theme/cameraplus-icon-m-toolbar-mediacontrol-play-white"
+    property string cameraManualExposureIconId: "image://theme/cameraplus-icon-m-camera-manual-exposure"
+    property string cameraVideoIconId: "image://theme/cameraplus-icon-m-camera-video"
+    property string cameraImageIconId: "image://theme/cameraplus-icon-m-viewfinder-camera"
+    property string captureButtonImageIconId: "image://theme/cameraplus-icon-m-camera-shutter"
+    property string captureButtonVideoIconId: "image://theme/cameraplus-icon-m-camera-video-record"
+    property string captureButtonRecordingIconId: "image://theme/cameraplus-icon-m-camera-video-record"
+    property string cameraToolBarMenuIcon: "image://theme/cameraplus-icon-m-toolbar-back-white"
+    property string deleteIconId: "image://theme/cameraplus-icon-m-toolbar-delete-white"
+    property string shareIconId: "image://theme/cameraplus-icon-m-toolbar-share-white"
+    property string favoriteMarkIconId: "image://theme/cameraplus-icon-m-toolbar-favorite-mark-white"
+    property string favoriteUnmarkIconId: "image://theme/cameraplus-icon-m-toolbar-favorite-unmark-white"
+    property string galleryIconId: "image://theme/cameraplus-icon-m-camera-roll"
+
+    property string flashAutoIconId: "image://theme/cameraplus-icon-m-camera-flash-auto"
+    property string flashOnIconId: "image://theme/cameraplus-icon-m-camera-flash-always"
+    property string flashOffIconId: "image://theme/cameraplus-icon-m-camera-flash-off"
+    property string flashRedEyeIconId: "image://theme/cameraplus-icon-m-camera-flash-red-eye"
+
+    property string whiteBalanceAutoIconId: "image://theme/cameraplus-icon-m-camera-whitebalance-auto"
+    property string whiteBalanceSunsetIconId: "image://theme/cameraplus-icon-m-camera-whitebalance-sunny"
+    property string whiteBalanceCloudyIconId: "image://theme/cameraplus-icon-m-camera-whitebalance-cloudy"
+    property string whiteBalanceFlourescentIconId: "image://theme/cameraplus-icon-m-camera-whitebalance-fluorescent"
+    property string whiteBalanceTungstenIconId: "image://theme/cameraplus-icon-m-camera-whitebalance-tungsten"
+
+    property string colorFilterNormalIconId: "image://theme/cameraplus-icon-m-camera-no-filter"
+    property string colorFilterGrayScaleIconId: "image://theme/cameraplus-icon-m-camera-filter-black-white"
+    property string colorFilterSepiaIconId: "image://theme/cameraplus-icon-m-camera-filter-sepia"
+    property string colorFilterVividIconId: "image://theme/cameraplus-icon-m-camera-filter-vivid"
+    property string colorFilterNegativeIconId: "image://theme/cameraplus-icon-m-camera-filter-negative"
+    property string colorFilterSolarizeIconId: "image://theme/cameraplus-icon-m-camera-filter-solarize"
+
+    property string imageSceneModeAutoIconId: "image://theme/cameraplus-icon-m-camera-scene-auto"
+    property string imageSceneModeCloseupIconId: "image://theme/cameraplus-icon-m-camera-scene-macro"
+    property string imageSceneModeLandscapeIconId: "image://theme/cameraplus-icon-m-camera-scene-landscape"
+    property string imageSceneModePortraitIconId: "image://theme/cameraplus-icon-m-camera-scene-portrait"
+    property string imageSceneModeNightIconId: "image://theme/cameraplus-icon-m-camera-night"
+    property string imageSceneModeSportIconId: "image://theme/cameraplus-icon-m-camera-scene-sports"
+
+    property string videoSceneModeAutoIconId: "image://theme/cameraplus-icon-m-camera-scene-auto"
+    property string videoSceneModeNightIconId: "image://theme/cameraplus-icon-m-camera-video-night"
+
+    property string isoAudoIconId: "image://theme/cameraplus-icon-m-camera-iso-auto"
+    property string iso100IconId: "image://theme/cameraplus-icon-m-camera-iso-100"
+    property string iso200IconId: "image://theme/cameraplus-icon-m-camera-iso-200"
+    property string iso400IconId: "image://theme/cameraplus-icon-m-camera-iso-400"
+    property string iso800IconId: "image://theme/cameraplus-icon-m-camera-iso-800"
+    property string resetIconId: "image://theme/cameraplus-icon-m-settings-reset"
+
+    function videoIcon(ratio, res, device) {
+        if (res == "high") {
+            return "image://theme/cameraplus-icon-m-camera-video-high-resolution"
+        } else if (res == "medium") {
+            return "image://theme/cameraplus-icon-m-camera-video-fine-resolution"
+        } else if (res == "low") {
+            return "image://theme/cameraplus-icon-m-camera-video-low-resolution"
+        } else {
+            return ""
+        }
+    }
+
+    function whiteBalanceIcon(val) {
+        switch (val) {
+            case WhiteBalance.Auto:
+                return whiteBalanceAutoIconId
+            case WhiteBalance.Sunset:
+                return whiteBalanceSunsetIconId
+            case WhiteBalance.Cloudy:
+                return whiteBalanceCloudyIconId
+            case WhiteBalance.Flourescent:
+                return whiteBalanceFlourescentIconId
+            case WhiteBalance.Tungsten:
+                return whiteBalanceTungstenIconId
+            default:
+                return ""
+        }
+    }
+
+    function colorFilterIcon(val) {
+        switch (val) {
+            case ColorTone.Normal:
+                return colorFilterNormalIconId
+            case ColorTone.GrayScale:
+                return colorFilterGrayScaleIconId
+            case ColorTone.Sepia:
+                return colorFilterSepiaIconId
+            case ColorTone.Vivid:
+                return colorFilterVividIconId
+            case ColorTone.Negative:
+                return colorFilterNegativeIconId
+            case ColorTone.Solarize:
+                return colorFilterSolarizeIconId
+            default:
+                return ""
+        }
+    }
+
+    function imageSceneModeIcon(val) {
+        switch (val) {
+            case Scene.Auto:
+                return imageSceneModeAutoIconId
+            case Scene.Closeup:
+                return imageSceneModeCloseupIconId
+            case Scene.Landscape:
+                return imageSceneModeLandscapeIconId
+            case Scene.Portrait:
+                return imageSceneModePortraitIconId
+            case Scene.Night:
+                return imageSceneModeNightIconId
+            case Scene.Sport:
+                return imageSceneModeSportIconId
+            default:
+                return ""
+        }
+    }
+
+    function videoSceneModeIcon(val) {
+        switch (val) {
+            case Scene.Auto:
+                return videoSceneModeAutoIconId
+            case Scene.Night:
+                return videoSceneModeNightIconId
+            default:
+                return ""
+        }
+    }
+
+    function flashIcon(val) {
+        switch (val) {
+            case Flash.Auto:
+                return flashAutoIconId
+            case Flash.On:
+                return flashOnIconId
+            case Flash.Off:
+                return flashOffIconId
+            case Flash.RedEye:
+                return flashRedEyeIconId
+            default:
+                return ""
+        }
+    }
+
+    function isoIcon(val) {
+        switch (val) {
+            case 0:
+                return isoAudoIconId
+            case 100:
+                return iso100IconId
+            case 200:
+                return iso200IconId
+            case 400:
+                return iso400IconId
+            case 800:
+                return iso800IconId
+            default:
+                return ""
+        }
+    }
+}
diff --git a/qml/CameraToolBar.qml b/qml/CameraToolBar.qml
index 8c4d922..0526128 100644
--- a/qml/CameraToolBar.qml
+++ b/qml/CameraToolBar.qml
@@ -122,7 +122,7 @@ Rectangle {
         visible: !parent.hideBack
         id: menu
         anchors.verticalCenter: parent.verticalCenter
-        iconId: cameraTheme.cameraToolBarMenuIcon
+        iconSource: cameraTheme.cameraToolBarMenuIcon
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.bottom: parent.bottom
diff --git a/qml/CaptureButton.qml b/qml/CaptureButton.qml
index d314cc9..2c6d4fc 100644
--- a/qml/CaptureButton.qml
+++ b/qml/CaptureButton.qml
@@ -25,7 +25,7 @@ import QtQuick 2.0
 Item {
     id: button
 
-    property string iconId
+    property alias iconSource: icon.source
     property CameraButtonStyle platformStyle: CameraButtonStyle {}
 
     property alias pressed: mouse.pressed
@@ -57,7 +57,6 @@ Item {
         anchors.centerIn: parent
         anchors.verticalCenter: parent.verticalCenter
         anchors.verticalCenterOffset: -1
-        source: "image://theme/" + button.iconId
         visible: source != ""
     }
 }
diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index 933b21d..68f5f95 100644
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.flashIcon(settings.imageFlashMode)
+    iconSource: cameraTheme.flashIcon(settings.imageFlashMode)
 
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.flashAutoIconId; value: Flash.Auto },
@@ -46,7 +46,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.imageFlashMode = value
                 checked: settings.imageFlashMode == value
             }
diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml
index f05ef33..1af5b3e 100644
--- a/qml/ImageColorFilterButton.qml
+++ b/qml/ImageColorFilterButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.colorFilterIcon(settings.imageColorFilter)
+    iconSource: cameraTheme.colorFilterIcon(settings.imageColorFilter)
 
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.colorFilterNormalIconId; value: ColorTone.Normal },
@@ -48,7 +48,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.imageColorFilter = value
                 checked: settings.imageColorFilter == value
             }
diff --git a/qml/ImageEvCompButton.qml b/qml/ImageEvCompButton.qml
index 5fb254e..c8e00bf 100644
--- a/qml/ImageEvCompButton.qml
+++ b/qml/ImageEvCompButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: settings.imageEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
+    iconSource: settings.imageEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
 
     CameraLabel {
         anchors.fill: parent
@@ -44,7 +44,6 @@ CameraToolIcon {
 
         CameraSlider {
             id: slider
-            width: 500
             orientation: Qt.Horizontal
             minimumValue: cam ? cam.evComp.minimum : 0
             maximumValue: cam ? cam.evComp.maximum : 0
diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml
index 50931d2..bc568ed 100644
--- a/qml/ImageIsoButton.qml
+++ b/qml/ImageIsoButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.isoIcon(settings.imageIso)
+    iconSource: cameraTheme.isoIcon(settings.imageIso)
 
     property CameraToolBarTools tools: CameraToolBarTools {
         CameraLabel {
diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 20c9d9e..a781b6b 100644
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -72,7 +72,7 @@ Item {
         anchors.right: parent.right
         anchors.rightMargin: 20
         anchors.verticalCenter: parent.verticalCenter
-        iconId: cameraTheme.captureButtonImageIconId
+        iconSource: cameraTheme.captureButtonImageIconId
         width: 75
         height: 75
         opacity: 0.5
@@ -174,7 +174,7 @@ Item {
             Indicator {
                 id: flashIndicator
                 visible: !toolBar.expanded
-                source: "image://theme/" + cameraTheme.flashIndicatorIcon(settings.imageFlashMode)
+                source: cameraTheme.flashIcon(settings.imageFlashMode)
             }
 
             CameraLabel {
@@ -193,26 +193,26 @@ Item {
 
             Indicator {
                 id: wbIndicator
-                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.imageWhiteBalance) : ""
+                source: visible ? cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance) : ""
                 visible: settings.imageWhiteBalance != WhiteBalance.Auto && !toolBar.expanded
             }
 
             Indicator {
                 id: cfIndicator
-                source: visible ? "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.imageColorFilter) : ""
+                source: visible ? cameraTheme.colorFilterIcon(settings.imageColorFilter) : ""
                 visible: settings.imageColorFilter != ColorTone.Normal && !toolBar.expanded
             }
 
             Indicator {
                 id: isoIndicator
                 visible: settings.imageIso != 0 && !toolBar.expanded
-                source: visible ? "image://theme/" + cameraTheme.isoIcon(settings.imageIso) : ""
+                source: visible ? cameraTheme.isoIcon(settings.imageIso) : ""
             }
 
             Indicator {
                 id: sceneIndicator
                 visible: settings.imageSceneMode != Scene.Auto && !toolBar.expanded
-                source: visible ? "image://theme/" + cameraTheme.imageSceneModeIndicatorIcon(settings.imageSceneMode) : ""
+                source: visible ? cameraTheme.imageSceneModeIcon(settings.imageSceneMode) : ""
             }
 
             Indicator {
diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index dcd4bfe..ebb748d 100644
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.imageSceneModeIcon(settings.imageSceneMode)
+    iconSource: cameraTheme.imageSceneModeIcon(settings.imageSceneMode)
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.imageSceneModeAutoIconId; value: Scene.Auto},
         ToolsModelItem {icon: cameraTheme.imageSceneModeCloseupIconId; value: Scene.Closeup},
@@ -47,7 +47,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.imageSceneMode = value
                 checked: settings.imageSceneMode == value
             }
diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml
index b257ca2..1aa147d 100644
--- a/qml/ImageWhiteBalanceButton.qml
+++ b/qml/ImageWhiteBalanceButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance)
+    iconSource: cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance)
 
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.whiteBalanceAutoIconId; value: WhiteBalance.Auto },
@@ -47,7 +47,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.imageWhiteBalance = value
                 checked: settings.imageWhiteBalance == value
             }
diff --git a/qml/ModeButton.qml b/qml/ModeButton.qml
index 74dcde3..830e143 100644
--- a/qml/ModeButton.qml
+++ b/qml/ModeButton.qml
@@ -29,7 +29,7 @@ CaptureButton {
     height: 55
     opacity: 0.5
 
-    iconId: settings.mode == Camera.VideoMode ? cameraTheme.cameraImageIconId : cameraTheme.cameraVideoIconId
+    iconSource: settings.mode == Camera.VideoMode ? cameraTheme.cameraImageIconId : cameraTheme.cameraVideoIconId
     onClicked: {
         if (settings.mode == Camera.VideoMode) {
             settings.mode = Camera.ImageMode
diff --git a/qml/PostCaptureItem.qml b/qml/PostCaptureItem.qml
index abe6fa9..760ae26 100644
--- a/qml/PostCaptureItem.qml
+++ b/qml/PostCaptureItem.qml
@@ -118,7 +118,7 @@ Item {
             CameraToolIcon {
                 id: playIcon
                 anchors.horizontalCenter: parent.horizontalCenter
-                iconId: cameraTheme.videoPlayIconId
+                iconSource: cameraTheme.videoPlayIconId
                 visible: isVideo
                 onClicked: startPlayback()
             }
diff --git a/qml/PostCaptureView.qml b/qml/PostCaptureView.qml
index a34e431..884d61d 100644
--- a/qml/PostCaptureView.qml
+++ b/qml/PostCaptureView.qml
@@ -135,7 +135,7 @@ Item {
 
         tools: CameraToolBarTools {
             CameraToolIcon {
-                iconId: available && view.currentItem.itemData.favorite ? cameraTheme.favoriteMarkIconId : cameraTheme.favoriteUnmarkIconId
+                iconSource: available && view.currentItem.itemData.favorite ? cameraTheme.favoriteMarkIconId : cameraTheme.favoriteUnmarkIconId
                 opacity: available ? 1.0 : 0.4
                 onClicked: {
                     addOrRemoveFavorite()
@@ -144,7 +144,7 @@ Item {
             }
 
             CameraToolIcon {
-                iconId: cameraTheme.shareIconId
+                iconSource: cameraTheme.shareIconId
                 opacity: available ? 1.0 : 0.4
                 onClicked: {
                     shareCurrentItem()
@@ -153,7 +153,7 @@ Item {
             }
 
             CameraToolIcon {
-                iconId: cameraTheme.deleteIconId
+                iconSource: cameraTheme.deleteIconId
                 opacity: available ? 1.0 : 0.4
                 onClicked: {
                     deleteCurrentItem()
@@ -162,7 +162,7 @@ Item {
             }
 
             CameraToolIcon {
-                iconId: cameraTheme.galleryIconId
+                iconSource: cameraTheme.galleryIconId
                 onClicked: {
                     launchGallery()
                     restartTimer()
diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml
index 6b0c568..6cfc767 100644
--- a/qml/VideoColorFilterButton.qml
+++ b/qml/VideoColorFilterButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.colorFilterIcon(settings.videoColorFilter)
+    iconSource: cameraTheme.colorFilterIcon(settings.videoColorFilter)
 
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.colorFilterNormalIconId; value: ColorTone.Normal },
@@ -48,7 +48,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.videoColorFilter = value
                 checked: settings.videoColorFilter == value
             }
diff --git a/qml/VideoEvCompButton.qml b/qml/VideoEvCompButton.qml
index d2ab04e..1884d8b 100644
--- a/qml/VideoEvCompButton.qml
+++ b/qml/VideoEvCompButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: settings.videoEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
+    iconSource: settings.videoEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
 
     CameraLabel {
         anchors.fill: parent
@@ -44,7 +44,6 @@ CameraToolIcon {
 
         CameraSlider {
             id: slider
-            width: 500
             orientation: Qt.Horizontal
             minimumValue: cam ? cam.evComp.minimum : 0
             maximumValue: cam ? cam.evComp.maximum : 0
diff --git a/qml/VideoMuteButton.qml b/qml/VideoMuteButton.qml
index c480dc6..ac8ed9a 100644
--- a/qml/VideoMuteButton.qml
+++ b/qml/VideoMuteButton.qml
@@ -23,6 +23,6 @@
 import QtQuick 2.0
 
 CameraToolIcon {
-    iconId: settings.videoMuted ? cameraTheme.soundMuteOnIconId : cameraTheme.soundMuteOffIconId
+    iconSource: settings.videoMuted ? cameraTheme.soundMuteOnIconId : cameraTheme.soundMuteOffIconId
     onClicked: settings.videoMuted = !settings.videoMuted
 }
diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index d1df5bd..b80b715 100644
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -79,7 +79,7 @@ Item {
         anchors.right: parent.right
         anchors.rightMargin: 20
         anchors.verticalCenter: parent.verticalCenter
-        iconId: overlay.recording ? cameraTheme.captureButtonRecordingIconId : cameraTheme.captureButtonVideoIconId
+        iconSource: overlay.recording ? cameraTheme.captureButtonRecordingIconId : cameraTheme.captureButtonVideoIconId
         width: 75
         height: 75
         opacity: 0.5
@@ -150,25 +150,25 @@ Item {
                 id: resolutionIndicator
                 property string videoResolution: settings.device == 1 ? settings.secondaryVideoResolution : settings.primaryVideoResolution
                 property string videoRatio: settings.device == 1 ? settings.secondaryVideoAspectRatio : settings.primaryVideoAspectRatio
-                source: "image://theme/" + cameraTheme.videoIcon(videoRatio, videoResolution, settings.device)
+                source: cameraTheme.videoIcon(videoRatio, videoResolution, settings.device)
             }
 
             Indicator {
                 id: wbIndicator
-                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.videoWhiteBalance) : ""
+                source: visible ? cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance) : ""
                 visible: settings.videoWhiteBalance != WhiteBalance.Auto && !toolBar.expanded
             }
 
             Indicator {
                 id: cfIndicator
-                source: visible ? "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.videoColorFilter) : ""
+                source: visible ? cameraTheme.colorFilterIcon(settings.videoColorFilter) : ""
                 visible: settings.videoColorFilter != ColorTone.Normal && !toolBar.expanded
             }
 
             Indicator {
                 id: sceneIndicator
                 visible: settings.videoSceneMode != Scene.Auto && (!toolBar.expanded || overlay.recording)
-                source: visible ? "image://theme/" + cameraTheme.videoSceneModeIndicatorIcon(settings.videoSceneMode) : ""
+                source: visible ? cameraTheme.videoSceneModeIcon(settings.videoSceneMode) : ""
             }
 
             Indicator {
diff --git a/qml/VideoPlayerPage.qml b/qml/VideoPlayerPage.qml
index 8235b82..7f4d981 100644
--- a/qml/VideoPlayerPage.qml
+++ b/qml/VideoPlayerPage.qml
@@ -105,7 +105,7 @@ Item {
 
         tools: CameraToolBarTools {
             CameraToolIcon {
-                iconId: cameraTheme.videoStopIconId
+                iconSource: cameraTheme.videoStopIconId
                 onClicked: video.stop()
             }
 
@@ -133,7 +133,7 @@ Item {
 
             CameraToolIcon {
                 id: control
-                iconId: video.state != VideoPlayer.StatePaused ? cameraTheme.videoPauseIconId : cameraTheme.videoPlayIconId
+                iconSource: video.state != VideoPlayer.StatePaused ? cameraTheme.videoPauseIconId : cameraTheme.videoPlayIconId
                 onClicked: {
                     video.toggle()
                     hideTimer.restart()
diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index 444a056..b08fb8f 100644
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.videoSceneModeIcon(settings.videoSceneMode)
+    iconSource: cameraTheme.videoSceneModeIcon(settings.videoSceneMode)
 
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.videoSceneModeAutoIconId; value: Scene.Auto},
@@ -44,7 +44,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.videoSceneMode = value
                 checked: settings.videoSceneMode == value
             }
diff --git a/qml/VideoTorchButton.qml b/qml/VideoTorchButton.qml
index 1392bad..0f05773 100644
--- a/qml/VideoTorchButton.qml
+++ b/qml/VideoTorchButton.qml
@@ -27,7 +27,7 @@ CameraToolIcon {
     id: button
     property Camera camera: null
 
-    iconId: settings.videoTorchOn ? cameraTheme.cameraTorchOnIconId : cameraTheme.cameraTorchOffIconId
+    iconSource: settings.videoTorchOn ? cameraTheme.cameraTorchOnIconId : cameraTheme.cameraTorchOffIconId
     onClicked: settings.videoTorchOn = !settings.videoTorchOn
 
     Binding {
diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml
index e519396..8867db2 100644
--- a/qml/VideoWhiteBalanceButton.qml
+++ b/qml/VideoWhiteBalanceButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance)
+    iconSource: cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance)
 
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.whiteBalanceAutoIconId; value: WhiteBalance.Auto },
@@ -47,7 +47,7 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.videoWhiteBalance = value
                 checked: settings.videoWhiteBalance == value
             }
diff --git a/qml/harmattan/CameraTheme.qml b/qml/harmattan/CameraTheme.qml
deleted file mode 100644
index f6e27b8..0000000
--- a/qml/harmattan/CameraTheme.qml
+++ /dev/null
@@ -1,232 +0,0 @@
-// -*- qml -*-
-
-/*!
- * This file is part of CameraPlus.
- *
- * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import QtQuick 1.1
-import QtCamera 1.0
-
-QtObject {
-    property string standbyIcon: "image://theme/icon-l-camera-standby"
-
-    property string gpsIndicatorIcon: "image://theme/icon-m-camera-location"
-    property string faceDetectionIndicatorIcon: "image://theme/icon-m-camera-face-detection-screen"
-
-    property string recordingDurationIcon: "image://theme/icon-m-camera-ongoing-recording"
-    property string cameraTorchOnIconId: "icon-m-camera-torch-on"
-    property string cameraTorchOffIconId: "icon-m-camera-torch-off"
-    property string soundMuteOnIconId: "icon-m-toolbar-volume-off-white-selected"
-    property string soundMuteOffIconId: "icon-m-toolbar-volume-white-selected"
-    property string videoStopIconId: "icon-m-toolbar-mediacontrol-stop-white"
-    property string videoPauseIconId: "icon-m-toolbar-mediacontrol-pause-white"
-    property string videoPlayIconId: "icon-m-toolbar-mediacontrol-play-white"
-    property string cameraManualExposureIconId: "icon-m-camera-manual-exposure"
-    property string cameraVideoIconId: "icon-m-camera-video"
-    property string cameraImageIconId: "icon-m-viewfinder-camera"
-    property string captureButtonImageIconId: "icon-m-camera-shutter"
-    property string captureButtonVideoIconId: "icon-m-camera-video-record"
-    property string captureButtonRecordingIconId: "icon-m-camera-video-record"
-    property string cameraToolBarMenuIcon: "icon-m-toolbar-back-white"
-    property string deleteIconId: "icon-m-toolbar-delete-white"
-    property string shareIconId: "icon-m-toolbar-share-white"
-    property string favoriteMarkIconId: "icon-m-toolbar-favorite-mark-white"
-    property string favoriteUnmarkIconId: "icon-m-toolbar-favorite-unmark-white"
-    property string galleryIconId: "icon-m-camera-roll"
-
-    property string flashAutoIconId: "icon-m-camera-flash-auto"
-    property string flashOnIconId: "icon-m-camera-flash-always"
-    property string flashOffIconId: "icon-m-camera-flash-off"
-    property string flashRedEyeIconId: "icon-m-camera-flash-red-eye"
-
-    property string whiteBalanceAutoIconId: "icon-m-camera-whitebalance-auto"
-    property string whiteBalanceSunsetIconId: "icon-m-camera-whitebalance-sunny"
-    property string whiteBalanceCloudyIconId: "icon-m-camera-whitebalance-cloudy"
-    property string whiteBalanceFlourescentIconId: "icon-m-camera-whitebalance-fluorescent"
-    property string whiteBalanceTungstenIconId: "icon-m-camera-whitebalance-tungsten"
-
-    property string colorFilterNormalIconId: "icon-m-camera-no-filter"
-    property string colorFilterGrayScaleIconId: "icon-m-camera-filter-black-white"
-    property string colorFilterSepiaIconId: "icon-m-camera-filter-sepia"
-    property string colorFilterVividIconId: "icon-m-camera-filter-vivid"
-    property string colorFilterNegativeIconId: "icon-m-camera-filter-negative"
-    property string colorFilterSolarizeIconId: "icon-m-camera-filter-solarize"
-
-    property string imageSceneModeAutoIconId: "icon-m-camera-scene-auto"
-    property string imageSceneModeCloseupIconId: "icon-m-camera-scene-macro"
-    property string imageSceneModeLandscapeIconId: "icon-m-camera-scene-landscape"
-    property string imageSceneModePortraitIconId: "icon-m-camera-scene-portrait"
-    property string imageSceneModeNightIconId: "icon-m-camera-night"
-    property string imageSceneModeSportIconId: "icon-m-camera-scene-sports"
-
-    property string videoSceneModeAutoIconId: "icon-m-camera-scene-auto"
-    property string videoSceneModeNightIconId: "icon-m-camera-video-night"
-
-    property string isoAudoIconId: "icon-m-camera-iso-auto"
-    property string iso100IconId: "icon-m-camera-iso-100"
-    property string iso200IconId: "icon-m-camera-iso-200"
-    property string iso400IconId: "icon-m-camera-iso-400"
-    property string iso800IconId: "icon-m-camera-iso-800"
-
-    function videoIcon(ratio, res, device) {
-        if (res == "high") {
-            return "icon-m-camera-video-high-resolution"
-        } else if (res == "medium") {
-            return "icon-m-camera-video-fine-resolution"
-        } else if (res == "low") {
-            return "icon-m-camera-video-low-resolution"
-        } else {
-            return ""
-        }
-    }
-
-    function whiteBalanceIcon(val) {
-        switch (val) {
-            case WhiteBalance.Auto:
-                return whiteBalanceAutoIconId
-            case WhiteBalance.Sunset:
-                return whiteBalanceSunsetIconId
-            case WhiteBalance.Cloudy:
-                return whiteBalanceCloudyIconId
-            case WhiteBalance.Flourescent:
-                return whiteBalanceFlourescentIconId
-            case WhiteBalance.Tungsten:
-                return whiteBalanceTungstenIconId
-            default:
-                return ""
-        }
-    }
-
-    function colorFilterIcon(val) {
-        switch (val) {
-            case ColorTone.Normal:
-                return colorFilterNormalIconId
-            case ColorTone.GrayScale:
-                return colorFilterGrayScaleIconId
-            case ColorTone.Sepia:
-                return colorFilterSepiaIconId
-            case ColorTone.Vivid:
-                return colorFilterVividIconId
-            case ColorTone.Negative:
-                return colorFilterNegativeIconId
-            case ColorTone.Solarize:
-                return colorFilterSolarizeIconId
-            default:
-                return ""
-        }
-    }
-
-    function imageSceneModeIcon(val) {
-        switch (val) {
-            case Scene.Auto:
-                return imageSceneModeAutoIconId
-            case Scene.Closeup:
-                return imageSceneModeCloseupIconId
-            case Scene.Landscape:
-                return imageSceneModeLandscapeIconId
-            case Scene.Portrait:
-                return imageSceneModePortraitIconId
-            case Scene.Night:
-                return imageSceneModeNightIconId
-            case Scene.Sport:
-                return imageSceneModeSportIconId
-            default:
-                return ""
-        }
-    }
-
-    function videoSceneModeIcon(val) {
-        switch (val) {
-            case Scene.Auto:
-                return videoSceneModeAutoIconId
-            case Scene.Night:
-                return videoSceneModeNightIconId
-            default:
-                return ""
-        }
-    }
-
-    function flashIcon(val) {
-        switch (val) {
-            case Flash.Auto:
-                return flashAutoIconId
-            case Flash.On:
-                return flashOnIconId
-            case Flash.Off:
-                return flashOffIconId
-            case Flash.RedEye:
-                return flashRedEyeIconId
-            default:
-                return ""
-        }
-    }
-
-    function isoIcon(val) {
-        switch (val) {
-            case 0:
-                return isoAudoIconId
-            case 100:
-                return iso100IconId
-            case 200:
-                return iso200IconId
-            case 400:
-                return iso400IconId
-            case 800:
-                return iso800IconId
-            default:
-                return ""
-        }
-    }
-
-    function flashIndicatorIcon(val) {
-        return flashIcon(val) + "-screen"
-    }
-
-    function whiteBalanceIndicatorIcon(val) {
-        if (val == WhiteBalance.Auto) {
-            return ""
-        } else {
-            return whiteBalanceIcon(val) + "-screen"
-        }
-    }
-
-    function colorFilterIndicatorIcon(val) {
-        if (val == ColorTone.Normal) {
-            return ""
-        } else {
-            return colorFilterIcon(val) + "-screen"
-        }
-    }
-
-    function imageSceneModeIndicatorIcon(val) {
-        if (val == Scene.Auto) {
-            return ""
-        } else {
-            return imageSceneModeIcon(val) + "-screen"
-        }
-    }
-
-    function videoSceneModeIndicatorIcon(val) {
-        if (val == Scene.Auto) {
-            return ""
-        } else {
-            return videoSceneModeIcon(val) + "-screen"
-        }
-    }
-}
diff --git a/qml/harmattan/harmattan.qrc b/qml/harmattan/harmattan.qrc
index 7b4af28..bbe0dfe 100644
--- a/qml/harmattan/harmattan.qrc
+++ b/qml/harmattan/harmattan.qrc
@@ -15,6 +15,5 @@
 	<file>FullScreenThumbnail.qml</file>
 	<file>CameraPositionSource.qml</file>
 	<file>CameraPage.qml</file>
-	<file>CameraTheme.qml</file>
     </qresource>
 </RCC>
diff --git a/qml/qml.qrc b/qml/qml.qrc
index 898130f..b207a57 100644
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -2,6 +2,7 @@
 <RCC version="1.0">
     <qresource prefix="/qml">
 	<file>CameraSettings.qml</file>
+	<file>CameraTheme.qml</file>
 	<file>CameraToolBar.js</file>
 	<file>CameraToolBar.qml</file>
 	<file>CameraToolBarTools.qml</file>