diff --git a/clients/riscos/Button.cpp b/clients/riscos/Button.cpp
index fe0a5094ad..852215ba0d 100644
--- a/clients/riscos/Button.cpp
+++ b/clients/riscos/Button.cpp
@@ -127,6 +127,11 @@ Button::setPixmap(const QPixmap & p)
     aPixmap_.convertFromImage(aTx);
     iPixmap_.convertFromImage(iTx);
 
+    if (0 != p.mask())
+    {
+      aPixmap_.setMask(*p.mask());
+      iPixmap_.setMask(*p.mask());
+    }
   }
 
   repaint();
diff --git a/clients/riscos/Static.cpp b/clients/riscos/Static.cpp
index 56d16a7721..4b2d89b36f 100644
--- a/clients/riscos/Static.cpp
+++ b/clients/riscos/Static.cpp
@@ -198,8 +198,9 @@ Static::_createTexture(QPixmap & px, int t, bool active)
 
   QColor c(options->color(Options::ColorType(t), active));
 
-  QRgb light(c.light(110).rgb());
-  QRgb dark (c.dark(110).rgb());
+  QRgb mid    (c.rgb());
+  QRgb light  (c.light(110).rgb());
+  QRgb dark   (c.dark(110).rgb());
 
   QRgb * data(reinterpret_cast<QRgb *>(texture.bits()));
 
@@ -208,6 +209,8 @@ Static::_createTexture(QPixmap & px, int t, bool active)
       data[x] = light;
     else if (data[x] == b)
       data[x] = dark;
+    else
+      data[x] = mid;
 
   px.convertFromImage(texture);
 }