diff --git a/qgcresources.qrc b/qgcresources.qrc
index 9cd9d8e411b15641b380bd8cdb70d76e2fe29f08..7d47bf524be0809f231f1cbb0349ed98b526c9aa 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -101,16 +101,18 @@
     </qresource>
 
     <qresource prefix="/res">
-        <file alias="Play">resources/Play.svg</file>
-        <file alias="Pause">resources/Pause.svg</file>
-        <file alias="Stop">resources/Stop.svg</file>
-        <file alias="AntennaT">resources/Antenna_T.svg</file>
         <file alias="AntennaRC">resources/Antenna_RC.svg</file>
-        <file alias="SplashScreen">resources/SplashScreen.png</file>
-        <file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
-        <file alias="PowerButton">resources/PowerButton.svg</file>
+        <file alias="AntennaT">resources/Antenna_T.svg</file>
         <file alias="buttonLeft.svg">resources/buttonLeft.svg</file>
         <file alias="buttonRight.svg">resources/buttonRight.svg</file>
+        <file alias="JoystickBezel.png">resources/JoystickBezel.png</file>
+        <file alias="JoystickBezelLight.png">resources/JoystickBezelLight.png</file>
+        <file alias="Pause">resources/Pause.svg</file>
+        <file alias="Play">resources/Play.svg</file>
+        <file alias="PowerButton">resources/PowerButton.svg</file>
+        <file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
+        <file alias="SplashScreen">resources/SplashScreen.png</file>
+        <file alias="Stop">resources/Stop.svg</file>
         <file alias="XDelete.svg">resources/XDelete.svg</file>
         <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
     </qresource>
diff --git a/resources/JoystickBezel.png b/resources/JoystickBezel.png
new file mode 100644
index 0000000000000000000000000000000000000000..45a775cb633dc71e59528516daa329e7383715cd
Binary files /dev/null and b/resources/JoystickBezel.png differ
diff --git a/resources/JoystickBezelLight.png b/resources/JoystickBezelLight.png
new file mode 100644
index 0000000000000000000000000000000000000000..c22d1d6c25a5d1bbb39576ecff319dbff03623d6
Binary files /dev/null and b/resources/JoystickBezelLight.png differ
diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml
index e20bf7cef782f46b2c3696888a1caa17b91ba4b1..eaa61220db3b15ddbba1ff784ffcbf9da4c3aca7 100644
--- a/src/QmlControls/JoystickThumbPad.qml
+++ b/src/QmlControls/JoystickThumbPad.qml
@@ -4,12 +4,8 @@ import QtQuick.Controls         1.2
 import QGroundControl.Palette       1.0
 import QGroundControl.ScreenTools   1.0
 
-Rectangle {
+Item {
     id:             _joyRoot
-    radius:         width / 2
-    border.color:   mapPal.thumbJoystick
-    border.width:   ScreenTools.defaultFontPixelWidth * 0.25
-    color:          "transparent"
 
     property alias  lightColors:            mapPal.lightColors  /// true: use light colors from QGCMapPalette for drawing
     property var    stickPosition:          Qt.point(0, 0)
@@ -47,9 +43,11 @@ Rectangle {
         stickPosition = Qt.point(width / 2, width / 2)
     }
 
-    Column {
-        QGCLabel { text: xAxis }
-        QGCLabel { text: yAxis }
+    Image {
+        anchors.fill:       parent
+        source:             lightColors ? "/res/JoystickBezel.png" : "/res/JoystickBezelLight.png"
+        mipmap:             true
+        smooth:             true
     }
 
     Rectangle {