diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty.xml b/guacamole/src/main/webapp/layouts/en-us-qwerty.xml
index 9335a8c84..34ab1a522 100644
--- a/guacamole/src/main/webapp/layouts/en-us-qwerty.xml
+++ b/guacamole/src/main/webapp/layouts/en-us-qwerty.xml
@@ -18,7 +18,7 @@
along with this program. If not, see .
-->
-
+
Esc
@@ -27,12 +27,15 @@
F1
+
F2
+
F3
+
F4
@@ -40,12 +43,15 @@
F5
+
F6
+
F7
+
F8
@@ -53,12 +59,15 @@
F9
+
F10
+
F11
+
F12
@@ -72,288 +81,354 @@
`
~
+
1
!
+
2
@
+
3
#
+
4
$
+
5
%
+
6
^
+
7
&
+
8
*
+
9
(
+
0
)
+
-
_
+
=
+
+
Back
+ |
+
Tab
+
q
Q
Q
q
+
w
W
W
w
+
e
E
E
e
+
r
R
R
r
+
t
T
T
t
+
y
Y
Y
y
+
u
U
U
u
+
i
I
I
i
+
o
O
O
o
+
p
P
P
p
+
[
{
+
]
}
+
\
|
+
+ |
+
-
+
Caps
+
a
A
A
a
+
s
S
S
s
+
d
D
D
d
+
f
F
F
f
+
g
G
G
g
+
h
H
H
h
+
j
J
J
j
+
k
K
K
k
+
l
L
L
l
+
;
:
+
'
"
+
Enter
+
+ |
+
-
+
Shift
+
z
Z
Z
z
+
x
X
X
x
+
c
C
C
c
+
v
V
V
v
+
b
B
B
b
+
n
N
N
n
+
m
M
M
m
+
,
<
+
.
>
+
/
?
-
+
+
Shift
+
+ |
+
-
+
Ctrl
-
+
+
Super
-
+
+
Alt
-
+
+
-
+
+
Alt
-
+
+
Menu
-
+
+
Ctrl
@@ -368,20 +443,25 @@
Ins
+
Home
+
PgUp
+ |
Del
+
End
+
PgDn
@@ -394,13 +474,16 @@
↑
+ |
←
+
↓
+
→
diff --git a/guacamole/src/main/webapp/styles/keyboard.css b/guacamole/src/main/webapp/styles/keyboard.css
index e5b3c49cf..aff864a25 100644
--- a/guacamole/src/main/webapp/styles/keyboard.css
+++ b/guacamole/src/main/webapp/styles/keyboard.css
@@ -25,7 +25,7 @@
bottom: 0;
width: 100%;
margin: 0;
- padding: 0.5em;
+ padding: 0;
border-top: 1px solid black;
background: #222;
@@ -38,6 +38,7 @@
.guacamole-keyboard {
display: inline-block;
width: 100%;
+
margin: 0;
padding: 0;
cursor: default;
@@ -84,9 +85,14 @@
border-color: #DD4;
}
+.guacamole-keyboard .guacamole-keyboard-row {
+ line-height: 0;
+}
+
.guacamole-keyboard .guacamole-keyboard-column {
display: inline-block;
text-align: center;
+ vertical-align: top;
}
.guacamole-keyboard .guacamole-keyboard-gap {