Merge lp:~elementary-apps/pantheon-photos/icons-gresource into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

* Add non-standard icons to a gresource
* Add noninterpretable video bg and drag nub to the resource
* Remove unused code from CustomComponents.vala
* Don't install icons to filesystem since they're compiled into the gresource

Added missing icons by request from Ochosi

Removed a bunch of dark magic that seems to be unnecessary.

[lp:~elementary-apps/pantheon-photos/icons-gresource]

3106. By Danielle Foré on 2017-01-08

Add non-standard icons to a gresource

[Felipe Escoto (philip.scott)]

LGTM, and those icons now work on other themes!

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-08-28 20:08:59 +0000
+++ data/CMakeLists.txt	2017-01-08 16:55:12 +0000
@@ -9,10 +9,6 @@
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.photos-viewer.desktop DESTINATION ${DATADIR}/applications)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.photos.appdata.xml DESTINATION ${DATADIR}/appdata)
 
-# Install custom icons
-file (GLOB ICON_FILES icons/*)
-install (FILES ${ICON_FILES} DESTINATION ${PKGDATADIR}/icons)
-
 # Install UI files
 file (GLOB UI_FILES ui/*)
 install (FILES ${UI_FILES} DESTINATION ${PKGDATADIR}/ui)

=== added file 'data/icons/edit-flag.svg'
--- data/icons/edit-flag.svg	1970-01-01 00:00:00 +0000
+++ data/icons/edit-flag.svg	2017-01-08 16:55:12 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg4114">
+  <defs
+     id="defs4116">
+    <linearGradient
+       x1="24.001757"
+       y1="9.2952671"
+       x2="22.875973"
+       y2="37.167572"
+       id="linearGradient3167"
+       xlink:href="#linearGradient3875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.46662086,0,0,0.4720986,0.80193311,1.4356834)" />
+    <linearGradient
+       id="linearGradient3875">
+      <stop
+         id="stop3877"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3879"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.13099068" />
+      <stop
+         id="stop3881"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.90155029" />
+      <stop
+         id="stop3883"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0.36465192"
+       y1="19.599176"
+       x2="28.05953"
+       y2="19.599176"
+       id="linearGradient3160"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.50100354,0,0.12917999,0.48210629,-1.3703677,6.3724142)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-4">
+      <stop
+         id="stop3750-1-0-7"
+         style="stop-color:#ffcd7d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-3-7-6"
+         style="stop-color:#fc8f36;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3754-1-8-5"
+         style="stop-color:#e23a0e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="30"
+       x2="-11"
+       y2="30"
+       id="linearGradient3162"
+       xlink:href="#linearGradient4039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37774073,0,0.09673411,0.36101661,1.5655367,7.1569019)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient4039">
+      <stop
+         id="stop4041"
+         style="stop-color:#ba3d12;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4043"
+         style="stop-color:#db6737;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4034">
+      <stop
+         id="stop4036"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4038"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="10.824209"
+       y1="31.999737"
+       x2="10.824209"
+       y2="14.232251"
+       id="linearGradient4112"
+       xlink:href="#linearGradient4034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.4827512e-8,7.0001866)" />
+  </defs>
+  <metadata
+     id="metadata4119">
+    <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
+     transform="translate(0,-8)"
+     id="layer1">
+    <path
+       d="m 6.9375,23.352889 c -1.816586,0.0229 -3.33718,0.167264 -3.75,0.311978 l -0.21875,-0.268947 -1.99999999,0 5.62499999,7.229283 2,0 -2.28125,-2.426762 c 0.67712,0.08647 2.47026,-0.261216 4.78125,-0.24743 2.802792,0.01672 3.629056,0.373633 6.59375,0.376525 2.964689,0.0029 5.447313,-0.177755 5.21875,-0.441072 l -3,-4.36145 c -0.138362,-0.199212 -2.664576,0.242419 -5.4375,0.2044 -2.993706,-0.04105 -3.924517,-0.345501 -6.5625,-0.376525 -0.32976,-0.0038 -0.651969,-0.0039 -0.96875,0 z"
+       id="rect3941-5-6"
+       style="opacity:0.25;color:#000000;fill:url(#linearGradient4112);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="1"
+       height="20.705524"
+       x="-1.1077294"
+       y="10.493559"
+       transform="matrix(1,0,0.25881905,0.96592583,0,0)"
+       id="rect3941-5"
+       style="color:#000000;fill:#ffffff;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="2"
+       height="21.740799"
+       x="-1.6077296"
+       y="9.9759216"
+       transform="matrix(1,0,0.25881905,0.96592583,0,0)"
+       id="rect3941"
+       style="opacity:0.36600001;color:#000000;fill:none;stroke:#000000;stroke-width:1.01748526;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 3.0775309,10.685117 c -0.1688792,-0.567968 2.195043,-1.2671406 4.8331238,-1.1770154 2.6379833,0.090121 3.5687063,0.9592264 6.5624123,1.0784574 2.772924,0.110439 5.28354,-1.1552248 5.421902,-0.576543 l 3.001466,11.201623 c 0.228563,0.764894 -2.237412,1.296793 -5.202101,1.288468 -2.964694,-0.0084 -3.789892,-1.034481 -6.592684,-1.083048 -2.8012002,-0.04854 -4.8384405,1.421502 -5.0539949,0.352713 L 3.0775309,10.685117 z"
+       id="path4319-6"
+       style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3162);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 8.0625,5.5 C 6.5772935,5.4344328 5.0679908,5.6288692 3.96875,5.875 3.4191296,5.9980654 2.9964896,6.1252925 2.71875,6.25 2.6100123,6.2988242 2.5427285,6.346341 2.5,6.375 L 2.5,20 C 2.7183632,19.979 3.1244002,19.868877 3.65625,19.71875 4.774391,19.403128 6.3487566,18.962367 8.09375,19 c 1.717858,0.03705 2.811377,0.418487 3.8125,0.78125 1.001123,0.362763 1.925728,0.712607 3.59375,0.71875 1.704468,0.0063 3.313468,-0.177791 4.46875,-0.40625 0.577641,-0.11423 1.050839,-0.263341 1.34375,-0.375 0.09965,-0.03799 0.136806,-0.06688 0.1875,-0.09375 l 0,-13.46875 c -0.311673,0.062247 -0.744384,0.1575769 -1.3125,0.28125 -1.219441,0.2654598 -2.915656,0.5649334 -4.75,0.5 C 13.635744,6.87372 12.498445,6.5475118 11.46875,6.21875 10.439055,5.8899882 9.5314794,5.564851 8.0625,5.5 z"
+       transform="matrix(0.78947358,0,0.19887544,0.74221326,0.94239271,6.3561425)"
+       id="path3112"
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient3167);stroke-width:1.30637455px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>

=== added file 'data/icons/icons.gresource.xml'
--- data/icons/icons.gresource.xml	1970-01-01 00:00:00 +0000
+++ data/icons/icons.gresource.xml	2017-01-08 16:55:12 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/pantheon/photos/icons">
+    <file alias="aperture-symbolic.svg" compressed="true" preprocess="xml-stripblanks">aperture-symbolic.svg</file>
+    <file alias="drag_nub.png" compressed="true">drag_nub.png</file>
+    <file alias="edit-flag.svg" compressed="true" preprocess="xml-stripblanks">edit-flag.svg</file>
+    <file alias="exposure-bias-symbolic.svg" compressed="true" preprocess="xml-stripblanks">exposure-bias-symbolic.svg</file>
+    <file alias="exposure-symbolic.svg" compressed="true" preprocess="xml-stripblanks">exposure-symbolic.svg</file>
+    <file alias="flash-symbolic.svg" compressed="true" preprocess="xml-stripblanks">flash-symbolic.svg</file>
+    <file alias="focal-length-symbolic.svg" compressed="true" preprocess="xml-stripblanks">focal-length-symbolic.svg</file>
+    <file alias="image-adjust.svg" compressed="true" preprocess="xml-stripblanks">image-adjust.svg</file>
+    <file alias="image-auto-adjust.svg" compressed="true" preprocess="xml-stripblanks">image-auto-adjust.svg</file>
+    <file alias="image-crop.svg" compressed="true" preprocess="xml-stripblanks">image-crop.svg</file>
+    <file alias="image-red-eye.svg" compressed="true" preprocess="xml-stripblanks">image-red-eye.svg</file>
+    <file alias="iso-symbolic.svg" compressed="true" preprocess="xml-stripblanks">iso-symbolic.svg</file>
+    <file alias="object-straighten.svg" compressed="true" preprocess="xml-stripblanks">object-straighten.svg</file>
+    <file alias="pin-toolbar.svg" compressed="true" preprocess="xml-stripblanks">pin-toolbar.svg</file>
+  </gresource>
+  <gresource prefix="/org/pantheon/photos/backgrounds">
+    <file alias="noninterpretable-video.svg" compressed="true" preprocess="xml-stripblanks">noninterpretable-video.svg</file>
+  </gresource>
+</gresources>

=== added file 'data/icons/image-adjust.svg'
--- data/icons/image-adjust.svg	1970-01-01 00:00:00 +0000
+++ data/icons/image-adjust.svg	2017-01-08 16:55:12 +0000
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg2976">
+  <defs
+     id="defs2978">
+    <linearGradient
+       id="linearGradient3844">
+      <stop
+         id="stop3846"
+         style="stop-color:#ff1d1d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3848"
+         style="stop-color:#ff8a18;stop-opacity:1"
+         offset="0.16829631" />
+      <stop
+         id="stop3850"
+         style="stop-color:#ffe92a;stop-opacity:1"
+         offset="0.31939223" />
+      <stop
+         id="stop3852"
+         style="stop-color:#91ea3a;stop-opacity:1"
+         offset="0.50751495" />
+      <stop
+         id="stop3854"
+         style="stop-color:#1d72e0;stop-opacity:1"
+         offset="0.6893779" />
+      <stop
+         id="stop3856"
+         style="stop-color:#a91ec0;stop-opacity:1"
+         offset="0.87265676" />
+      <stop
+         id="stop3858"
+         style="stop-color:#ff0b88;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3672-0">
+      <stop
+         id="stop3674-1"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3676-0"
+         style="stop-color:#003662;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3672-2">
+      <stop
+         id="stop3674-6"
+         style="stop-color:#808080;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3676-9"
+         style="stop-color:#00a0ef;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3650-0">
+      <stop
+         id="stop3662-3"
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3664-7"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="2"
+       y1="35.999863"
+       x2="22.000275"
+       y2="35.999863"
+       id="linearGradient3850"
+       xlink:href="#linearGradient3672-0"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="3.5"
+       y1="6"
+       x2="28.5"
+       y2="6"
+       id="linearGradient3852"
+       xlink:href="#linearGradient3672-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76,0,0,1,-0.16,30)" />
+    <linearGradient
+       x1="3.5"
+       y1="6"
+       x2="28.5"
+       y2="6"
+       id="linearGradient3854"
+       xlink:href="#linearGradient3650-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76,0,0,1,-0.16,36)" />
+    <linearGradient
+       x1="3.5"
+       y1="6"
+       x2="28.5"
+       y2="6"
+       id="linearGradient3856"
+       xlink:href="#linearGradient3844"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76,0,0,1,-0.16,24)" />
+  </defs>
+  <metadata
+     id="metadata2981">
+    <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
+     transform="translate(0,-24)"
+     id="layer1">
+    <path
+       d="m 2.5,40.5 0,4 19,0 0,-4 z"
+       id="path3684"
+       style="fill:url(#linearGradient3854);fill-opacity:1;stroke:none" />
+    <path
+       d="m 2.5,34.5 0,4 19,0 0,-4 z"
+       id="path3692"
+       style="fill:url(#linearGradient3852);fill-opacity:1;stroke:none" />
+    <path
+       d="m 2.5,40.5 19.000275,0 0,4 L 2.5,44.5 z"
+       id="rect3682"
+       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="m 2.5,28.5 0,4 19,0 0,-4 z"
+       id="path3686"
+       style="fill:url(#linearGradient3856);fill-opacity:1;stroke:none" />
+    <path
+       d="m 2.5,28.499863 19.000275,0 0,4 -19.000275,0 z"
+       id="rect3678"
+       style="opacity:0.4;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="m 2.5,34.499863 19.000275,0 0,4 -19.000275,0 z"
+       id="rect3680"
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient3850);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="m 3,29 18,0 0,1 -18,0 z"
+       id="rect3826"
+       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       d="m 3,35 18,0 0,1 -18,0 z"
+       id="rect3828"
+       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       d="m 3,41 18,0 0,1 -18,0 z"
+       id="rect3830"
+       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       d="m 3,31 18,0 0,1 -18,0 z"
+       id="rect3826-5"
+       style="opacity:0.15;fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       d="m 3,37 18,0 0,1 -18,0 z"
+       id="rect3828-7"
+       style="opacity:0.15;fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       d="m 3,43 18,0 0,1 -18,0 z"
+       id="rect3830-1"
+       style="opacity:0.15;fill:#ffffff;fill-opacity:1;stroke:none" />
+  </g>
+</svg>

=== added file 'data/icons/image-auto-adjust.svg'
--- data/icons/image-auto-adjust.svg	1970-01-01 00:00:00 +0000
+++ data/icons/image-auto-adjust.svg	2017-01-08 16:55:12 +0000
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="24"
+   height="24"
+   id="svg4708"
+   version="1.1">
+  <defs
+     id="defs4710">
+    <radialGradient
+       r="7.228416"
+       fy="73.615715"
+       fx="6.702713"
+       cy="73.615715"
+       cx="6.702713"
+       gradientTransform="matrix(1.6600963,0,0,0.36315008,0.963735,1.732331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4643"
+       xlink:href="#linearGradient10691-3" />
+    <linearGradient
+       id="linearGradient10691-3">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop10693-1" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop10695-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3339">
+      <stop
+         id="stop3341"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3343"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3251">
+      <stop
+         id="stop3253"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3255"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3251"
+       id="radialGradient3097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.13600338,0.32887282,-0.25782279,0.11298813,11.149645,0.46214313)"
+       cx="32.5"
+       cy="16.5625"
+       fx="32.5"
+       fy="16.5625"
+       r="14.4375" />
+    <linearGradient
+       xlink:href="#linearGradient3339"
+       id="linearGradient3100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29271808,0,0,0.4253276,1.0176487,8.2866679)"
+       x1="31"
+       y1="12.875"
+       x2="3.2591991"
+       y2="24.893845" />
+    <linearGradient
+       id="linearGradient3220-2-2">
+      <stop
+         id="stop3222-7-1"
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3228-2-8"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0.64444447" />
+      <stop
+         id="stop3224-9-9"
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3338-5-6">
+      <stop
+         id="stop3340-8-1"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2677-0-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.78888887" />
+      <stop
+         id="stop3342-6-9"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3220-2-2"
+       id="linearGradient4203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26725589,0,0,1.157552,9.315594,-10.704165)"
+       x1="-32.957481"
+       y1="27.388975"
+       x2="-25.474016"
+       y2="27.388975" />
+    <linearGradient
+       xlink:href="#linearGradient3338-5-6"
+       id="linearGradient4205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77602087,0.23906428,-0.31605097,0.56747902,-20.167798,4.551095)"
+       x1="27.52779"
+       y1="4.1670198"
+       x2="30.419695"
+       y2="2.9487348" />
+  </defs>
+  <metadata
+     id="metadata4713">
+    <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"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.2;fill:url(#radialGradient4643);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path10689"
+       d="m 24.090748,28.465883 c 0,1.449748 -5.372523,2.625 -11.999865,2.625 -6.627343,0 -11.999865,-1.175252 -11.999865,-2.625 0,-1.449747 5.372522,-2.625 11.999865,-2.625 6.627342,0 11.999865,1.175253 11.999865,2.625 z" />
+    <path
+       d="M 1.127418,17.750209 C 7.1929793,18.394101 3.076485,11.886958 9.783851,8.8564678 L 12.24093,16.492258 C 9.4289444,14.587081 8.5051873,22.648075 1.0908278,18.441365 z"
+       id="path3337"
+       style="opacity:0.44444442;fill:url(#linearGradient3100);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
+    <path
+       d="M 13.263114,17.769977 C 11.207335,18.670899 8.6616875,17.275443 7.5772496,14.65314 6.492811,12.030836 7.2802379,9.174696 9.3360168,8.2737732 11.391795,7.3728496 13.937443,8.7683033 15.021881,11.390608 c 1.084439,2.622304 0.297012,5.478445 -1.758767,6.379369 z"
+       id="path3249"
+       style="fill:url(#radialGradient3097);fill-opacity:1;stroke:none;display:inline" />
+    <path
+       d="M 10.706801,15.162867 8.7209438,14.867485 7.5217149,16.401524 7.1857876,14.399892 5.3728118,13.720303 l 1.7782439,-0.941694 0.078753,-1.954051 1.4349403,1.419634 1.861646,-0.528079 -0.8913997,1.819075 1.0718097,1.627679 z"
+       id="path3331"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" />
+    <path
+       d="M 6.5404943,19.97454 5.7103885,18.9002 4.3794144,19.049895 5.1845991,17.95813 4.6253713,16.786179 l 1.3277365,0.399592 0.9853531,-0.874 0.015402,1.338726 1.1682079,0.63179 -1.318217,0.427786 -0.2633597,1.264467 z"
+       id="path3333"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" />
+    <g
+       id="g4198"
+       transform="matrix(1.1561335,-0.66749395,0.56482751,0.97830994,1.3472741,-0.45209801)">
+      <path
+         id="rect3174"
+         d="m 0.5,18 0,12.4375 C 0.5,31.0192 0.797334,31.5 1.166667,31.5 l 0.666667,0 C 2.202667,31.5 2.5,31.0192 2.5,30.4375 L 2.5,18 l -2,0 z"
+         style="color:#000000;fill:url(#linearGradient4203);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         ry="0.92948729"
+         rx="0.74907047"
+         y="10.5"
+         x="0.5"
+         height="21"
+         width="2"
+         id="rect3174-8"
+         style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.81430745;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         id="rect3174-6"
+         d="M 1.166667,10.5 C 0.797334,10.5 0.5,10.9808 0.5,11.5625 l 0,6.4375 2,0 0,-6.4375 C 2.5,10.9808 2.202667,10.5 1.833334,10.5 l -0.666667,0 z"
+         style="color:#000000;fill:url(#linearGradient4205);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== added file 'data/icons/image-crop.svg'
--- data/icons/image-crop.svg	1970-01-01 00:00:00 +0000
+++ data/icons/image-crop.svg	2017-01-08 16:55:12 +0000
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg4708"
+   height="24"
+   width="24">
+  <defs
+     id="defs4710">
+    <radialGradient
+       xlink:href="#linearGradient10691-3"
+       id="radialGradient4643"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6600963,0,0,0.36315008,0.872852,1.641448)"
+       cx="6.702713"
+       cy="73.615715"
+       fx="6.702713"
+       fy="73.615715"
+       r="7.228416" />
+    <linearGradient
+       id="linearGradient10691-3">
+      <stop
+         id="stop10693-1"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10695-4"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4094-3-9-3"
+       id="linearGradient4428-9-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.4603578,9.1180975)"
+       x1="24.099998"
+       y1="10.625317"
+       x2="24.099998"
+       y2="44.42001" />
+    <linearGradient
+       id="linearGradient4094-3-9-3">
+      <stop
+         id="stop4096-1-4-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4098-7-7-6"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.01966729" />
+      <stop
+         id="stop4100-0-5-8"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.99149066" />
+      <stop
+         id="stop4102-4-3-5"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,-1,24,32)"
+       y2="20"
+       x2="10"
+       y1="2"
+       x1="10"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4494"
+       xlink:href="#linearGradient4190-59" />
+    <linearGradient
+       id="linearGradient4190-59">
+      <stop
+         id="stop4192-42"
+         offset="0"
+         style="stop-color:#fad4a1;stop-opacity:1" />
+      <stop
+         id="stop4194-6"
+         offset="1"
+         style="stop-color:#e6b481;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4094-3-9"
+       id="linearGradient4428-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.4603578,9.1180975)"
+       x1="24.099998"
+       y1="6.2723761"
+       x2="24.099998"
+       y2="38.919434" />
+    <linearGradient
+       id="linearGradient4094-3-9">
+      <stop
+         id="stop4096-1-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4098-7-7"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.01966729" />
+      <stop
+         id="stop4100-0-5"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.99149066" />
+      <stop
+         id="stop4102-4-3"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4190">
+      <stop
+         id="stop4192"
+         offset="0"
+         style="stop-color:#fad4a1;stop-opacity:1" />
+      <stop
+         id="stop4194"
+         offset="1"
+         style="stop-color:#e6b481;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4190"
+       id="linearGradient4706"
+       gradientUnits="userSpaceOnUse"
+       x1="10"
+       y1="2"
+       x2="10"
+       y2="20"
+       gradientTransform="translate(0,8)" />
+  </defs>
+  <metadata
+     id="metadata4713">
+    <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
+     transform="translate(0,-8)"
+     id="layer1">
+    <path
+       id="rect4169"
+       d="m 4.5,9.5 0,15 0,3 3,0 15,0 0,-3 -15,0 0,-15 z"
+       style="color:#000000;fill:url(#linearGradient4706);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="rect4169-5"
+       d="m 4.5,9.5 0,15 0,3 3,0 15,0 0,-3 -15,0 0,-15 z"
+       style="opacity:0.5;color:#000000;fill:none;stroke:#a1550a;stroke-width:0.99999994;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="path4537"
+       d="m 22,25.5 -15,0"
+       style="opacity:0.5;color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="path4357"
+       d="m 7,10.5 -1.5,0 0,16.5"
+       style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4428-9);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="rect4169-9"
+       d="m 4,12.5 -2.5,0 0,3 2.5,0 m 4,0 8.5,0 0,15 3,0 0,-15 0,-3 -11.5,0"
+       style="color:#000000;fill:url(#linearGradient4494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="rect4169-5-8"
+       d="m 4,12.5 -2.5,0 0,3 2.5,0 m 4,0 8.5,0 0,15 3,0 0,-15 0,-3 -3,0 -8.5,0"
+       style="opacity:0.5;color:#000000;fill:none;stroke:#a1550a;stroke-width:0.99999994;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 23.999865,28.375 C 23.999865,29.824748 18.627342,31 12,31 5.372657,31 1.35e-4,29.824748 1.35e-4,28.375 1.35e-4,26.925253 5.372657,25.75 12,25.75 c 6.627342,0 11.999865,1.175253 11.999865,2.625 z"
+       id="path10689"
+       style="opacity:0.2;fill:url(#radialGradient4643);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       transform="translate(0,8)"
+       id="rect4240"
+       d="M 6,4 6,5 8,5 8,4 z M 6,6 6,7 8,7 8,8 9,8 9,6 8,6 z M 8,8 6,8 6,9 8,9 z m 2,-2 0,2 1,0 0,-2 z m 2,0 0,2 1,0 0,-2 z m 2,0 0,2 1,0 0,-2 z m 2,3 0,1 2,0 0,-1 z m -10,1 0,1 2,0 0,-1 z m 10,1 0,1 2,0 0,-1 z m -10,1 0,1 2,0 0,-1 z m 10,1 0,1 2,0 0,-1 z m -10,1 0,1 2,0 0,-1 z m 12,2 0,-1 -2,0 0,1 m -1,0 0,2 3,0 0,-1 -2,0 0,-1 z m -6,0 0,2 1,0 0,-2 z m 2,0 0,2 1,0 0,-2 z m 2,0 0,2 1,0 0,-2 z m 3,3 0,1 2,0 0,-1 z"
+       style="opacity:0.3;color:#000000;fill:#a1550a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 2,13.5 2,0 m 4,0 11,0 M 17.53506,30 17.5,15"
+       style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4428-9-7);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4357-2" />
+  </g>
+</svg>

=== added file 'data/icons/image-red-eye.svg'
--- data/icons/image-red-eye.svg	1970-01-01 00:00:00 +0000
+++ data/icons/image-red-eye.svg	2017-01-08 16:55:12 +0000
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg3041">
+  <defs
+     id="defs3043">
+    <linearGradient
+       x1="71.204002"
+       y1="6.2375998"
+       x2="71.204002"
+       y2="44.341"
+       id="linearGradient3082"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29729726,0,0,-0.29729726,-9.3261789,19.538808)">
+      <stop
+         id="stop4013-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015-4"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.50775999" />
+      <stop
+         id="stop4017-9"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456999" />
+      <stop
+         id="stop4019-0"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="23.896"
+       cy="3.99"
+       r="20.396999"
+       id="radialGradient3085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.52770723,-0.69656421,0,19.050159,-3.6335486)">
+      <stop
+         id="stop3244-4"
+         style="stop-color:#f8b17e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3246-5"
+         style="stop-color:#e35d4f;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3248-0"
+         style="stop-color:#c6262e;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop3250-3"
+         style="stop-color:#690b54;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="7.0776"
+       y1="3.0816"
+       x2="7.0776"
+       y2="45.368999"
+       id="linearGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.22110724,0,0,0.22110728,10.964292,8.5074362)">
+      <stop
+         id="stop2492-0"
+         style="stop-color:#791235;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2494-6"
+         style="stop-color:#c7321f;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204002"
+       y1="6.2375998"
+       x2="71.204002"
+       y2="44.341"
+       id="linearGradient3101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5135135,0,0,0.5135135,-24.836132,-1.021284)">
+      <stop
+         id="stop4013"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.50775999" />
+      <stop
+         id="stop4017"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456999" />
+      <stop
+         id="stop4019"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="62.625"
+       cy="4.625"
+       r="10.625"
+       id="radialGradient3109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1294118,0,0,0.2823525,-58.729414,19.694118)">
+      <stop
+         id="stop8840"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="71.204002"
+       y1="6.2375998"
+       x2="71.204002"
+       y2="44.341"
+       id="linearGradient3101-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5135135,0,0,0.5135135,-24.836132,-1.021284)">
+      <stop
+         id="stop4013-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015-1"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.50775999" />
+      <stop
+         id="stop4017-2"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456999" />
+      <stop
+         id="stop4019-9"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="71.204002"
+       y1="6.2375998"
+       x2="71.204002"
+       y2="44.341"
+       id="linearGradient3032"
+       xlink:href="#linearGradient3101-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.18918406,0,0,0.18918406,-1.5708392,7.2029093)" />
+    <linearGradient
+       id="linearGradient3990">
+      <stop
+         id="stop3992"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3994"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="68.313301"
+       y1="52.925316"
+       x2="68.313301"
+       y2="65.922028"
+       id="linearGradient3259"
+       xlink:href="#linearGradient3990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17506378,0,0,0.17506378,3.2715407,1.511072)" />
+    <linearGradient
+       x1="11"
+       y1="0"
+       x2="11"
+       y2="22"
+       id="linearGradient3191-2"
+       xlink:href="#outerBackgroundGradient-0-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1052632,0,0,-1.1052632,27.401427,23.881729)" />
+    <linearGradient
+       id="outerBackgroundGradient-0-5">
+      <stop
+         id="stop3864-8-6-3-9"
+         style="stop-color:#414141;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3866-9-1-7-7"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="12"
+       cy="12"
+       r="3"
+       fx="12"
+       fy="12"
+       id="radialGradient3193-2"
+       xlink:href="#linearGradient3779-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3779-5">
+      <stop
+         id="stop3781-8"
+         style="stop-color:#f6b8b9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3791-5"
+         style="stop-color:#e25e60;stop-opacity:1"
+         offset="0.62218052" />
+      <stop
+         id="stop3878-6"
+         style="stop-color:#a01c1f;stop-opacity:1"
+         offset="0.84109592" />
+      <stop
+         id="stop3783-2"
+         style="stop-color:#800002;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="8.5"
+       cy="8.5"
+       r="2.5"
+       fx="8.5"
+       fy="8.5"
+       id="radialGradient3195-6"
+       xlink:href="#linearGradient3884-3"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3884-3">
+      <stop
+         id="stop3886-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3888-5"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="8.5"
+       cy="8.5"
+       r="2.5"
+       fx="8.5"
+       fy="8.5"
+       id="radialGradient3197-9"
+       xlink:href="#linearGradient3884-3"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="11"
+       y1="0"
+       x2="11"
+       y2="22"
+       id="linearGradient4073"
+       xlink:href="#outerBackgroundGradient-0-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1052632,0,0,-1.1052632,-0.157895,24.158044)" />
+  </defs>
+  <metadata
+     id="metadata3046">
+    <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>
+  <path
+     d="m 24,21 c 0,1.6569 -5.3726,3 -12,3 -6.6274,0 -12,-1.343 -12,-3 0,-1.657 5.3726,-3 12,-3 6.6274,0 12,1.3431 12,3 z"
+     id="path8836"
+     style="opacity:0.3;fill:url(#radialGradient3109);fill-rule:evenodd" />
+  <path
+     d="m 12,22.500149 c -5.792444,0 -10.5,-4.707555 -10.5,-10.5 C 1.5,6.207706 6.207556,1.5001492 12,1.5001492 c 5.792444,0 10.5,4.7075568 10.5,10.4999998 0,5.792445 -4.707556,10.5 -10.5,10.5 z"
+     id="path4791"
+     style="fill:url(#linearGradient4073);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <path
+     d="m 15,12 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="matrix(1.6578948,0,0,1.6578948,-7.8947364,-7.8945875)"
+     id="path3777"
+     style="opacity:0.8;fill:url(#radialGradient3193-2);fill-opacity:1;stroke:none" />
+  <path
+     d="m 15,12 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="matrix(1.6578948,0,0,1.6578948,-7.8947364,-7.8945875)"
+     id="path3795"
+     style="opacity:0.4;fill:none;stroke:#860200;stroke-width:0.60317463;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="M 11.481909,4.3323866 11.343751,7.3027815 12.06908,7.1991631 11.481909,4.3323866 z m 3.143092,0.794408 -1.27796,2.0723685 0.759868,0.2417763 0.518092,-2.3141448 z M 8.2006589,6.1629788 9.0641458,8.2353473 9.9276327,7.7172552 8.2006589,6.1629788 z M 18.735199,6.7501499 15.212172,8.5116631 16.179278,9.7205447 18.735199,6.7501499 z M 5.3338825,9.0642947 6.7154615,9.7550842 6.8881589,9.2024526 5.3338825,9.0642947 z m 11.7434215,1.8651313 0.138158,0.932566 2.866776,-0.828947 -3.004934,-0.103619 z m -10.1891451,1.450658 -2.3486843,0.552632 2.3832238,0 -0.03454,-0.552632 z m 10.1546061,1.485198 -0.172698,0.828947 2.072369,0.379934 -1.899671,-1.208881 z M 7.8552642,14.62515 5.6792773,16.801137 8.7187511,15.523177 7.8552642,14.62515 z m 7.4605268,1.174342 -0.552632,0.449014 1.796053,2.141447 -1.243421,-2.590461 z m -5.802632,0.759869 -0.5180921,2.348684 1.4851971,-1.93421 -0.967105,-0.414474 z m 3.592105,0.06908 -1.519736,0.103618 1.001644,3.764803 0.518092,-3.868421 z"
+     id="path3793"
+     style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     d="M 9.2633182,2.4475629 10.182993,7.9371685 11.450327,7.4206103 9.2633182,2.4475629 z M 13.450167,3.040687 11.949917,7.279108 13.39466,7.4310628 13.450166,3.040687 z M 6.152339,6.2515106 8.3231974,9.3211911 9.528842,8.1821457 6.152339,6.2515106 z M 18.398067,4.3901338 13.989726,7.9048667 15.700173,9.3068554 18.398067,4.3901338 z M 3.4315965,10.396244 6.6192674,11.272372 6.7395585,10.010915 3.4315965,10.396244 z M 16.348445,9.6987273 16.941874,11.161589 21.41109,8.7638734 16.348445,9.6987274 z M 7.243543,13.046478 2.5889204,15.236427 7.5552722,14.180798 7.2435429,13.046481 z m 9.814534,-0.673699 -0.02906,1.524554 3.867123,-0.08045 -3.838064,-1.444105 z M 8.4054348,15.02411 5.7982874,19.038765 10.010284,16.095432 8.4054348,15.02411 z m 7.6430092,-0.423994 -0.841192,1.026269 4.061985,3.162064 -3.220793,-4.188333 z m -5.814725,2.048114 -0.03315,3.997199 1.730865,-3.651839 -1.697718,-0.34536 z m 4.049095,-0.719465 -2.126314,0.628518 2.580184,4.995409 -0.453874,-5.623926 z"
+     id="path3880"
+     style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     d="M 17.5,12 C 17.5,8.9625 15.037,6.5 12,6.5 8.9625,6.5 6.5,8.9626 6.5,12 c 0,3.038 2.4625,5.5 5.5,5.5 3.037,0 5.5,-2.462 5.5,-5.5 z"
+     id="path8655-6-1"
+     style="opacity:0.25;color:#000000;fill:none;stroke:url(#linearGradient3082);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;enable-background:accumulate" />
+  <path
+     d="m 21.5,12 c 0,5.247 -4.254,9.5 -9.5,9.5 C 6.7534,21.5 2.5,17.246 2.5,12 2.5,6.7534 6.7534,2.5003 12.0001,2.5003 17.2464,2.5003 21.5,6.7533 21.5,12 z"
+     id="path8655-6"
+     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3101);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;enable-background:accumulate" />
+  <path
+     d="M 15.499905,12.000095 C 15.499905,13.933148 13.932684,15.5 12,15.5 c -1.932906,0 -3.4999053,-1.567221 -3.4999053,-3.499905 0,-1.932906 1.5669993,-3.4997951 3.4999423,-3.4997951 1.932795,0 3.499868,1.5668521 3.499868,3.4997951 z"
+     id="path8655-6-3"
+     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3032);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;enable-background:accumulate" />
+  <g
+     transform="matrix(1.1052632,0,0,1.1052632,26.296164,0.67120283)"
+     id="layer2" />
+  <path
+     d="m 1.4999995,12.00015 c 0,5.792444 4.707556,10.5 10.5000025,10.5 5.792443,0 10.499998,-4.707556 10.499998,-10.5 0,-5.7924451 -4.707555,-10.500001 -10.499998,-10.500001 -5.7924465,0 -10.5000025,4.7075559 -10.5000025,10.500001 z"
+     id="path3804"
+     style="opacity:0.41000001;fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+</svg>

=== added file 'data/icons/object-straighten.svg'
--- data/icons/object-straighten.svg	1970-01-01 00:00:00 +0000
+++ data/icons/object-straighten.svg	2017-01-08 16:55:12 +0000
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg5527">
+  <defs
+     id="defs5529">
+    <linearGradient
+       id="linearGradient2980">
+      <stop
+         id="stop2982"
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2984"
+         style="stop-color:#fcaf3e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2986">
+      <stop
+         id="stop2988"
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2990"
+         style="stop-color:#ce5c00;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2974">
+      <stop
+         id="stop2976"
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2978"
+         style="stop-color:#fcaf3e;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968">
+      <stop
+         id="stop2970"
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2972"
+         style="stop-color:#ce5c00;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="187.81554"
+       y1="489.54688"
+       x2="187.1716"
+       y2="489.54688"
+       id="linearGradient5722"
+       xlink:href="#linearGradient2980"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="187.60938"
+       y1="489.35938"
+       x2="186.93732"
+       y2="489.35938"
+       id="linearGradient5724"
+       xlink:href="#linearGradient2986"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="187.81554"
+       y1="489.54688"
+       x2="187.1716"
+       y2="489.54688"
+       id="linearGradient5726"
+       xlink:href="#linearGradient2974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-395.9999,-981)" />
+    <linearGradient
+       x1="187.60938"
+       y1="489.35938"
+       x2="186.93732"
+       y2="489.35938"
+       id="linearGradient5728"
+       xlink:href="#linearGradient2968"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-395.9999,-981)" />
+    <linearGradient
+       id="linearGradient3600-4-3">
+      <stop
+         offset="0"
+         style="stop-color:#f4f4f4;stop-opacity:1"
+         id="stop3602-7-7" />
+      <stop
+         offset="1"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         id="stop3604-6-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3924-742">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3115" />
+      <stop
+         offset="0.01102275"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop3117" />
+      <stop
+         offset="0.98111719"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop3119" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop3121" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3600-4-3"
+       id="linearGradient3258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5428581,0,0,0.41284003,-29.601524,1.6269498)"
+       x1="25.132275"
+       y1="0.98520643"
+       x2="25.132275"
+       y2="47.013336" />
+    <linearGradient
+       xlink:href="#linearGradient3924-742"
+       id="linearGradient3260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45945947,0,0,0.43243245,-27.598709,2.2888369)"
+       x1="23.99999"
+       y1="4.3278437"
+       x2="23.99999"
+       y2="42.039913" />
+  </defs>
+  <metadata
+     id="metadata5532">
+    <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="g3253"
+     transform="matrix(0.99144486,0.13052619,-0.13052619,0.99144486,30.019447,2.0988484)">
+    <rect
+       style="color:#000000;fill:url(#linearGradient3258);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992186;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5505-21-9-4"
+       y="2.6684558"
+       x="-26.072929"
+       ry="1"
+       rx="1"
+       height="19"
+       width="19" />
+    <rect
+       style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5505-21-9-4-6"
+       y="2.6684558"
+       x="-26.072929"
+       ry="1"
+       rx="1"
+       height="19"
+       width="19" />
+    <path
+       style="opacity:0.8;fill:none;stroke:url(#linearGradient3260);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       id="rect6741-9"
+       d="m -25.071683,3.6668339 16.999999,0 0,17.0003781 -16.999999,0 z" />
+  </g>
+  <g
+     id="g5710"
+     transform="matrix(0,-1,1,0,7.0000946,24)">
+    <g
+       style="display:inline"
+       id="g3861"
+       transform="matrix(0,-1,1,0,-478.99991,202.99989)">
+      <rect
+         style="fill:url(#linearGradient5722);fill-opacity:1;stroke:url(#linearGradient5724);stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3863"
+         y="489.5"
+         x="186.49989"
+         height="1.9999999"
+         width="3.0000916" />
+      <rect
+         style="fill:#fcaf3e;fill-opacity:1;stroke:#ce5c00;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3865"
+         y="489.5"
+         x="191.49989"
+         height="1.9999999"
+         width="3.0000916" />
+      <rect
+         style="fill:#fcaf3e;fill-opacity:1;stroke:#ce5c00;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3867"
+         y="489.5"
+         x="196.49989"
+         height="1.9999999"
+         width="3.0000916" />
+      <rect
+         style="fill:#fcaf3e;fill-opacity:1;stroke:#ce5c00;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3869"
+         y="489.5"
+         x="201.49989"
+         height="1.9999999"
+         width="3.0000916" />
+      <rect
+         style="fill:url(#linearGradient5726);fill-opacity:1;stroke:url(#linearGradient5728);stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3871"
+         transform="scale(-1,-1)"
+         y="-491.5"
+         x="-209.49998"
+         height="1.9999999"
+         width="3.0000916" />
+    </g>
+  </g>
+</svg>

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-08-28 04:52:33 +0000
+++ src/Application.vala	2017-01-08 16:55:12 +0000
@@ -46,6 +46,9 @@
         about_artists = {};
         about_translators = _("translator-credits");
         about_license_type = Gtk.License.LGPL_2_1;
+
+        weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
+        default_theme.add_resource_path ("/org/pantheon/photos/icons");
     }
 
     private Application (bool is_direct) {

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-01-01 12:35:06 +0000
+++ src/CMakeLists.txt	2017-01-08 16:55:12 +0000
@@ -217,8 +217,11 @@
     ${GLOBAL_VALA_OPTIONS}
 )
 
+include (GResource)
+glib_compile_resources (GLIB_RESOURCES_ICONS SOURCE ../data/icons/icons.gresource.xml)
+
 include_directories (${CMAKE_SOURCE_DIR}/vapi)
-add_executable (${EXEC_NAME} ${VALA_C} ${PLUGIN_VALA_C} ${CONFIG_FILE})
+add_executable (${EXEC_NAME} ${VALA_C} ${PLUGIN_VALA_C} ${CONFIG_FILE} ${GLIB_RESOURCES_ICONS})
 target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
 
 install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)

=== modified file 'src/CustomComponents.vala'
--- src/CustomComponents.vala	2014-08-08 21:13:09 +0000
+++ src/CustomComponents.vala	2017-01-08 16:55:12 +0000
@@ -1,186 +1,22 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-extern void qsort (void *p, size_t num, size_t size, GLib.CompareFunc func);
-
-public class ThemeLoader {
-    private struct LightweightColor {
-        public uchar red;
-        public uchar green;
-        public uchar blue;
-
-        public LightweightColor () {
-            red = green = blue = 0;
-        }
-    }
-
-    private const int NUM_SUPPORTED_INTENSITIES = 6;
-    private const int THEME_OUTLINE_COLOR = 0;
-    private const int THEME_BEVEL_DARKER_COLOR = 1;
-    private const int THEME_BEVEL_DARK_COLOR = 2;
-    private const int THEME_BASE_COLOR = 3;
-    private const int THEME_BEVEL_LIGHT_COLOR = 4;
-    private const int THEME_BEVEL_LIGHTER_COLOR = 5;
-
-    private static LightweightColor[] theme_colors = null;
-
-    private static void populate_theme_params () {
-        if (theme_colors != null)
-            return;
-
-        theme_colors = new LightweightColor[NUM_SUPPORTED_INTENSITIES];
-
-        Gtk.Settings settings = Gtk.Settings.get_default ();
-        HashTable < string, Gdk.Color?> color_table = settings.color_hash;
-        Gdk.Color? base_color = color_table.lookup ("bg_color");
-        if (base_color == null && !Gdk.Color.parse ("#fff", out base_color))
-            error ("can't parse color");
-
-        RGBAnalyticPixel base_color_analytic_rgb =
-            RGBAnalyticPixel.from_quantized_components (base_color.red >> 8,
-                    base_color.green >> 8, base_color.blue >> 8);
-        HSVAnalyticPixel base_color_analytic_hsv =
-            HSVAnalyticPixel.from_rgb (base_color_analytic_rgb);
-
-        HSVAnalyticPixel bevel_light_analytic_hsv = base_color_analytic_hsv;
-        bevel_light_analytic_hsv.light_value *= 1.15f;
-        bevel_light_analytic_hsv.light_value =
-            bevel_light_analytic_hsv.light_value.clamp (0.0f, 1.0f);
-
-        HSVAnalyticPixel bevel_lighter_analytic_hsv = bevel_light_analytic_hsv;
-        bevel_lighter_analytic_hsv.light_value *= 1.15f;
-        bevel_lighter_analytic_hsv.light_value =
-            bevel_lighter_analytic_hsv.light_value.clamp (0.0f, 1.0f);
-
-        HSVAnalyticPixel bevel_dark_analytic_hsv = base_color_analytic_hsv;
-        bevel_dark_analytic_hsv.light_value *= 0.85f;
-        bevel_dark_analytic_hsv.light_value =
-            bevel_dark_analytic_hsv.light_value.clamp (0.0f, 1.0f);
-
-        HSVAnalyticPixel bevel_darker_analytic_hsv = bevel_dark_analytic_hsv;
-        bevel_darker_analytic_hsv.light_value *= 0.85f;
-        bevel_darker_analytic_hsv.light_value =
-            bevel_darker_analytic_hsv.light_value.clamp (0.0f, 1.0f);
-
-        HSVAnalyticPixel outline_analytic_hsv = bevel_darker_analytic_hsv;
-        outline_analytic_hsv.light_value *= 0.66f;
-        outline_analytic_hsv.light_value =
-            outline_analytic_hsv.light_value.clamp (0.0f, 1.0f);
-
-        RGBAnalyticPixel outline_analytic_rgb = outline_analytic_hsv.to_rgb ();
-        theme_colors[THEME_OUTLINE_COLOR] =
-            populate_one_theme_param (outline_analytic_rgb);
-
-        RGBAnalyticPixel bevel_darker_analytic_rgb = bevel_darker_analytic_hsv.to_rgb ();
-        theme_colors[THEME_BEVEL_DARKER_COLOR] =
-            populate_one_theme_param (bevel_darker_analytic_rgb);
-
-        RGBAnalyticPixel bevel_dark_analytic_rgb = bevel_dark_analytic_hsv.to_rgb ();
-        theme_colors[THEME_BEVEL_DARK_COLOR] =
-            populate_one_theme_param (bevel_dark_analytic_rgb);
-
-        theme_colors[THEME_BASE_COLOR] =
-            populate_one_theme_param (base_color_analytic_rgb);
-
-        RGBAnalyticPixel bevel_light_analytic_rgb = bevel_light_analytic_hsv.to_rgb ();
-        theme_colors[THEME_BEVEL_LIGHT_COLOR] =
-            populate_one_theme_param (bevel_light_analytic_rgb);
-
-        RGBAnalyticPixel bevel_lighter_analytic_rgb = bevel_light_analytic_hsv.to_rgb ();
-        theme_colors[THEME_BEVEL_LIGHTER_COLOR] =
-            populate_one_theme_param (bevel_lighter_analytic_rgb);
-    }
-
-    private static LightweightColor populate_one_theme_param (RGBAnalyticPixel from) {
-        LightweightColor into = LightweightColor ();
-
-        into.red = (uchar) (from.red * 255.0f);
-        into.green = (uchar) (from.green * 255.0f);
-        into.blue = (uchar) (from.blue * 255.0f);
-
-        return into;
-    }
-
-    public static Gdk.Pixbuf load_icon (string source_basename) {
-        populate_theme_params ();
-
-        Gdk.Pixbuf loaded_pixbuf = Resources.get_icon (source_basename, 0).copy ();
-
-        /* Sweep through the icon image data loaded from disk and determine how many
-           unique colors are in it. We do this with the aid of a HashSet. */
-        Gee.HashSet < RGBAnalyticPixel?> colors =
-            new Gee.HashSet < RGBAnalyticPixel?> (rgb_pixel_hash_func,
-                    rgb_pixel_equal_func);
-        unowned uchar[] pixel_data = loaded_pixbuf.get_pixels ();
-        for (int j = 0; j < loaded_pixbuf.height; j++) {
-            for (int i = 0; i < loaded_pixbuf.width; i++) {
-                int pixel_index = (j * loaded_pixbuf.rowstride) + (i * loaded_pixbuf.n_channels);
-
-                RGBAnalyticPixel pixel_color = RGBAnalyticPixel.from_quantized_components (
-                                                   pixel_data[pixel_index], pixel_data[pixel_index + 1],
-                                                   pixel_data[pixel_index + 2]);
-                colors.add (pixel_color);
-            }
-        }
-
-        /* If the image data loaded from disk didn't contain NUM_SUPPORTED_INTENSITIES
-           colors, then we can't unambiguously map the colors in the loaded image data
-           to theme colors on the user's system, so propagate an error */
-        if (colors.size != NUM_SUPPORTED_INTENSITIES)
-            error ("ThemeLoader: load_icon: pixbuf does not contain the correct number " +
-                   "of unique colors");
-
-        /* sort the colors in the loaded image data in order of increasing intensity; this
-           means that we have to convert the loaded colors from RGB to HSV format */
-        HSVAnalyticPixel[] hsv_pixels = new HSVAnalyticPixel[6];
-        int pixel_ticker = 0;
-        foreach (RGBAnalyticPixel rgb_pixel in colors)
-            hsv_pixels[pixel_ticker++] = HSVAnalyticPixel.from_rgb (rgb_pixel);
-        qsort (hsv_pixels, hsv_pixels.length, sizeof (HSVAnalyticPixel), hsv_pixel_compare_func);
-
-        /* step through each pixel in the image data loaded from disk and map its color
-           to one of the user's theme colors */
-        for (int j = 0; j < loaded_pixbuf.height; j++) {
-            for (int i = 0; i < loaded_pixbuf.width; i++) {
-                int pixel_index = (j * loaded_pixbuf.rowstride) + (i * loaded_pixbuf.n_channels);
-                RGBAnalyticPixel pixel_color = RGBAnalyticPixel.from_quantized_components (
-                                                   pixel_data[pixel_index], pixel_data[pixel_index + 1],
-                                                   pixel_data[pixel_index + 2]);
-                HSVAnalyticPixel pixel_color_hsv = HSVAnalyticPixel.from_rgb (pixel_color);
-                int this_intensity = 0;
-                for (int k = 0; k < NUM_SUPPORTED_INTENSITIES; k++) {
-                    if (hsv_pixels[k].light_value == pixel_color_hsv.light_value) {
-                        this_intensity = k;
-                        break;
-                    }
-                }
-                pixel_data[pixel_index] = theme_colors[this_intensity].red;
-                pixel_data[pixel_index + 1] = theme_colors[this_intensity].green;
-                pixel_data[pixel_index + 2] = theme_colors[this_intensity].blue;
-            }
-        }
-
-        return loaded_pixbuf;
-    }
-
-    private static int hsv_pixel_compare_func (void *pixval1, void *pixval2) {
-        HSVAnalyticPixel pixel_val_1 = * ((HSVAnalyticPixel *) pixval1);
-        HSVAnalyticPixel pixel_val_2 = * ((HSVAnalyticPixel *) pixval2);
-
-        return (int) (255.0f * (pixel_val_1.light_value - pixel_val_2.light_value));
-    }
-
-    private static bool rgb_pixel_equal_func (RGBAnalyticPixel? p1, RGBAnalyticPixel? p2) {
-        return (p1.equals (p2));
-    }
-
-    private static uint rgb_pixel_hash_func (RGBAnalyticPixel? pixel_val) {
-        return pixel_val.hash_code ();
-    }
-}
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*               2017 elementary LLC.
+*
+* This program 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 program 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*/
 
 public class RGBHistogramManipulator : Gtk.DrawingArea {
     private enum LocationCode { LEFT_NUB, RIGHT_NUB, LEFT_TROUGH, RIGHT_TROUGH,
@@ -208,12 +44,25 @@
     private RGBHistogram histogram = null;
     private int left_nub_position = 0;
     private int right_nub_position = 255;
-    private Gdk.Pixbuf nub_pixbuf = ThemeLoader.load_icon ("drag_nub.png");
     private bool is_left_nub_tracking = false;
     private bool is_right_nub_tracking = false;
     private int track_start_x = 0;
     private int track_nub_start_position = 0;
 
+    private Gdk.Pixbuf? drag_nub_pixbuf = null;
+
+    private Gdk.Pixbuf? get_drag_nub_pixbuf () {
+        if (drag_nub_pixbuf == null) {
+            try {
+                drag_nub_pixbuf = new Gdk.Pixbuf.from_resource ("/org/pantheon/photos/icons/drag_nub.png");  
+            } catch (Error err) {
+                error ("Can't load drag nub image: %s", err.message);
+            }
+        }
+
+        return drag_nub_pixbuf;
+    }
+
     public RGBHistogramManipulator( ) {
         set_size_request (CONTROL_WIDTH, CONTROL_HEIGHT);
 
@@ -470,7 +319,7 @@
     }
 
     private void draw_nub (Cairo.Context ctx, Gdk.Rectangle area, int position) {
-        Gdk.cairo_set_source_pixbuf (ctx, nub_pixbuf, area.x + position, area.y + NUB_V_POSITION);
+        Gdk.cairo_set_source_pixbuf (ctx, get_drag_nub_pixbuf (), area.x + position, area.y + NUB_V_POSITION);
         ctx.paint ();
     }
 

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2016-12-08 22:24:20 +0000
+++ src/Resources.vala	2017-01-08 16:55:12 +0000
@@ -72,7 +72,6 @@
 public const string ICON_GENERIC_PLUGIN = "extension";
 public const string ICON_SLIDESHOW_EXTENSION_POINT = "media-playback-start";
 public const int ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE = 32;
-public const string ICON_FILTER_UNRATED_OR_BETTER = "shotwell-16.svg";
 public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16;
 
 public const string ICON_ZOOM_ORIGINAL = "zoom-original-symbolic";
@@ -532,14 +531,12 @@
     return AppDirs.get_resources_dir ().get_child ("ui").get_child (filename);
 }
 
-private const string NONINTERPRETABLE_BADGE_FILE = "noninterpretable-video.svg";
 private Gdk.Pixbuf? noninterpretable_badge_pixbuf = null;
 
 public Gdk.Pixbuf? get_noninterpretable_badge_pixbuf () {
     if (noninterpretable_badge_pixbuf == null) {
         try {
-            noninterpretable_badge_pixbuf = new Gdk.Pixbuf.from_file (AppDirs.get_resources_dir ().get_child (
-                        "icons").get_child (NONINTERPRETABLE_BADGE_FILE).get_path ());
+            noninterpretable_badge_pixbuf = new Gdk.Pixbuf.from_resource ("/org/pantheon/photos/backgrounds/noninterpretable-video.svg");
         } catch (Error err) {
             error ("VideoReader can't load noninterpretable badge image: %s", err.message);
         }