diff --git a/resources/bitmaps/kbd_h_dark.png b/resources/bitmaps/kbd_h_dark.png
index 7de0b18e0..ba34dff2b 100644
Binary files a/resources/bitmaps/kbd_h_dark.png and b/resources/bitmaps/kbd_h_dark.png differ
diff --git a/resources/bitmaps/kbd_v_dark.png b/resources/bitmaps/kbd_v_dark.png
index b416242e2..3963f2e0a 100644
Binary files a/resources/bitmaps/kbd_v_dark.png and b/resources/bitmaps/kbd_v_dark.png differ
diff --git a/resources/bitmaps/keyboard/black_hover.png b/resources/bitmaps/keyboard/black_hover.png
index 2cc67f48e..978f72ab8 100644
Binary files a/resources/bitmaps/keyboard/black_hover.png and b/resources/bitmaps/keyboard/black_hover.png differ
diff --git a/resources/bitmaps/keyboard/black_normal.png b/resources/bitmaps/keyboard/black_normal.png
index 9b89fca34..759a8f541 100644
Binary files a/resources/bitmaps/keyboard/black_normal.png and b/resources/bitmaps/keyboard/black_normal.png differ
diff --git a/resources/bitmaps/keyboard/black_on_blue.png b/resources/bitmaps/keyboard/black_on_blue.png
index aa69f1ad4..5b47af0a2 100644
Binary files a/resources/bitmaps/keyboard/black_on_blue.png and b/resources/bitmaps/keyboard/black_on_blue.png differ
diff --git a/resources/bitmaps/keyboard/black_on_green.png b/resources/bitmaps/keyboard/black_on_green.png
index 4a4784a98..5c265e5a5 100644
Binary files a/resources/bitmaps/keyboard/black_on_green.png and b/resources/bitmaps/keyboard/black_on_green.png differ
diff --git a/resources/bitmaps/keyboard/black_on_orange.png b/resources/bitmaps/keyboard/black_on_orange.png
index b5bc9f2ba..20f5acee8 100644
Binary files a/resources/bitmaps/keyboard/black_on_orange.png and b/resources/bitmaps/keyboard/black_on_orange.png differ
diff --git a/resources/bitmaps/keyboard/black_on_red.png b/resources/bitmaps/keyboard/black_on_red.png
index 0751df031..60cdd35ef 100644
Binary files a/resources/bitmaps/keyboard/black_on_red.png and b/resources/bitmaps/keyboard/black_on_red.png differ
diff --git a/resources/bitmaps/keyboard/bright_sprite.png b/resources/bitmaps/keyboard/bright_sprite.png
new file mode 100644
index 000000000..f7dcf2dbc
Binary files /dev/null and b/resources/bitmaps/keyboard/bright_sprite.png differ
diff --git a/resources/bitmaps/keyboard/export.sh b/resources/bitmaps/keyboard/export.sh
index dc7c9b58a..bb64e569e 100755
--- a/resources/bitmaps/keyboard/export.sh
+++ b/resources/bitmaps/keyboard/export.sh
@@ -1,5 +1,8 @@
-# TODO: split flattable from non-flattable PNGs
+#! /bin/bash
+# Export several areas in keyboard.svg to optimized PNG.
+# Dependencies: Inkscape, pngcrush.
 
+# IDs of target area rectangles in keyboard.svg:
 IDs="
 white_bright_normal
 white_bright_hover
@@ -21,6 +24,20 @@ black_on_green
 black_on_blue
 "
 
+# Export images:
 for ID in $IDs; do
   inkscape keyboard.svg --export-id=$ID --export-png=$ID.png
 done
+
+# Optimize opaque images and remove their alpha channels.
+# pngcrush will not overwrite input files, so use a temp dir
+# and move/overwrite files afterwards.
+# pngcrush creates the dir given for -d, if necessary.
+pngcrush -c 2 -reduce -d crushed white_*.png
+
+# Optimze transparent images, keeping their alpha channels:
+pngcrush -c 6 -reduce -d crushed black_*.png
+
+# Cleanup:
+mv crushed/*.png .
+rmdir crushed
diff --git a/resources/bitmaps/keyboard/join.sh b/resources/bitmaps/keyboard/join.sh
new file mode 100755
index 000000000..e50f68724
--- /dev/null
+++ b/resources/bitmaps/keyboard/join.sh
@@ -0,0 +1,19 @@
+#! /bin/bash
+# Join images vertically, to create a sprite sheat.
+# Dependencies: Imagemagick (convert)
+
+convert white_bright_normal.png \
+        white_bright_hover.png \
+        white_bright_on_red.png \
+        black_normal.png \
+        black_hover.png \
+        black_on_red.png \
+        -append bright_sprite.png
+
+# convert white_dark_normal.png \
+#         white_dark_hover.png \
+#         white_dark_on_red.png \
+#         black_normal.png \
+#         black_hover.png \
+#         black_on_red.png \
+#         -append dark_sprite.png
diff --git a/resources/bitmaps/keyboard/keyboard.svg b/resources/bitmaps/keyboard/keyboard.svg
index 73bc1f3fd..16aa3b73a 100644
--- a/resources/bitmaps/keyboard/keyboard.svg
+++ b/resources/bitmaps/keyboard/keyboard.svg
@@ -14700,116 +14700,6 @@
        y1="735.375"
        x2="16.25"
        y2="731.375" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17321"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17325"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17327"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17329"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17331"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17333"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17337"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient17339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7343"
@@ -14865,61 +14755,6 @@
        fx="147.00002"
        fy="922.70721"
        r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7343"
-       id="radialGradient17351"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7343"
-       id="radialGradient17353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7343"
-       id="radialGradient17355"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7343"
-       id="radialGradient17357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7343"
-       id="radialGradient17359"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient11509"
@@ -15217,127 +15052,6 @@
        fx="147.00002"
        fy="922.70721"
        r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7338"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7360"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7362"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7364"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
     <filter
        inkscape:collect="always"
        id="filter7393"
@@ -15403,61 +15117,6 @@
        fx="147.00002"
        fy="922.70721"
        r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7511"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7513"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7515"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8108"
-       id="radialGradient7517"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3571429,0,0,3.4285669,-52.500019,-2238.2013)"
-       cx="147.00002"
-       cy="922.70721"
-       fx="147.00002"
-       fy="922.70721"
-       r="7" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4221"
@@ -15830,10 +15489,10 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="234.49595"
-     inkscape:cy="339.17654"
+     inkscape:cx="661.14113"
+     inkscape:cy="183.89807"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer7"
      showgrid="false"
      borderlayer="false"
      inkscape:showpageshadow="false"
@@ -15888,7 +15547,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -29078,7 +28737,7 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="construction"
-     style="display:inline"
+     style="display:none"
      transform="translate(144,1259.9872)">
     <rect
        y="-1313"
@@ -29114,9 +28773,9 @@
        height="7"
        width="7"
        id="rect4268"
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
-       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4270"
        width="7"
        height="7"
@@ -29130,7 +28789,7 @@
        id="rect4272"
        style="fill:#a1afe0;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4274"
        width="7"
        height="7"
@@ -29142,7 +28801,7 @@
        height="7"
        width="7"
        id="rect4276"
-       style="fill:#4e68c4;fill-opacity:1;stroke:none;enable-background:new" />
+       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
        y="-1313"
        x="24"
@@ -29151,14 +28810,14 @@
        id="rect4278"
        style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
-       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4280"
        width="7"
        height="7"
        x="31"
        y="-1313" />
     <rect
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4282"
        width="7"
        height="7"
@@ -29242,7 +28901,7 @@
        x="17"
        y="-1293" />
     <rect
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4306"
        width="14"
        height="7"
@@ -29254,7 +28913,7 @@
        height="7"
        width="14"
        id="rect4308"
-       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
+       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
        style="fill:#a1afe0;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4310"
@@ -29268,16 +28927,16 @@
        height="7"
        width="14"
        id="rect4312"
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
-       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4314"
        width="14"
        height="7"
        x="73"
        y="-1293" />
     <rect
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new"
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new"
        id="rect4316"
        width="14"
        height="7"
@@ -29289,14 +28948,14 @@
        height="7"
        width="14"
        id="rect4318"
-       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
+       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
        y="-1293"
        x="115"
        height="7"
        width="14"
        id="rect4320"
-       style="fill:#4a8a0e;fill-opacity:1;stroke:none;enable-background:new" />
+       style="fill:#b0c714;fill-opacity:1;stroke:none;enable-background:new" />
     <rect
        y="-1286"
        x="-39"
diff --git a/resources/bitmaps/keyboard/white_bright_hover.png b/resources/bitmaps/keyboard/white_bright_hover.png
index 73514b8dd..be4b77d4f 100644
Binary files a/resources/bitmaps/keyboard/white_bright_hover.png and b/resources/bitmaps/keyboard/white_bright_hover.png differ
diff --git a/resources/bitmaps/keyboard/white_bright_normal.png b/resources/bitmaps/keyboard/white_bright_normal.png
index b27797e1b..eec5019d6 100644
Binary files a/resources/bitmaps/keyboard/white_bright_normal.png and b/resources/bitmaps/keyboard/white_bright_normal.png differ
diff --git a/resources/bitmaps/keyboard/white_bright_on_blue.png b/resources/bitmaps/keyboard/white_bright_on_blue.png
index 7d65a5291..5c3c02c5f 100644
Binary files a/resources/bitmaps/keyboard/white_bright_on_blue.png and b/resources/bitmaps/keyboard/white_bright_on_blue.png differ
diff --git a/resources/bitmaps/keyboard/white_bright_on_green.png b/resources/bitmaps/keyboard/white_bright_on_green.png
index 17cf0d0e5..6d049d3c7 100644
Binary files a/resources/bitmaps/keyboard/white_bright_on_green.png and b/resources/bitmaps/keyboard/white_bright_on_green.png differ
diff --git a/resources/bitmaps/keyboard/white_bright_on_orange.png b/resources/bitmaps/keyboard/white_bright_on_orange.png
index 1fe6b93f6..66b400437 100644
Binary files a/resources/bitmaps/keyboard/white_bright_on_orange.png and b/resources/bitmaps/keyboard/white_bright_on_orange.png differ
diff --git a/resources/bitmaps/keyboard/white_bright_on_red.png b/resources/bitmaps/keyboard/white_bright_on_red.png
index 94ea2bd89..8dd4e7a71 100644
Binary files a/resources/bitmaps/keyboard/white_bright_on_red.png and b/resources/bitmaps/keyboard/white_bright_on_red.png differ
diff --git a/resources/bitmaps/keyboard/white_dark_hover.png b/resources/bitmaps/keyboard/white_dark_hover.png
index 55ff459df..ed9e47dbd 100644
Binary files a/resources/bitmaps/keyboard/white_dark_hover.png and b/resources/bitmaps/keyboard/white_dark_hover.png differ
diff --git a/resources/bitmaps/keyboard/white_dark_normal.png b/resources/bitmaps/keyboard/white_dark_normal.png
index 5c33b1a49..503c2b1d7 100644
Binary files a/resources/bitmaps/keyboard/white_dark_normal.png and b/resources/bitmaps/keyboard/white_dark_normal.png differ
diff --git a/resources/bitmaps/keyboard/white_dark_on_blue.png b/resources/bitmaps/keyboard/white_dark_on_blue.png
index 1fc12ad88..e127eab64 100644
Binary files a/resources/bitmaps/keyboard/white_dark_on_blue.png and b/resources/bitmaps/keyboard/white_dark_on_blue.png differ
diff --git a/resources/bitmaps/keyboard/white_dark_on_green.png b/resources/bitmaps/keyboard/white_dark_on_green.png
index 8f17ab5a2..19b848742 100644
Binary files a/resources/bitmaps/keyboard/white_dark_on_green.png and b/resources/bitmaps/keyboard/white_dark_on_green.png differ
diff --git a/resources/bitmaps/keyboard/white_dark_on_orange.png b/resources/bitmaps/keyboard/white_dark_on_orange.png
index 6c7198535..00350f15e 100644
Binary files a/resources/bitmaps/keyboard/white_dark_on_orange.png and b/resources/bitmaps/keyboard/white_dark_on_orange.png differ
diff --git a/resources/bitmaps/keyboard/white_dark_on_red.png b/resources/bitmaps/keyboard/white_dark_on_red.png
index 9876fc25d..34d9b5059 100644
Binary files a/resources/bitmaps/keyboard/white_dark_on_red.png and b/resources/bitmaps/keyboard/white_dark_on_red.png differ