diff --git a/guacamole/src/main/webapp/app/osk/styles/osk.css b/guacamole/src/main/webapp/app/osk/styles/osk.css
index a63b5f658..f61ac6f9d 100644
--- a/guacamole/src/main/webapp/app/osk/styles/osk.css
+++ b/guacamole/src/main/webapp/app/osk/styles/osk.css
@@ -73,26 +73,26 @@
     border-color: #666;
 }
 
-.guac-keyboard.guac-keyboard-modifier-shift .guac-keyboard-key.shift,
-.guac-keyboard.guac-keyboard-modifier-numsym .guac-keyboard-key.numsym {
+/* Active shift */
+.guac-keyboard.guac-keyboard-modifier-shift .guac-keyboard-key-rshift,
+.guac-keyboard.guac-keyboard-modifier-shift .guac-keyboard-key-lshift,
+
+/* Active ctrl */
+.guac-keyboard.guac-keyboard-modifier-control .guac-keyboard-key-rctrl,
+.guac-keyboard.guac-keyboard-modifier-control .guac-keyboard-key-lctrl,
+
+/* Active alt */
+.guac-keyboard.guac-keyboard-modifier-alt .guac-keyboard-key-ralt,
+.guac-keyboard.guac-keyboard-modifier-alt .guac-keyboard-key-lalt,
+
+/* Active caps */
+.guac-keyboard.guac-keyboard-modifier-caps .guac-keyboard-key-caps {
     background: #882;
     border-color: #DD4;
 }
 
-.guac-keyboard.guac-keyboard-modifier-control .guac-keyboard-key.control,
-.guac-keyboard.guac-keyboard-modifier-numsym .guac-keyboard-key.numsym {
-    background: #882;
-    border-color: #DD4;
-}
-
-.guac-keyboard.guac-keyboard-modifier-alt .guac-keyboard-key.alt,
-.guac-keyboard.guac-keyboard-modifier-numsym .guac-keyboard-key.numsym {
-    background: #882;
-    border-color: #DD4;
-}
-
-.guac-keyboard.guac-keyboard-modifier-super .guac-keyboard-key.super,
-.guac-keyboard.guac-keyboard-modifier-numsym .guac-keyboard-key.numsym {
+.guac-keyboard.guac-keyboard-modifier-super .guac-keyboard-key-super,
+.guac-keyboard.guac-keyboard-modifier-super .guac-keyboard-key-menu {
     background: #882;
     border-color: #DD4;
 }
@@ -159,9 +159,6 @@
 .guac-keyboard:not(.guac-keyboard-modifier-caps)
 .guac-keyboard-cap.guac-keyboard-requires-caps,
 
-.guac-keyboard:not(.guac-keyboard-modifier-numsym)
-.guac-keyboard-cap.guac-keyboard-requires-numsym,
-
 .guac-keyboard:not(.guac-keyboard-modifier-shift)
 .guac-keyboard-cap.guac-keyboard-requires-shift,
 
@@ -171,10 +168,6 @@
 .guac-keyboard-key.guac-keyboard-uses-shift
 .guac-keyboard-cap:not(.guac-keyboard-requires-shift),
 
-.guac-keyboard.guac-keyboard-modifier-numsym
-.guac-keyboard-key.guac-keyboard-uses-numsym
-.guac-keyboard-cap:not(.guac-keyboard-requires-numsym),
-
 .guac-keyboard.guac-keyboard-modifier-caps
 .guac-keyboard-key.guac-keyboard-uses-caps
 .guac-keyboard-cap:not(.guac-keyboard-requires-caps) {