diff --git a/files/images/px4/calibration/3dr_gps/gps_01.png b/files/images/px4/calibration/3dr_gps/gps_01.png
new file mode 100644
index 0000000..483c45c
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_01.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_02.png b/files/images/px4/calibration/3dr_gps/gps_02.png
new file mode 100644
index 0000000..2bb8670
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_02.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_03.png b/files/images/px4/calibration/3dr_gps/gps_03.png
new file mode 100644
index 0000000..3a9f51c
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_03.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_04.png b/files/images/px4/calibration/3dr_gps/gps_04.png
new file mode 100644
index 0000000..2e945c1
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_04.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_05.png b/files/images/px4/calibration/3dr_gps/gps_05.png
new file mode 100644
index 0000000..92f2e2f
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_05.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_06.png b/files/images/px4/calibration/3dr_gps/gps_06.png
new file mode 100644
index 0000000..f4c9099
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_06.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_07.png b/files/images/px4/calibration/3dr_gps/gps_07.png
new file mode 100644
index 0000000..021fcd4
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_07.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_12.png b/files/images/px4/calibration/3dr_gps/gps_12.png
new file mode 100644
index 0000000..3ec1a7a
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_12.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_13.png b/files/images/px4/calibration/3dr_gps/gps_13.png
new file mode 100644
index 0000000..6374b96
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_13.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_14.png b/files/images/px4/calibration/3dr_gps/gps_14.png
new file mode 100644
index 0000000..3cd8139
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_14.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_15.png b/files/images/px4/calibration/3dr_gps/gps_15.png
new file mode 100644
index 0000000..bf8d0f4
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_15.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_16.png b/files/images/px4/calibration/3dr_gps/gps_16.png
new file mode 100644
index 0000000..3581f85
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_16.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_17.png b/files/images/px4/calibration/3dr_gps/gps_17.png
new file mode 100644
index 0000000..6d9418a
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_17.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_18.png b/files/images/px4/calibration/3dr_gps/gps_18.png
new file mode 100644
index 0000000..b04e9f1
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_18.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_19.png b/files/images/px4/calibration/3dr_gps/gps_19.png
new file mode 100644
index 0000000..0e19c22
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_19.png differ
diff --git a/files/images/px4/calibration/3dr_gps/gps_24.png b/files/images/px4/calibration/3dr_gps/gps_24.png
new file mode 100644
index 0000000..215b0b4
Binary files /dev/null and b/files/images/px4/calibration/3dr_gps/gps_24.png differ
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index d9bd57f..8be41b4 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -182,6 +182,22 @@
         <file>files/images/px4/menu/cogwheels.png</file>
         <file>files/images/px4/rc/cessna_back.png</file>
         <file>files/images/px4/rc/cessna_side.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_15.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_14.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_13.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_12.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_19.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_18.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_17.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_16.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_07.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_06.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_05.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_04.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_03.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_02.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_01.png</file>
+        <file>files/images/px4/calibration/3dr_gps/gps_24.png</file>
     </qresource>
     <qresource prefix="/general">
         <file alias="vera.ttf">files/styles/Vera.ttf</file>
diff --git a/src/ui/px4_configuration/QGCPX4SensorCalibration.cc b/src/ui/px4_configuration/QGCPX4SensorCalibration.cc
index e9c1fb7..e5eb350 100644
--- a/src/ui/px4_configuration/QGCPX4SensorCalibration.cc
+++ b/src/ui/px4_configuration/QGCPX4SensorCalibration.cc
@@ -226,12 +226,12 @@ void QGCPX4SensorCalibration::setInstructionImage(const QString &path)
 
 void QGCPX4SensorCalibration::setAutopilotImage(int index)
 {
-    setAutopilotImage(QString(":/files/images/px4/calibration/pixhawk_%1.png").arg(index));
+    setAutopilotImage(QString(":/files/images/px4/calibration/pixhawk_%1.png").arg(index, 2, 10, QChar('0')));
 }
 
 void QGCPX4SensorCalibration::setGpsImage(int index)
 {
-    setGpsImage(QString(":/files/images/px4/calibration/gps_%1.png").arg(index));
+    setGpsImage(QString(":/files/images/px4/calibration/3dr_gps/gps_%1.png").arg(index, 2, 10, QChar('0')));
 }
 
 void QGCPX4SensorCalibration::setAutopilotOrientation(int index)