diff --git a/guacamole/src/main/webapp/images/arrows/arrows-d.png b/guacamole/src/main/webapp/images/arrows/arrows-d.png
new file mode 100644
index 000000000..15b1a77b3
Binary files /dev/null and b/guacamole/src/main/webapp/images/arrows/arrows-d.png differ
diff --git a/guacamole/src/main/webapp/images/arrows/arrows-l.png b/guacamole/src/main/webapp/images/arrows/arrows-l.png
new file mode 100644
index 000000000..91f8150d3
Binary files /dev/null and b/guacamole/src/main/webapp/images/arrows/arrows-l.png differ
diff --git a/guacamole/src/main/webapp/images/arrows/arrows-r.png b/guacamole/src/main/webapp/images/arrows/arrows-r.png
new file mode 100644
index 000000000..3ab9d5b2b
Binary files /dev/null and b/guacamole/src/main/webapp/images/arrows/arrows-r.png differ
diff --git a/guacamole/src/main/webapp/images/arrows/arrows-u.png b/guacamole/src/main/webapp/images/arrows/arrows-u.png
new file mode 100644
index 000000000..057cccf95
Binary files /dev/null and b/guacamole/src/main/webapp/images/arrows/arrows-u.png differ
diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 433c88696..f6cd4a0e0 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -260,6 +260,15 @@ GuacUI.Client.PanOverlay = function() {
      */
     var pan_overlay = GuacUI.createElement("div", "pan-overlay");
 
+    /*
+     * Add arrows
+     */
+
+    GuacUI.createChildElement(pan_overlay, "div", "indicator up");
+    GuacUI.createChildElement(pan_overlay, "div", "indicator down");
+    GuacUI.createChildElement(pan_overlay, "div", "indicator right");
+    GuacUI.createChildElement(pan_overlay, "div", "indicator left");
+
     this.show = function() {
         document.body.appendChild(pan_overlay);
     };
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index 8fd835678..2cbfeb580 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -197,6 +197,59 @@ div.magnifier {
     top: 0;
     width: 100%;
     height: 100%;
+    z-index: 1;
+}
+
+.pan-overlay .indicator {
+    position: fixed;
+    background-size: 32px 32px;
+    background-position: center;
+    background-repeat: no-repeat;
+    opacity: 0.8;
+}
+
+.pan-overlay .indicator.up {
+
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 32px;
+
+    background-image: url('../images/arrows/arrows-u.png');
+    
+}
+
+.pan-overlay .indicator.down {
+
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 32px;
+
+    background-image: url('../images/arrows/arrows-d.png');
+    
+}
+
+.pan-overlay .indicator.left {
+
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 32px;
+
+    background-image: url('../images/arrows/arrows-l.png');
+    
+}
+
+.pan-overlay .indicator.right {
+
+    top: 0;
+    bottom: 0;
+    right: 0;
+    width: 32px;
+
+    background-image: url('../images/arrows/arrows-r.png');
+    
 }
 
 /* Viewport Clone */