diff --git a/images/icons/kbd__modifier--command.svg b/images/icons/kbd__modifier--command.svg
new file mode 100644
index 00000000..b6793eff
--- /dev/null
+++ b/images/icons/kbd__modifier--command.svg
@@ -0,0 +1,63 @@
+<?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"
+   viewBox="0 0 16 16"
+   id="svg7075"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="kbd__modifier--command.svg">
+  <defs
+     id="defs7077" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="57.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1144"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7080">
+    <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.3621)">
+    <path
+       id="path5460-44-93-16-94-8-2-4"
+       style="overflow:visible;fill:#000000;fill-opacity:1;stroke:none"
+       d="m 13.419375,1041.164 c 0.34711,-0.1626 0.56353,-0.342 0.74376,-0.6165 0.20477,-0.3119 0.29604,-0.6064 0.29604,-0.9551 0,-1.2469 -1.28326,-2.0506 -2.43348,-1.524 -0.29802,0.1365 -0.66829,0.509 -0.81339,0.8183 -0.11229,0.2397 -0.11485,0.2652 -0.12839,1.3354 l -0.0151,1.091 1.04643,-0.015 c 1.034,-0.015 1.04944,-0.016 1.30283,-0.1345 z m -8.45226,-0.6598 c -10e-4,-1.2997 -0.0924,-1.6598 -0.52851,-2.0961 -1.0702,-1.0702 -2.898,-0.3232 -2.898,1.1843 0,0.7796 0.55653,1.4892 1.30657,1.6659 0.091,0.022 0.60541,0.041 1.14313,0.043 l 0.97768,0.01 -8.1e-4,-0.8019 z m 4.57072,3.8558 0,-1.516 -1.53795,0 -1.53791,0 0,1.516 0,1.5159 1.53791,0 1.53795,0 0,-1.5159 z m 3.51703,6.437 c 0.55636,-0.1056 1.00408,-0.4527 1.24626,-0.9662 0.46134,-0.9784 -0.12538,-2.1405 -1.19527,-2.3675 -0.12914,-0.027 -0.63422,-0.049 -1.13425,-0.049 l -0.90142,0 0.0151,1.0875 c 0.012,1.0664 0.0163,1.0923 0.12839,1.3318 0.21759,0.464 0.72782,0.8615 1.23333,0.961 0.26732,0.053 0.34447,0.053 0.60922,0 z m -9.53516,0 c 0.35899,-0.068 0.66167,-0.2279 0.9189,-0.4851 0.43629,-0.4363 0.52708,-0.7965 0.52851,-2.0961 l 8e-4,-0.8019 -0.93548,0 c -1.22304,0 -1.54161,0.078 -1.95388,0.478 -0.38944,0.3779 -0.55601,0.7907 -0.53087,1.3155 0.0369,0.7722 0.60928,1.4385 1.36277,1.5868 0.26728,0.053 0.34445,0.053 0.60918,0 z m -0.7927,1.5384 c -0.71733,-0.1156 -1.23145,-0.3871 -1.78403,-0.942 -0.33445,-0.3359 -0.43352,-0.4698 -0.60516,-0.8175 -0.11304,-0.2286 -0.23414,-0.5541 -0.2694,-0.7233 -0.0825,-0.3942 -0.0822,-1.0576 1.7e-4,-1.4462 0.18328,-0.8652 0.88887,-1.7643 1.70989,-2.1788 0.59323,-0.2995 0.69872,-0.3173 2.01411,-0.3399 l 1.1754,-0.02 0,-1.5117 0,-1.5118 -1.02874,0 c -1.25764,0 -1.54614,-0.045 -2.13498,-0.3357 -0.35675,-0.1759 -0.47839,-0.267 -0.83673,-0.6271 -0.35274,-0.3545 -0.45231,-0.4875 -0.6275,-0.8388 -0.24633,-0.4938 -0.33582,-0.8802 -0.33582,-1.45 0,-0.5711 0.0894,-0.9563 0.33654,-1.45 0.36041,-0.7201 1.1064,-1.3768 1.84164,-1.6212 0.41748,-0.1388 0.98782,-0.1933 1.43732,-0.1374 0.82467,0.1023 1.30625,0.3438 1.9213,0.963 0.34196,0.3443 0.45302,0.4909 0.6027,0.7956 0.28645,0.5832 0.31688,0.7798 0.3176,2.0542 l 8.1e-4,1.1095 1.53793,0 1.53793,0 0,-1.1134 c 0,-0.967 0.0105,-1.1584 0.0873,-1.4546 0.1418,-0.5544 0.35727,-0.9084 0.85747,-1.4086 0.71211,-0.7121 1.29113,-0.9538 2.28493,-0.9538 0.981,0 1.57122,0.2426 2.26682,0.9318 0.36117,0.3579 0.4507,0.477 0.62714,0.8349 0.24469,0.4963 0.33414,0.8845 0.33414,1.4501 0,0.5654 -0.0894,0.9538 -0.33393,1.4491 -0.1743,0.353 -0.26984,0.481 -0.62714,0.84 -0.36201,0.3637 -0.48045,0.4523 -0.83897,0.628 -0.58725,0.2878 -0.88203,0.3344 -2.11301,0.3344 l -1.00676,0 0,1.5117 0,1.5117 1.15343,0.02 c 1.29539,0.023 1.3967,0.04 2.01028,0.3474 0.30217,0.1512 0.45362,0.267 0.79281,0.6059 0.35418,0.354 0.45156,0.4838 0.62749,0.8365 0.24631,0.4938 0.3358,0.8802 0.3358,1.45 0,0.5655 -0.0894,0.9538 -0.33414,1.4501 -0.17593,0.3569 -0.26692,0.4782 -0.62714,0.8364 -0.34161,0.3398 -0.49198,0.4541 -0.79482,0.6043 -0.54025,0.2681 -0.84049,0.3346 -1.49397,0.3313 -0.44852,-0 -0.61384,-0.022 -0.90133,-0.1087 -1.06355,-0.3203 -1.95553,-1.2283 -2.2191,-2.2588 -0.0758,-0.2963 -0.0873,-0.4877 -0.0873,-1.4546 l 0,-1.1135 -1.53793,0 -1.53793,0 0,1.1135 c 0,0.9669 -0.0105,1.1583 -0.0872,1.4546 -0.2635,1.0302 -1.1672,1.9501 -2.21354,2.2532 -0.39277,0.1138 -1.06068,0.1604 -1.43418,0.1002 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/images/icons/kbd__modifier--option.svg b/images/icons/kbd__modifier--option.svg
new file mode 100644
index 00000000..38492c4e
--- /dev/null
+++ b/images/icons/kbd__modifier--option.svg
@@ -0,0 +1,63 @@
+<?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"
+   viewBox="0 0 16 16"
+   id="svg6493"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="kbd__modifier--option.svg">
+  <defs
+     id="defs6495" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="57.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1144"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6498">
+    <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
+       id="path5453-7-89-9-4-8-5-4"
+       style="overflow:visible;fill:#000000;fill-opacity:1;stroke:none"
+       d="m 9.479996,1038.1222 0,-0.7 3.260015,0 3.259989,0 0,0.7 0,0.7 -3.259989,0 -3.260015,0 0,-0.7 z m -2.0399867,6.94 -3.1200384,-6.24 -2.1599855,0 -2.1599854,0 0,-0.7 0,-0.7 2.7199826,0 2.7199566,0 3.1200778,6.24 3.120051,6.2401 2.159986,0 2.159946,0 0,0.7 0,0.7 -2.71997,0 -2.719969,0 -3.1200517,-6.2401 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/images/icons/kbd__modifier--shift.svg b/images/icons/kbd__modifier--shift.svg
new file mode 100644
index 00000000..cb673fea
--- /dev/null
+++ b/images/icons/kbd__modifier--shift.svg
@@ -0,0 +1,63 @@
+<?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"
+   viewBox="0 0 16 16"
+   id="svg5911"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="kbd__modifier--shift.svg">
+  <defs
+     id="defs5913" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="57.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1144"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5916">
+    <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
+       style="overflow:visible;fill:#000000;fill-opacity:1;stroke:none"
+       d="m 3.9799,1048.3923 0,-3.5377 -1.98992,0 c -1.0945,0 -1.98998,-0.014 -1.98998,-0.03 0,-0.017 1.8,-1.8302 4.00001,-4.0301 L 8,1036.7944 l 4,3.9999 c 2.20002,2.1999 4,4.0134 4,4.0301 0,0.017 -0.89547,0.03 -1.98993,0.03 l -1.98995,0 0,3.5377 0,3.5377 -4.02012,0 -4.0201,0 0,-3.5377 z m 6.87437,-1.1257 0,-3.4975 1.21607,0 1.21603,0 -2.64315,-2.6431 -2.64313,-2.6431 -2.63337,2.6331 -2.63339,2.6331 1.21627,0.02 1.21626,0.02 0.01,3.4874 0.0114,3.4875 2.83392,0 2.83397,0 0,-3.4975 z"
+       id="path4622-94-6-0-63-3-9-2"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/images/icons/kbd__modifiers--windows.svg b/images/icons/kbd__modifiers--windows.svg
new file mode 100755
index 00000000..9d8ea5ca
--- /dev/null
+++ b/images/icons/kbd__modifiers--windows.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#000000" d="M0.005 8l-0.005-4.876 6-0.815v5.691zM7 2.164l7.998-1.164v7h-7.998zM15 9l-0.002 7-7.998-1.125v-5.875zM6 14.747l-5.995-0.822-0-4.926h5.995z"></path>
+</svg>