Finishing up work on symbolic icons

16 files changed, 917 insertions, 23 deletions

diff --git a/configure.ac b/configure.ac
index 9bbd1d69..7f846d06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,6 +215,7 @@ data/icons/hicolor/16x16/Makefile
 data/icons/hicolor/16x16/status/Makefile
 data/icons/hicolor/scalable/Makefile
 data/icons/hicolor/scalable/actions/Makefile
+data/icons/hicolor/scalable/status/Makefile
 po/Makefile.in
 tests/Makefile
 yelp.desktop.in
diff --git a/data/icons/hicolor/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
index 0224d457..c1630766 100644
--- a/data/icons/hicolor/scalable/Makefile.am
+++ b/data/icons/hicolor/scalable/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions
+SUBDIRS = actions status
diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/data/icons/hicolor/scalable/status/Makefile.am
new file mode 100644
index 00000000..e7901c5f
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/Makefile.am
@@ -0,0 +1,12 @@
+icondir = $(datadir)/yelp/icons/hicolor/scalable/status
+
+icon_DATA =				\
+	yelp-page-problem-symbolic.svg	\
+	yelp-page-search-symbolic.svg	\
+	yelp-page-task-symbolic.svg	\
+	yelp-page-tip-symbolic.svg	\
+	yelp-page-ui-symbolic.svg	\
+	yelp-page-video-symbolic.svg	\
+	yelp-page-symbolic.svg
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/hicolor/scalable/status/yelp-page-problem-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-problem-symbolic.svg
new file mode 100644
index 00000000..9cd76dae
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-problem-symbolic.svg
@@ -0,0 +1,133 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-problem-symbolic.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.4375"
+     inkscape:cx="8.0440165"
+     inkscape:cy="6.1676956"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1242"
+     inkscape:window-height="925"
+     inkscape:window-x="8"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="false" />
+  </sodipodi:namedview>
+  <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(-86,649.3622)"
+       inkscape:label="text-x-generic"
+       id="g11497-6-7">
+      <path
+         style="opacity:0.51464431;color:#bebebe;fill:none;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 48,398 16,0 0,16 -16,0 z"
+         id="rect10727-3-4" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 41.90625,398.96875 c -0.510315,0.0397 -0.946437,0.51947 -0.9375,1.03125 l 0,13 c -0.0079,0.54208 0.489173,1.03914 1.03125,1.03125 l 10,0 c 0.542077,0.008 1.039137,-0.48917 1.03125,-1.03125 l 0,-10 c -0.0039,-0.26817 -0.119017,-0.53303 -0.3125,-0.71875 l -3,-3 C 49.533028,399.08777 49.268166,398.97261 49,398.96875 l -7,0 c -0.03123,-10e-4 -0.06252,-10e-4 -0.09375,0 z M 48.5,400 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 2.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+         id="path4387"
+         sodipodi:nodetypes="ccccccccccccccccsccccc" />
+      <path
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M -44.09375 11.96875 C -44.604065 12.00845 -45.040187 12.48822 -45.03125 13 L -45.03125 26 C -45.03915 26.54208 -44.542077 27.03914 -44 27.03125 L -34 27.03125 C -33.457923 27.03925 -32.960863 26.54208 -32.96875 26 L -32.96875 16 C -32.97265 15.73183 -33.087767 15.46697 -33.28125 15.28125 L -36.28125 12.28125 C -36.466972 12.08777 -36.731834 11.97261 -37 11.96875 L -44 11.96875 C -44.03123 11.96775 -44.06252 11.96775 -44.09375 11.96875 z M -42.5 15 L -36.5 15 L -36.5 16 L -40 16 C -39.723 16 -39.5 16.223 -39.5 16.5 L -39.5 19 L -37 19 C -36.723 19 -36.5 19.223 -36.5 19.5 C -36.5 19.777 -36.723 20 -37 20 L -40 20 C -40.277 20 -40.5 19.777 -40.5 19.5 L -40.5 16.5 C -40.5 16.223 -40.277 16 -40 16 L -42.5 16 L -42.5 15 z "
+         transform="translate(86,387)"
+         id="path3054" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 25.000034,1070.3622 12,0 0,-13 -12,0 z m 1,-12 10,0 0,11 -10,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27,1060.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path3774"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2990"
+       d="m 29,1063.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 29,1066.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2992"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path2994"
+       d="m 27.000017,1063.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27.000017,1066.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2996"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       d="M 2 2 L 2 15 L 14 15 L 14 4 L 12 2 L 2 2 z M 7 4 L 9.03125 4 L 8.8125 10.78125 L 7.21875 10.78125 L 7 4 z M 7 11.875 L 9 11.875 L 9 13.75 L 7 13.75 L 7 11.875 z "
+       transform="translate(0,1036.3622)"
+       id="rect3096" />
+    <g
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:PT Sans;-inkscape-font-specification:PT Sans"
+       id="text3117" />
+    <g
+       style="font-size:20.22849464px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:PT Sans;-inkscape-font-specification:PT Sans"
+       id="text2995"
+       transform="translate(8.665591,0.7419)" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/status/yelp-page-search-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-search-symbolic.svg
new file mode 100644
index 00000000..0faa8ce1
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-search-symbolic.svg
@@ -0,0 +1,136 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-problem-symbolic.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.4375"
+     inkscape:cx="8.088033"
+     inkscape:cy="6.1676956"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1242"
+     inkscape:window-height="925"
+     inkscape:window-x="8"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="false" />
+  </sodipodi:namedview>
+  <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(-86,649.3622)"
+       inkscape:label="text-x-generic"
+       id="g11497-6-7">
+      <path
+         style="opacity:0.51464431;color:#bebebe;fill:none;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 48,398 16,0 0,16 -16,0 z"
+         id="rect10727-3-4" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 41.90625,398.96875 c -0.510315,0.0397 -0.946437,0.51947 -0.9375,1.03125 l 0,13 c -0.0079,0.54208 0.489173,1.03914 1.03125,1.03125 l 10,0 c 0.542077,0.008 1.039137,-0.48917 1.03125,-1.03125 l 0,-10 c -0.0039,-0.26817 -0.119017,-0.53303 -0.3125,-0.71875 l -3,-3 C 49.533028,399.08777 49.268166,398.97261 49,398.96875 l -7,0 c -0.03123,-10e-4 -0.06252,-10e-4 -0.09375,0 z M 48.5,400 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 2.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+         id="path4387"
+         sodipodi:nodetypes="ccccccccccccccccsccccc" />
+      <path
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M -44.09375 11.96875 C -44.604065 12.00845 -45.040187 12.48822 -45.03125 13 L -45.03125 26 C -45.03915 26.54208 -44.542077 27.03914 -44 27.03125 L -34 27.03125 C -33.457923 27.03925 -32.960863 26.54208 -32.96875 26 L -32.96875 16 C -32.97265 15.73183 -33.087767 15.46697 -33.28125 15.28125 L -36.28125 12.28125 C -36.466972 12.08777 -36.731834 11.97261 -37 11.96875 L -44 11.96875 C -44.03123 11.96775 -44.06252 11.96775 -44.09375 11.96875 z M -42.5 15 L -36.5 15 L -36.5 16 L -40 16 C -39.723 16 -39.5 16.223 -39.5 16.5 L -39.5 19 L -37 19 C -36.723 19 -36.5 19.223 -36.5 19.5 C -36.5 19.777 -36.723 20 -37 20 L -40 20 C -40.277 20 -40.5 19.777 -40.5 19.5 L -40.5 16.5 C -40.5 16.223 -40.277 16 -40 16 L -42.5 16 L -42.5 15 z "
+         transform="translate(86,387)"
+         id="path3054" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 25.000034,1070.3622 12,0 0,-13 -12,0 z m 1,-12 10,0 0,11 -10,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27,1060.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path3774"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2990"
+       d="m 29,1063.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 29,1066.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2992"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path2994"
+       d="m 27.000017,1063.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27.000017,1066.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2996"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       d="M 2 2 L 2 15 L 14 15 L 14 4 L 12 2 L 2 2 z M 7.03125 3.96875 C 9.0229614 3.96875 10.65625 5.6042306 10.65625 7.59375 C 10.65625 8.339786 10.423162 9.0470425 10.03125 9.625 L 10.03125 9.65625 L 12.4375 12.0625 A 0.66291263 0.66291263 0 1 1 11.5 13 L 9.09375 10.59375 L 9.0625 10.59375 C 8.4838653 10.985198 7.7781421 11.21875 7.03125 11.21875 C 5.0395317 11.21875 3.40625 9.5831794 3.40625 7.59375 C 3.40625 5.6042306 5.0395317 3.96875 7.03125 3.96875 z M 7.03125 5.3125 C 5.7507048 5.3125 4.75 6.3145677 4.75 7.59375 C 4.75 8.8727524 5.7507048 9.90625 7.03125 9.90625 C 8.3117887 9.90625 9.34375 8.8727524 9.34375 7.59375 C 9.34375 6.3145677 8.3117887 5.3125 7.03125 5.3125 z "
+       transform="translate(0,1036.3622)"
+       id="rect3096" />
+    <g
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:PT Sans;-inkscape-font-specification:PT Sans"
+       id="text3117" />
+    <g
+       style="font-size:20.22849464px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:PT Sans;-inkscape-font-specification:PT Sans"
+       id="text2995"
+       transform="translate(8.665591,0.7419)" />
+    <g
+       id="g3122"
+       transform="matrix(0.89950233,0,0,0.89950233,-2.4604125,104.55158)" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/status/yelp-page-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-symbolic.svg
new file mode 100644
index 00000000..817830e5
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-symbolic.svg
@@ -0,0 +1,135 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-problem-symbolic.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.4375"
+     inkscape:cx="8.0440165"
+     inkscape:cy="6.1676956"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1242"
+     inkscape:window-height="925"
+     inkscape:window-x="8"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="false" />
+  </sodipodi:namedview>
+  <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(-86,649.3622)"
+       inkscape:label="text-x-generic"
+       id="g11497-6-7">
+      <path
+         style="opacity:0.51464431;color:#bebebe;fill:none;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 48,398 16,0 0,16 -16,0 z"
+         id="rect10727-3-4" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 41.90625,398.96875 c -0.510315,0.0397 -0.946437,0.51947 -0.9375,1.03125 l 0,13 c -0.0079,0.54208 0.489173,1.03914 1.03125,1.03125 l 10,0 c 0.542077,0.008 1.039137,-0.48917 1.03125,-1.03125 l 0,-10 c -0.0039,-0.26817 -0.119017,-0.53303 -0.3125,-0.71875 l -3,-3 C 49.533028,399.08777 49.268166,398.97261 49,398.96875 l -7,0 c -0.03123,-10e-4 -0.06252,-10e-4 -0.09375,0 z M 48.5,400 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 2.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+         id="path4387"
+         sodipodi:nodetypes="ccccccccccccccccsccccc" />
+      <path
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M -44.09375 11.96875 C -44.604065 12.00845 -45.040187 12.48822 -45.03125 13 L -45.03125 26 C -45.03915 26.54208 -44.542077 27.03914 -44 27.03125 L -34 27.03125 C -33.457923 27.03925 -32.960863 26.54208 -32.96875 26 L -32.96875 16 C -32.97265 15.73183 -33.087767 15.46697 -33.28125 15.28125 L -36.28125 12.28125 C -36.466972 12.08777 -36.731834 11.97261 -37 11.96875 L -44 11.96875 C -44.03123 11.96775 -44.06252 11.96775 -44.09375 11.96875 z M -42.5 15 L -36.5 15 L -36.5 16 L -40 16 C -39.723 16 -39.5 16.223 -39.5 16.5 L -39.5 19 L -37 19 C -36.723 19 -36.5 19.223 -36.5 19.5 C -36.5 19.777 -36.723 20 -37 20 L -40 20 C -40.277 20 -40.5 19.777 -40.5 19.5 L -40.5 16.5 C -40.5 16.223 -40.277 16 -40 16 L -42.5 16 L -42.5 15 z "
+         transform="translate(86,387)"
+         id="path3054" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 25.000034,1070.3622 12,0 0,-13 -12,0 z m 1,-12 10,0 0,11 -10,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27,1060.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path3774"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2990"
+       d="m 29,1063.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 29,1066.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2992"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path2994"
+       d="m 27.000017,1063.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27.000017,1066.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2996"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       d="M 2,2 2,15 14,15 14,4 12,2 z m 2,2 7,0 1,1 0,8 -8,0 z"
+       transform="translate(0,1036.3622)"
+       id="rect3096"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+    <g
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:PT Sans;-inkscape-font-specification:PT Sans"
+       id="text3117" />
+    <g
+       style="font-size:20.22849464px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:PT Sans;-inkscape-font-specification:PT Sans"
+       id="text2995"
+       transform="translate(8.665591,0.7419)" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/status/yelp-page-task-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-task-symbolic.svg
new file mode 100644
index 00000000..acc33561
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-task-symbolic.svg
@@ -0,0 +1,128 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-task-symbolic.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.3008496"
+     inkscape:cy="6.7014245"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1242"
+     inkscape:window-height="925"
+     inkscape:window-x="8"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="false" />
+  </sodipodi:namedview>
+  <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(-86,649.3622)"
+       inkscape:label="text-x-generic"
+       id="g11497-6-7">
+      <path
+         style="opacity:0.51464431;color:#bebebe;fill:none;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 48,398 16,0 0,16 -16,0 z"
+         id="rect10727-3-4" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 41.90625,398.96875 c -0.510315,0.0397 -0.946437,0.51947 -0.9375,1.03125 l 0,13 c -0.0079,0.54208 0.489173,1.03914 1.03125,1.03125 l 10,0 c 0.542077,0.008 1.039137,-0.48917 1.03125,-1.03125 l 0,-10 c -0.0039,-0.26817 -0.119017,-0.53303 -0.3125,-0.71875 l -3,-3 C 49.533028,399.08777 49.268166,398.97261 49,398.96875 l -7,0 c -0.03123,-10e-4 -0.06252,-10e-4 -0.09375,0 z M 48.5,400 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 2.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+         id="path4387"
+         sodipodi:nodetypes="ccccccccccccccccsccccc" />
+      <path
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M -44.09375 11.96875 C -44.604065 12.00845 -45.040187 12.48822 -45.03125 13 L -45.03125 26 C -45.03915 26.54208 -44.542077 27.03914 -44 27.03125 L -34 27.03125 C -33.457923 27.03925 -32.960863 26.54208 -32.96875 26 L -32.96875 16 C -32.97265 15.73183 -33.087767 15.46697 -33.28125 15.28125 L -36.28125 12.28125 C -36.466972 12.08777 -36.731834 11.97261 -37 11.96875 L -44 11.96875 C -44.03123 11.96775 -44.06252 11.96775 -44.09375 11.96875 z M -42.5 15 L -36.5 15 L -36.5 16 L -40 16 C -39.723 16 -39.5 16.223 -39.5 16.5 L -39.5 19 L -37 19 C -36.723 19 -36.5 19.223 -36.5 19.5 C -36.5 19.777 -36.723 20 -37 20 L -40 20 C -40.277 20 -40.5 19.777 -40.5 19.5 L -40.5 16.5 C -40.5 16.223 -40.277 16 -40 16 L -42.5 16 L -42.5 15 z "
+         transform="translate(86,387)"
+         id="path3054" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 25.000034,1070.3622 12,0 0,-13 -12,0 z m 1,-12 10,0 0,11 -10,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27,1060.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path3774"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2990"
+       d="m 29,1063.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 29,1066.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2992"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path2994"
+       d="m 27.000017,1063.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27.000017,1066.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2996"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       d="M 2,2 2,15 14,15 14,4 12,2 z M 4,5 5,5 5,6 4,6 z m 2,0 6,0 0,1 -6,0 z M 4,8 5,8 5,9 4,9 z m 2,0 6,0 0,1 -6,0 z m -2,3 1,0 0,1 -1,0 z m 2,0 6,0 0,1 -6,0 z"
+       transform="translate(0,1036.3622)"
+       id="rect3096"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/status/yelp-page-tip-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-tip-symbolic.svg
new file mode 100644
index 00000000..7eb46d18
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-tip-symbolic.svg
@@ -0,0 +1,81 @@
+<?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="16"
+   height="16"
+   id="svg3951"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-tip-symbolic.svg">
+  <defs
+     id="defs3953" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="39.125"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1212"
+     inkscape:window-height="917"
+     inkscape:window-x="8"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3959"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3956">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 8,1037.3622 c -2.74958,0 -5,2.2504 -5,5 0,1.5862 0.84459,2.9034 2,3.8125 l 0,2.1875 0,1 1,0 4,0 1,0 0,-1 0,-2.1875 c 1.15541,-0.9091 2,-2.2263 2,-3.8125 0,-2.7496 -2.25042,-5 -5,-5 z m 0,2 c 1.66868,0 3,1.3313 3,3 0,1.1159 -0.59507,2.0379 -1.5,2.5625 l -0.5,0.3125 0,0.5625 0,1.5625 -2,0 0,-1.5625 0,-0.5625 -0.5,-0.3125 c -0.90493,-0.5246 -1.5,-1.4466 -1.5,-2.5625 0,-1.6687 1.33132,-3 3,-3 z"
+       id="path4561"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 7,1042.3622 0,1 2,0 0,-1 -2,0 z"
+       id="path4488-4-4"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.35;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <rect
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       id="rect4033"
+       width="4"
+       height="1"
+       x="6"
+       y="1050.3622" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/status/yelp-page-ui-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-ui-symbolic.svg
new file mode 100644
index 00000000..6920ee39
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-ui-symbolic.svg
@@ -0,0 +1,128 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-task-symbolic.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.3450438"
+     inkscape:cy="7.585308"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1242"
+     inkscape:window-height="925"
+     inkscape:window-x="8"
+     inkscape:window-y="65"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="false" />
+  </sodipodi:namedview>
+  <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(-86,649.3622)"
+       inkscape:label="text-x-generic"
+       id="g11497-6-7">
+      <path
+         style="opacity:0.51464431;color:#bebebe;fill:none;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 48,398 16,0 0,16 -16,0 z"
+         id="rect10727-3-4" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 41.90625,398.96875 c -0.510315,0.0397 -0.946437,0.51947 -0.9375,1.03125 l 0,13 c -0.0079,0.54208 0.489173,1.03914 1.03125,1.03125 l 10,0 c 0.542077,0.008 1.039137,-0.48917 1.03125,-1.03125 l 0,-10 c -0.0039,-0.26817 -0.119017,-0.53303 -0.3125,-0.71875 l -3,-3 C 49.533028,399.08777 49.268166,398.97261 49,398.96875 l -7,0 c -0.03123,-10e-4 -0.06252,-10e-4 -0.09375,0 z M 48.5,400 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 2.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+         id="path4387"
+         sodipodi:nodetypes="ccccccccccccccccsccccc" />
+      <path
+         style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M -44.09375 11.96875 C -44.604065 12.00845 -45.040187 12.48822 -45.03125 13 L -45.03125 26 C -45.03915 26.54208 -44.542077 27.03914 -44 27.03125 L -34 27.03125 C -33.457923 27.03925 -32.960863 26.54208 -32.96875 26 L -32.96875 16 C -32.97265 15.73183 -33.087767 15.46697 -33.28125 15.28125 L -36.28125 12.28125 C -36.466972 12.08777 -36.731834 11.97261 -37 11.96875 L -44 11.96875 C -44.03123 11.96775 -44.06252 11.96775 -44.09375 11.96875 z M -42.5 15 L -36.5 15 L -36.5 16 L -40 16 C -39.723 16 -39.5 16.223 -39.5 16.5 L -39.5 19 L -37 19 C -36.723 19 -36.5 19.223 -36.5 19.5 C -36.5 19.777 -36.723 20 -37 20 L -40 20 C -40.277 20 -40.5 19.777 -40.5 19.5 L -40.5 16.5 C -40.5 16.223 -40.277 16 -40 16 L -42.5 16 L -42.5 15 z "
+         transform="translate(86,387)"
+         id="path3054" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 25.000034,1070.3622 12,0 0,-13 -12,0 z m 1,-12 10,0 0,11 -10,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27,1060.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path3774"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2990"
+       d="m 29,1063.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 29,1066.3622 5.999983,0 1.7e-5,0 1.7e-5,0.9999 -1.7e-5,10e-5 -5.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2992"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path2994"
+       d="m 27.000017,1063.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#888a85;fill-opacity:1;stroke:none"
+       d="m 27.000017,1066.3622 0.999983,0 1.7e-5,0 1.7e-5,1 -1.7e-5,0 -0.999983,0 -1.7e-5,0 -1.7e-5,-1 z"
+       id="path2996"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       d="M 4,3 C 3,3 2,4 2,5 c 0,1 0,6 0,7 0,1 1,2 2,2 1,0 7,0 8,0 1,0 2,-1 2,-2 0,-1 0,-6 0,-7 C 14,4 13,3 12,3 11,3 5,3 4,3 z m 0,4 8,0 0,5 -8,0 z"
+       transform="translate(0,1036.3622)"
+       id="rect3096"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzzzzzzccccc" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/status/yelp-page-video-symbolic.svg b/data/icons/hicolor/scalable/status/yelp-page-video-symbolic.svg
new file mode 100644
index 00000000..7ea4ae6f
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/yelp-page-video-symbolic.svg
@@ -0,0 +1,78 @@
+<?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="16"
+   height="16"
+   id="svg2998"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="yelp-page-video-symbolic.svg">
+  <defs
+     id="defs3000" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="28.9375"
+     inkscape:cx="11.508071"
+     inkscape:cy="4.8698266"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1091"
+     inkscape:window-height="858"
+     inkscape:window-x="504"
+     inkscape:window-y="143"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       id="rect3946"
+       width="10"
+       height="9"
+       x="1"
+       y="1040.3622"
+       rx="1"
+       ry="1" />
+    <path
+       style="fill:#babdb6;fill-opacity:1;stroke:none"
+       d="m 14,1041.3622 1,0 0,7 -1,0 -3,-3.5 z"
+       id="rect3948"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/libyelp/yelp-docbook-document.c b/libyelp/yelp-docbook-document.c
index 45a15f89..0d9b1825 100644
--- a/libyelp/yelp-docbook-document.c
+++ b/libyelp/yelp-docbook-document.c
@@ -955,7 +955,7 @@ docbook_index_chunk (DocbookIndexData *index)
 
         yelp_storage_update (yelp_storage_get_default (),
                              index->doc_uri, full_uri,
-                             title, "", "help-contents",
+                             title, "", "yelp-page",
                              body);
         if (index->cur->parent->parent == NULL)
             yelp_storage_set_root_title (yelp_storage_get_default (),
diff --git a/libyelp/yelp-document.c b/libyelp/yelp-document.c
index 57827a6b..f0ba9f14 100644
--- a/libyelp/yelp-document.c
+++ b/libyelp/yelp-document.c
@@ -733,7 +733,7 @@ yelp_document_get_page_icon (YelpDocument *document,
     g_assert (document != NULL && YELP_IS_DOCUMENT (document));
 
     if (page_id != NULL && g_str_has_prefix (page_id, "search="))
-        return g_strdup ("folder-saved-search");
+        return g_strdup ("yelp-page-search");
 
     g_mutex_lock (document->priv->mutex);
     real = hash_lookup (document->priv->page_ids, page_id);
@@ -745,7 +745,7 @@ yelp_document_get_page_icon (YelpDocument *document,
     g_mutex_unlock (document->priv->mutex);
 
     if (ret == NULL)
-        ret = g_strdup ("help-contents");
+        ret = g_strdup ("yelp-page");
 
     return ret;
 }
diff --git a/libyelp/yelp-mallard-document.c b/libyelp/yelp-mallard-document.c
index 21a35cac..89884a6b 100644
--- a/libyelp/yelp-mallard-document.c
+++ b/libyelp/yelp-mallard-document.c
@@ -804,13 +804,17 @@ xml_node_get_icon (xmlNodePtr node)
 {
     xmlChar *style;
     gchar **styles;
-    gchar *icon = "help-contents";
+    gchar *icon = "yelp-page";
     style = xmlGetProp (node, BAD_CAST "style");
     if (style) {
         gint i;
         styles = g_strsplit (style, " ", -1);
         for (i = 0; styles[i] != NULL; i++) {
-            if (g_str_equal (styles[i], "task")) {
+            if (g_str_equal (styles[i], "video")) {
+                icon = "yelp-page-video";
+                break;
+            }
+            else if (g_str_equal (styles[i], "task")) {
                 icon = "yelp-page-task";
                 break;
             }
@@ -818,12 +822,12 @@ xml_node_get_icon (xmlNodePtr node)
                 icon = "yelp-page-tip";
                 break;
             }
-            else if (g_str_equal (styles[i], "ui")) {
-                icon = "yelp-page-ui";
+            else if (g_str_equal (styles[i], "problem")) {
+                icon = "yelp-page-problem";
                 break;
             }
-            else if (g_str_equal (styles[i], "video")) {
-                icon = "yelp-page-video";
+            else if (g_str_equal (styles[i], "ui")) {
+                icon = "yelp-page-ui";
                 break;
             }
         }
diff --git a/libyelp/yelp-settings.c b/libyelp/yelp-settings.c
index 1b8f4d01..841cfbad 100644
--- a/libyelp/yelp-settings.c
+++ b/libyelp/yelp-settings.c
@@ -941,7 +941,7 @@ icon_theme_changed (GtkIconTheme *theme,
     GtkIconInfo *info;
     gint i;
     GdkPixbuf *pixbuf;
-    GdkRGBA base, gray_border, yellow_border;
+    GdkRGBA color, base;
 
     g_mutex_lock (settings->priv->mutex);
 
@@ -964,13 +964,12 @@ icon_theme_changed (GtkIconTheme *theme,
     }
 
     /* Set pixbufs for named icons */
+    gdk_rgba_parse (&color, settings->priv->colors[YELP_SETTINGS_COLOR_TEXT_LIGHT]);
     gdk_rgba_parse (&base, settings->priv->colors[YELP_SETTINGS_COLOR_BASE]);
-    gdk_rgba_parse (&gray_border, settings->priv->colors[YELP_SETTINGS_COLOR_GRAY_BORDER]);
-    gdk_rgba_parse (&yellow_border, settings->priv->colors[YELP_SETTINGS_COLOR_YELLOW_BORDER]);
 
     info = gtk_icon_theme_lookup_icon (theme, "edit-clear-symbolic", 16,
                                        GTK_ICON_LOOKUP_FORCE_SVG);
-    pixbuf = gtk_icon_info_load_symbolic (info, &gray_border,
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
                                           NULL, NULL, NULL,
                                           NULL, NULL);
     g_hash_table_replace (settings->priv->pixbufs, g_strdup ("edit-clear"), pixbuf);
@@ -978,7 +977,7 @@ icon_theme_changed (GtkIconTheme *theme,
 
     info = gtk_icon_theme_lookup_icon (theme, "edit-find-symbolic", 16,
                                        GTK_ICON_LOOKUP_FORCE_SVG);
-    pixbuf = gtk_icon_info_load_symbolic (info, &gray_border,
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
                                           NULL, NULL, NULL,
                                           NULL, NULL);
     g_hash_table_replace (settings->priv->pixbufs, g_strdup ("system-search"), pixbuf);
@@ -987,15 +986,71 @@ icon_theme_changed (GtkIconTheme *theme,
     info = gtk_icon_theme_lookup_icon (theme, "yelp-bookmark-symbolic", 16,
                                        GTK_ICON_LOOKUP_FORCE_SVG);
     pixbuf = gtk_icon_info_load_symbolic (info,
-                                          &gray_border, &base,
+                                          &color, &base,
                                           NULL, NULL, NULL, NULL);
     g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-bookmark-add"), pixbuf);
     pixbuf = gtk_icon_info_load_symbolic (info,
-                                          &gray_border, &yellow_border,
+                                          &color, &color,
                                           NULL, NULL, NULL, NULL);
     g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-bookmark-remove"), pixbuf);
     gtk_icon_info_free (info);
 
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-task-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page-task"), pixbuf);
+    gtk_icon_info_free (info);
+
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-tip-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page-tip"), pixbuf);
+    gtk_icon_info_free (info);
+
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-video-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page-video"), pixbuf);
+    gtk_icon_info_free (info);
+
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-ui-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page-ui"), pixbuf);
+    gtk_icon_info_free (info);
+
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-problem-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page-problem"), pixbuf);
+    gtk_icon_info_free (info);
+
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-search-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page-search"), pixbuf);
+    gtk_icon_info_free (info);
+
+    info = gtk_icon_theme_lookup_icon (theme, "yelp-page-symbolic", 16,
+                                       GTK_ICON_LOOKUP_FORCE_SVG);
+    pixbuf = gtk_icon_info_load_symbolic (info, &color,
+                                          NULL, NULL, NULL,
+                                          NULL, NULL);
+    g_hash_table_replace (settings->priv->pixbufs, g_strdup ("yelp-page"), pixbuf);
+    gtk_icon_info_free (info);
+
     g_mutex_unlock (settings->priv->mutex);
 
     g_signal_emit (settings, settings_signals[ICONS_CHANGED], 0);
@@ -1006,17 +1061,19 @@ yelp_settings_cmp_icons (const gchar *icon1,
                          const gchar *icon2)
 {
     static const gchar *icons[] = {
-        "yelp-page-task",
+        "yelp-page-search",
         "yelp-page-video",
+        "yelp-page-task",
         "yelp-page-tip",
+        "yelp-page-problem",
         "yelp-page-ui",
-        "help-contents",
+        "yelp-page",
         NULL
     };
     gint i;
     for (i = 0; icons[i] != NULL; i++) {
-        gboolean eq1 = icon1 ? g_str_equal (icon1, icons[i]) : FALSE;
-        gboolean eq2 = icon2 ? g_str_equal (icon2, icons[i]) : FALSE;
+        gboolean eq1 = icon1 ? g_str_has_prefix (icon1, icons[i]) : FALSE;
+        gboolean eq2 = icon2 ? g_str_has_prefix (icon2, icons[i]) : FALSE;
         if (eq1 && eq2)
             return 0;
         else if (eq1)
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index 0a59109f..af56af0f 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -503,7 +503,7 @@ yelp_view_get_property (GObject    *object,
             if (priv->page_icon)
                 g_value_set_string (value, priv->page_icon);
             else
-                g_value_set_string (value, "help-contents");
+                g_value_set_string (value, "yelp-page");
             break;
         case PROP_STATE:
             g_value_set_enum (value, priv->state);
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 5f4930fc..fb299ca7 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -846,7 +846,7 @@ window_set_bookmarks (YelpWindow  *window,
     while (g_variant_iter_loop (iter, "(&s&s&s)", &page_id, &icon, &title)) {
         YelpMenuEntry *entry = g_new0 (YelpMenuEntry, 1);
         entry->page_id = page_id;
-        entry->icon = icon;
+        entry->icon = g_strconcat (icon, "-symbolic", NULL);
         entry->title = title;
         entries = g_slist_insert_sorted (entries, entry, (GCompareFunc) entry_compare);
     }
@@ -886,6 +886,7 @@ window_set_bookmarks (YelpWindow  *window,
                 g_object_set (cur->data, "always-show-image", TRUE, NULL);
         }
         g_free (action_id);
+        g_free (entry->icon);
         g_free (entry);
     }