Index: icons/Makefile
==================================================================
--- icons/Makefile
+++ icons/Makefile
@@ -1,16 +1,16 @@
 RIVET         := /usr/lib64/rivet0.5.0/cgi-bin/rivet.cgi
 
 ACTION_LIST   := build tests
 STATUS_LIST   := pass fail
-PLATFORM_LIST := x86_64-linux x86_64-macos x86_64-freebsd
+PLATFORM_LIST := x86_64-linux x86_64-macos x86_64-freebsd arm-android
 
 ICONS = $(shell for action in $(ACTION_LIST); do for status in $(STATUS_LIST); do for platform in $(PLATFORM_LIST); do echo "static/icon-$${action}-$${status}-$${platform}.svg"; done; done; done)
 
 all: $(ICONS)
 
-static/%.svg: $(RIVET) status-icons.rvt $(shell find os -type f -name '*.svg')
+static/%.svg: $(RIVET) status-icons.rvt $(shell find os status action -type f -name '*.svg')
 	@if ! test -d static; then mkdir static; fi
 	QUERY_STRING='action=$(shell echo '$@' | cut -f 2 -d -)&status=$(shell echo '$@' | cut -f 3 -d -)&os=$(shell echo '$@' | cut -f 5 -d - | cut -f 1 -d .)' PATH_TRANSLATED='$(shell pwd)/status-icons.rvt' '$(RIVET)' ./status-icons.rvt | tail -n +5 > '$@'
 
 static/%.png: static/%.svg
 	echo TODO Add support for making '$@' from '$^'

ADDED   icons/action/build.svg
Index: icons/action/build.svg
==================================================================
--- /dev/null
+++ icons/action/build.svg
@@ -0,0 +1,67 @@
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   baseProfile="full"
+   width="@@WIDTH@@" height="@@HEIGHT@@" x="@@XPOS@@" y="@@YPOS@@"
+   viewBox="0 0 500 500"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="Cog-scripted-svg.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="C:\Documents and Settings\AleXander\Desktop">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="844"
+     inkscape:window-width="1440"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="4.95253"
+     inkscape:cx="25.530959"
+     inkscape:cy="37.94049"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <path
+       id="cog"
+       fill="darkred"
+       transform="scale(0.4)"
+       d="M 213 0 L 209 39 L 204 78 L 184 87 L 164 96 L 132 70 L 101 45 L 74 72 L 47 99 L 72 130 L 97 162 L 88 181 L 79 200 L 44 205 C 24 208 7 210 4 211 C 1 212 0 223 0 250 L 0 287 L 39 291 C 63 294 79 297 79 299 C 79 301 82 311 87 320 L 95 338 L 70 368 L 45 399 L 72 426 L 99 453 L 129 430 L 159 406 L 177 415 C 187 420 197 425 199 425 C 200 426 203 441 206 459 C 208 477 210 493 211 496 C 212 499 222 500 249 500 L 287 500 L 291 464 C 294 436 296 427 301 426 C 304 425 314 421 324 416 L 341 408 L 370 432 L 400 455 L 426 428 C 446 408 452 400 450 397 C 448 394 437 381 427 368 L 407 343 L 416 325 C 421 315 424 305 424 303 C 424 299 432 297 476 292 L 498 289 L 499 251 L 500 213 L 462 209 C 439 206 424 203 424 201 C 424 199 421 189 416 179 L 407 160 L 431 131 L 455 101 L 428 74 L 401 47 L 371 71 L 341 95 L 320 86 L 299 77 L 294 40 L 289 2 L 251 1 L 213 0 z M 250 170 C 294 170 330 206 330 250 C 330 294 294 330 250 330 C 206 330 170 294 170 250 C 170 206 206 170 250 170 z " />
+  </defs>
+  <path
+     style="fill:#1986cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 92.03125,259.375 L 88.28125,293.125 L 70.78125,300.9375 L 43.4375,278.75 L 20.46875,302.1875 L 42.34375,329.84375 L 34.375,346.40625 L 1.25,350.625 C 1.250005,350.62499 -0.35694,377.88268 0,383.59375 C 10.17285,384.12915 33.75,388.4375 33.75,388.4375 L 41.40625,405.46875 L 19.6875,432.03125 L 42.65625,456.25 L 69.21875,434.84375 L 86.25,443.28125 L 91.25,473.90625 L 124.21875,475.625 C 124.21875,475.62499 126.60905,444.50833 130,443.4375 C 133.39095,442.36669 147.65625,435.625 147.65625,435.625 L 172.96875,456.09375 C 172.96875,456.09375 195.02222,434.21734 194.84375,431.71875 C 194.66528,429.22013 175.78125,407.65625 175.78125,407.65625 C 175.78125,407.65625 183.75,391.65068 183.75,389.6875 C 183.75,387.72433 215.3125,384.375 215.3125,384.375 L 216.25,351.71875 C 216.25,351.71875 184.32986,348.83818 183.4375,346.875 C 182.54515,344.91182 178.79304,334.32705 175.9375,328.4375 C 182.00552,321.6556 196.875,302.96875 196.875,302.96875 L 173.59375,280.3125 L 147.34375,300.46875 L 129.375,292.65625 L 125.15625,260.3125 L 92.03125,259.375 z M 108.125,332.96875 C 127.23711,332.96876 142.8125,348.38788 142.8125,367.5 C 142.8125,386.61211 127.23712,402.1875 108.125,402.1875 C 89.012885,402.18752 73.59375,386.61212 73.59375,367.5 C 73.593745,348.38788 89.012885,332.96875 108.125,332.96875 z "
+     id="path7031" />
+  <path
+     style="fill:#1986cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.6"
+     d="M 330.88028,180.40118 L 298.348,190.13645 L 284.31876,177.08018 L 294.0584,143.24078 L 263.50947,131.25571 L 246.59899,162.1979 L 228.23951,161.33413 L 211.41316,132.49079 C 211.41318,132.49078 185.69443,141.66201 180.57686,144.2221 C 184.05883,153.79545 189.30531,177.18173 189.30531,177.18173 L 176.61951,190.88396 L 143.6824,181.27056 L 130.36356,211.87643 L 160.44687,227.96325 L 159.33477,246.93741 L 133.09795,263.50606 L 144.39777,294.52553 C 144.39778,294.52551 173.97478,284.56755 176.28542,287.27051 C 178.59606,289.97351 190.37571,300.4706 190.37571,300.4706 L 181.42451,331.76868 C 181.42451,331.76868 210.17883,343.52117 212.40907,342.38062 C 214.63934,341.24008 227.11041,315.43154 227.11041,315.43154 C 227.11041,315.43154 244.95725,316.51294 246.76436,315.74587 C 248.57146,314.9788 263.98701,342.72355 263.98701,342.72355 L 294.41356,330.82669 C 294.41356,330.82669 284.59293,300.31854 286.05137,298.73003 C 287.50982,297.14155 295.78707,289.5519 300.09269,284.62214 C 308.70645,287.55788 331.71775,293.94378 331.71775,293.94378 L 343.47621,263.66077 L 314.6656,247.37319 L 314.83611,227.78027 L 342.96029,211.2592 L 330.88028,180.40118 z M 269.42521,223.97092 C 276.89291,241.56369 268.7853,261.92566 251.1925,269.39335 C 233.59971,276.86103 213.1767,268.60963 205.70901,251.01684 C 198.24129,233.42404 206.55379,213.14486 224.14659,205.67717 C 241.73939,198.20945 261.95752,206.3781 269.42521,223.97092 z "
+     id="path8974" />
+  <path
+     style="fill:#1986cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.3"
+     d="M 92.03125,-0.625 L 88.28125,33.125 L 70.78125,40.9375 L 43.4375,18.75 L 20.46875,42.1875 L 42.34375,69.84375 L 34.375,86.40625 L 1.25,90.625 C 1.250005,90.62499 -0.35694,117.88268 0,123.59375 C 10.17285,124.12915 33.75,128.4375 33.75,128.4375 L 41.40625,145.46875 L 19.6875,172.03125 L 42.65625,196.25 L 69.21875,174.84375 L 86.25,183.28125 L 91.25,213.90625 L 124.21875,215.625 C 124.21875,215.62499 126.60905,184.50833 130,183.4375 C 133.39095,182.36669 147.65625,175.625 147.65625,175.625 L 172.96875,196.09375 C 172.96875,196.09375 195.02222,174.21734 194.84375,171.71875 C 194.66528,169.22013 175.78125,147.65625 175.78125,147.65625 C 175.78125,147.65625 183.75,131.65068 183.75,129.6875 C 183.75,127.72433 215.3125,124.375 215.3125,124.375 L 216.25,91.71875 C 216.25,91.71875 184.32986,88.83818 183.4375,86.875 C 182.54515,84.91182 178.79304,74.32705 175.9375,68.4375 C 182.00552,61.6556 196.875,42.96875 196.875,42.96875 L 173.59375,20.3125 L 147.34375,40.46875 L 129.375,32.65625 L 125.15625,0.3125 L 92.03125,-0.625 z M 108.125,72.96875 C 127.23711,72.96876 142.8125,88.38788 142.8125,107.5 C 142.8125,126.61211 127.23712,142.1875 108.125,142.1875 C 89.012885,142.18752 73.59375,126.61212 73.59375,107.5 C 73.593745,88.38788 89.012885,72.96875 108.125,72.96875 z "
+     id="path8976" />
+</svg>

ADDED   icons/action/tests.svg
Index: icons/action/tests.svg
==================================================================
--- /dev/null
+++ icons/action/tests.svg
@@ -0,0 +1,58 @@
+<svg viewBox="0 0 1052 1052" inkscape:version="0.39cvs" sodipodi:docbase="/root/img/download" sodipodi:docname="clipboard.svg" sodipodi:version="0.32" width="@@WIDTH@@" height="@@HEIGHT@@" x="@@XPOS@@" y="@@YPOS@@" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <metadata>
+    <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <cc:Work rdf:about="">
+        <dc:title>Clipboard</dc:title>
+        <dc:description></dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>office</rdf:li>
+            <rdf:li></rdf:li>
+            <rdf:li>clipboard</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>work</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://www.openclipart.org">
+            <dc:title>Nathan Eady</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Nathan Eady</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Nathan Eady</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date></dc:date>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs3">
+    <linearGradient id="linearGradient1535">
+      <stop id="stop1536" offset="0.0000000" style="stop-color:#8a8a8a;stop-opacity:1.0000000;"/>
+      <stop id="stop1537" offset="1.0000000" style="stop-color:#cecece;stop-opacity:1.0000000;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient1538" inkscape:collect="always" spreadMethod="reflect" x1="0.76876879" x2="0.25225225" xlink:href="#linearGradient1535" y1="1.4656863" y2="0.29901960"/>
+  </defs>
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:cx="669.60291" inkscape:cy="380.12624" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="833" inkscape:window-width="1051" inkscape:window-x="111" inkscape:window-y="36" inkscape:zoom="0.61399264" pagecolor="#ffffff"/>
+  <g id="g1539">
+    <rect height="898.28973" id="rect1531" rx="50.000000" ry="40.000000" style="fill:#121212;fill-opacity:0.50196081;fill-rule:evenodd;stroke:#808080;stroke-width:15.000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:0.31045753;stroke-dasharray:none;" width="656.44250" x="51.824417" y="129.59982"/>
+    <rect height="898.28973" id="rect909" rx="50.000000" ry="40.000000" style="fill:#7f3600;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#e36d16;stroke-width:3.7500000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" width="656.44250" x="31.670473" y="99.368896"/>
+    <rect height="809.03625" id="rect1532" style="fill:#fafcff;fill-opacity:0.97712415;fill-rule:evenodd;stroke:#858585;stroke-width:0.62499976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" transform="matrix(0.999934,1.145165e-2,-1.145165e-2,0.999934,0.000000,0.000000)" width="603.17828" x="69.796196" y="157.05406"/>
+    <path d="M 249.04507,175.66595 L 486.57361,174.22638 C 487.72833,145.30590 444.28971,153.22852 434.74920,136.79764 C 427.01491,123.47747 436.29357,99.351250 434.74920,84.973232 C 433.29462,71.431067 428.02296,57.786786 416.75349,47.512244 C 411.11875,42.374973 403.98456,38.080137 395.07832,35.061718 C 386.17208,32.043298 375.49379,30.301295 362.77086,30.269690 C 350.05391,30.238100 339.23372,31.036597 331.00203,34.882841 C 275.80721,60.705859 324.33481,94.013355 348.68163,71.372927 C 370.12123,51.435959 396.61083,90.268207 374.84017,108.04643 C 352.85933,125.99630 327.99360,88.942793 348.01707,72.508772 C 369.00194,55.285694 358.69629,10.349421 310.44656,47.104859 C 298.87980,55.922128 295.40596,70.534420 293.67165,83.533665 C 291.71168,98.224299 301.18411,125.60675 293.67165,141.11634 C 286.30858,156.31752 250.38681,146.98863 249.04507,175.66595 z " id="path1534" sodipodi:nodetypes="ccssszzszzzsssc" style="fill:url(#linearGradient1538);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"/>
+  </g>
+</svg>

ADDED   icons/os/android.svg
Index: icons/os/android.svg
==================================================================
--- /dev/null
+++ icons/os/android.svg
@@ -0,0 +1,3 @@
+<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" version="1.1" width="@@WIDTH@@" height="@@HEIGHT@@" x="@@XPOS@@" y="@@YPOS@@" viewBox="0 0 512 512" xml:space="preserve">
+     <metadata id="metadata8"><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>Android Robot Logo</dc:title><dc:date>2013-09-22</dc:date><dc:creator><cc:Agent><dc:title>Google</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>Google</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>Eye Internet Limited</dc:title></cc:Agent></dc:publisher><dc:identifier>http://tekeye.biz/download/android_robot_logo.svg</dc:identifier><dc:source>http://developer.android.com/distribute/googleplay/promote/brand.html</dc:source><dc:relation>http://developer.android.com/downloads/brand/Android_Robot_outlined.ai</dc:relation><dc:language>en-GB</dc:language><dc:subject><rdf:Bag><rdf:li>Android</rdf:li><rdf:li>Robot</rdf:li><rdf:li>Logo</rdf:li><rdf:li>Google</rdf:li><rdf:li>Green</rdf:li><rdf:li>CC-BY</rdf:li></rdf:Bag></dc:subject><dc:description>The Google green (#A4C639) Android Robot logo, used in relation to the Android Operating System and content for that system.</dc:description><dc:contributor><cc:Agent><dc:title>The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</dc:title></cc:Agent></dc:contributor></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16"><path d="m 0,595.28 841.89,0 L 841.89,0 0,0 0,595.28 z" id="path18"/></clipPath></defs><g id="g12" transform="matrix(1.25,0,0,-1.25,-63.40886,520.84578)"><g id="g14" clip-path="url(#clipPath16)" transform="translate(-170.16078,-89.703667)">
+           <g id="g52" transform="translate(576.6416,339.6582)"><path style="fill:#a4c439;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path54" d="m 0,0 c -0.002,12.557 -10.18,22.734 -22.736,22.731 -12.555,0.01 -22.732,-10.185 -22.729,-22.743 l 0.016,-95.215 c -0.001,-12.57 10.172,-22.729 22.736,-22.733 12.555,0.002 22.727,10.163 22.73,22.743 L 0,0 z m -257.517,18.408 0.035,-147.555 c -0.011,-13.422 10.845,-24.255 24.26,-24.258 l 16.519,-0.007 0.019,-50.379 c -0.003,-12.541 10.193,-22.739 22.72,-22.739 12.564,0 22.742,10.206 22.745,22.755 l -0.012,50.369 30.696,0.006 0.013,-50.377 c -0.003,-12.536 10.199,-22.749 22.728,-22.729 12.563,-0.008 22.747,10.198 22.745,22.749 l -0.014,50.363 16.577,0.013 c 13.382,-0.005 24.268,10.844 24.271,24.266 L -54.24,18.442 -257.517,18.408 z m 148.233,45.029 c -4.735,-0.005 -8.589,3.834 -8.588,8.585 0.016,4.705 3.848,8.588 8.592,8.604 4.709,-0.013 8.572,-3.895 8.568,-8.609 0.011,-4.741 -3.839,-8.581 -8.572,-8.58 m -93.258,-0.017 c -4.716,0.011 -8.558,3.845 -8.559,8.581 0.002,4.718 3.835,8.597 8.567,8.596 4.749,0.004 8.59,-3.878 8.596,-8.594 0.002,-4.732 -3.848,-8.58 -8.604,-8.583 m 96.818,44.782 15.87,28.981 c 0.846,1.514 0.291,3.443 -1.245,4.298 -1.547,0.82 -3.46,0.263 -4.278,-1.262 l -16.029,-29.283 c -13.491,6.001 -28.582,9.37 -44.553,9.352 -15.929,0.013 -31.016,-3.341 -44.448,-9.309 l -16.046,29.207 c -0.836,1.541 -2.755,2.098 -4.27,1.259 -1.545,-0.831 -2.109,-2.763 -1.253,-4.274 l 15.877,-28.959 C -237.294,92.123 -258.37,61.488 -258.354,26.316 l 204.811,0.021 c 0.006,35.167 -21.032,65.738 -52.181,81.865 M -289.078,22.701 c -12.556,0.006 -22.732,-10.191 -22.735,-22.736 l 0.017,-95.213 c 0.003,-12.588 10.183,-22.745 22.74,-22.743 12.564,-0.001 22.742,10.162 22.729,22.742 l 0.002,95.227 c -0.005,12.542 -10.196,22.731 -22.753,22.723"/></g></g></g></svg>

Index: icons/status-icons.rvt
==================================================================
--- icons/status-icons.rvt
+++ icons/status-icons.rvt
@@ -1,8 +1,12 @@
 <?
 	proc iconfile {type name {checkUnknown true}} {
+		if {![regexp {^[a-z]*$} $name]} {
+			set name unknown
+		}
 		set file [file join [file dirname [info script]] $type "${name}.svg"]
+
 		if {![file exists $file]} {
 			if {$checkUnknown} {
 				tailcall iconfile $type unknown false
 			} else {
 				error "No icon available for type=$type name=$name"
@@ -24,10 +28,11 @@
 
 	proc textColorFromBackground {color} {
 		return "#fff"
 	}
 
+	set args(background_color) "#eee"
 	set args(action) [list "build"]
 	set args(status) [list "unknown"]
 	set args(os)     [list "unknown"]
 	set action_color_default "#555"
 	set status_color_default "#4c1"
@@ -40,11 +45,11 @@
 	set mapping([list status_color unknown]) #9932CC
 	set errList [list]
 
 	load_response args
 
-	foreach arg {action status status_color action_color os} {
+	foreach arg {action status status_color action_color background_color os} {
 		if {![info exists args($arg)]} {
 			continue
 		}
 
 		set args($arg) [lindex [set args($arg)] end]
@@ -62,11 +67,11 @@
 		if {![info exists args($arg)]} {
 			set args($arg) [set ${arg}_default]
 		}
 	}
 
-	set timestamp "Tue, 24 Oct 2017 00:00:00 GMT"
+	set timestamp "Tue, 26 Oct 2017 00:00:00 GMT"
 	set etag [binary encode base64 [list $timestamp $args(action) $args(status) $args(action_color) $args(status_color) $args(os)]]
 
 	set actionTextColor [textColorFromBackground $args(action_color)]
 	set statusTextColor [textColorFromBackground $args(status_color)]
 
@@ -80,17 +85,22 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="120" height="20">
 <linearGradient id="a" x2="0" y2="100%">
     <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
     <stop offset="1" stop-opacity=".1"/>
 </linearGradient>
-<rect rx="3" width="120" height="20" fill="<? puts -nonewline $args(action_color) ?>"/>
-<rect rx="3" x="65" width="55" height="20" fill="<? puts -nonewline $args(status_color) ?>"/>
-<rect rx="3" width="120" height="20" fill="url(#a)"/>
-<? catch {icon os $args(os)} ?>
+<rect rx="3" width="120" height="20" fill="<? puts -nonewline $args(background_color) ?>"/>
 <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+<? if {[info exists args(no_action_icon)] || [catch {icon action $args(action) 36}]} { ?>
+    <rect rx="3" width="120" height="20" fill="<? puts -nonewline $args(action_color) ?>"/>
     <text x="44" y="15" fill="#010101" fill-opacity=".3"><? puts -nonewline $args(action) ?></text>
     <text x="44" y="14" fill="<? puts -nonewline $actionTextColor ?>"><? puts -nonewline $args(action) ?></text>
+<? } ?>
+<? if {[info exists args(no_status_icon)] || [catch {icon status $args(status) 84}]} { ?>
+    <rect rx="3" x="65" width="55" height="20" fill="<? puts -nonewline $args(status_color) ?>"/>
     <text x="92" y="15" fill="#010101" fill-opacity=".3"><? puts -nonewline $args(status) ?></text>
     <text x="92" y="14" fill="<? puts -nonewline $statusTextColor ?>"><? puts -nonewline $args(status) ?></text>
+<? } ?>
+<rect rx="3" width="120" height="20" fill="url(#a)"/>
+<? catch {icon os $args(os)} ?>
 </g>
 <!-- <? #puts $errList ?> -->
 </svg>

ADDED   icons/status/fail.svg
Index: icons/status/fail.svg
==================================================================
--- /dev/null
+++ icons/status/fail.svg
@@ -0,0 +1,1 @@
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="@@WIDTH@@" height="@@HEIGHT@@" x="@@XPOS@@" y="@@YPOS@@" viewBox="0 0 47.5 47.5" style="enable-background:new 0 0 47.5 47.5;" xml:space="preserve"><defs id="defs6"/><g transform="matrix(1.25,0,0,-1.25,0,47.5)" id="g12"><g transform="translate(23,37)" id="g14"><path d="m 0,0 -4,-8.028 -5,5.018 0,-7.025 -10,2.007 8,-8.028 -11,-6.02 12,0 -6,-12.042 12,8.028 11,-10.035 -3,14.049 10,0 -8,6.02 8,9.032 L 2,-10.035 0,0 z" id="path16" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(23.9141,24.0762)" id="g18"><path d="m 0,0 1.86,0.467 5.226,1.311 -3.381,-3.816 -1.319,-1.49 1.59,-1.195 2.924,-2.202 -3.656,0 -2.261,0 0.473,-2.219 1.551,-7.259 -5.845,5.332 -1.057,0.964 -1.187,-0.795 -5.24,-3.506 2.405,4.828 1.323,2.655 -2.958,0 -3.799,0 3.76,2.059 2.145,1.172 -1.727,1.735 -3.044,3.053 3.221,-0.646 2.186,-0.439 0,2.238 0,1.991 1.45,-1.455 1.794,-1.8 1.133,2.277 1.273,2.556" id="path20" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(22.5117,22.6992)" id="g22"><path d="M 0,0 0.768,0.192 2.925,0.733 1.529,-0.842 0.984,-1.457 1.641,-1.95 l 1.208,-0.909 -1.51,0 -0.934,0 0.196,-0.916 0.64,-2.997 -2.413,2.201 -0.436,0.398 -0.491,-0.328 -2.163,-1.448 0.993,1.993 0.546,1.097 -1.22,0 -1.569,0 1.553,0.849 0.885,0.485 -0.713,0.716 -1.256,1.261 1.328,-0.267 0.903,-0.182 0,0.924 0,0.822 0.599,-0.6 0.74,-0.743 0.468,0.939 0.526,1.055" id="path24" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g></svg>

ADDED   icons/status/pass.svg
Index: icons/status/pass.svg
==================================================================
--- /dev/null
+++ icons/status/pass.svg
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="@@WIDTH@@" height="@@HEIGHT@@" x="@@XPOS@@" y="@@YPOS@@" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><circle cx="32" cy="32" r="30" fill="#4bd37b"/><path fill="#fff" d="m46 14l-21 21.6-7-7.2-7 7.2 14 14.4 28-28.8z"/></svg>