diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc
index cbc31171f00faf5bd4a200efc2f884b0340285c1..f889f9959e0ec26a6b55c8ec4454511b8e71821f 100644
--- a/src/Settings/AppSettings.cc
+++ b/src/Settings/AppSettings.cc
@@ -27,12 +27,13 @@ const char* AppSettings::kmlFileExtension =         "kml";
 const char* AppSettings::shpFileExtension =         "shp";
 const char* AppSettings::logFileExtension =         "ulg";
 
-const char* AppSettings::parameterDirectory =       "Parameters";
-const char* AppSettings::telemetryDirectory =       "Telemetry";
-const char* AppSettings::missionDirectory =         "Missions";
-const char* AppSettings::logDirectory =             "Logs";
-const char* AppSettings::videoDirectory =           "Video";
-const char* AppSettings::crashDirectory =           "CrashLogs";
+const char* AppSettings::parameterDirectory =       QT_TRANSLATE_NOOP("AppSettings", "Parameters");
+const char* AppSettings::telemetryDirectory =       QT_TRANSLATE_NOOP("AppSettings", "Telemetry");
+const char* AppSettings::missionDirectory =         QT_TRANSLATE_NOOP("AppSettings", "Missions");
+const char* AppSettings::logDirectory =             QT_TRANSLATE_NOOP("AppSettings", "Logs");
+const char* AppSettings::videoDirectory =           QT_TRANSLATE_NOOP("AppSettings", "Video");
+const char* AppSettings::photoDirectory =           QT_TRANSLATE_NOOP("AppSettings", "Photo");
+const char* AppSettings::crashDirectory =           QT_TRANSLATE_NOOP("AppSettings", "CrashLogs");
 
 DECLARE_SETTINGGROUP(App, "")
 {
@@ -160,6 +161,7 @@ void AppSettings::_checkSavePathDirectories(void)
         savePathDir.mkdir(missionDirectory);
         savePathDir.mkdir(logDirectory);
         savePathDir.mkdir(videoDirectory);
+        savePathDir.mkdir(photoDirectory);
         savePathDir.mkdir(crashDirectory);
     }
 }
@@ -219,6 +221,16 @@ QString AppSettings::videoSavePath(void)
     return QString();
 }
 
+QString AppSettings::photoSavePath(void)
+{
+    QString path = savePath()->rawValue().toString();
+    if (!path.isEmpty() && QDir(path).exists()) {
+        QDir dir(path);
+        return dir.filePath(photoDirectory);
+    }
+    return QString();
+}
+
 QString AppSettings::crashSavePath(void)
 {
     QString path = savePath()->rawValue().toString();
diff --git a/src/Settings/AppSettings.h b/src/Settings/AppSettings.h
index 3c480a8a230c9eda1de6689dd859db60f30c39c5..20a676d87edbf1c33fb96520870ea6e4cadbeadf 100644
--- a/src/Settings/AppSettings.h
+++ b/src/Settings/AppSettings.h
@@ -71,6 +71,7 @@ public:
     Q_PROPERTY(QString telemetrySavePath    READ telemetrySavePath  NOTIFY savePathsChanged)
     Q_PROPERTY(QString logSavePath          READ logSavePath        NOTIFY savePathsChanged)
     Q_PROPERTY(QString videoSavePath        READ videoSavePath      NOTIFY savePathsChanged)
+    Q_PROPERTY(QString photoSavePath        READ photoSavePath      NOTIFY savePathsChanged)
     Q_PROPERTY(QString crashSavePath        READ crashSavePath      NOTIFY savePathsChanged)
 
     Q_PROPERTY(QString planFileExtension        MEMBER planFileExtension        CONSTANT)
@@ -87,6 +88,7 @@ public:
     QString telemetrySavePath   ();
     QString logSavePath         ();
     QString videoSavePath       ();
+    QString photoSavePath       ();
     QString crashSavePath       ();
 
     // Helper methods for working with firstRunPromptIds QVariant settings string list
@@ -112,6 +114,7 @@ public:
     static const char* missionDirectory;
     static const char* logDirectory;
     static const char* videoDirectory;
+    static const char* photoDirectory;
     static const char* crashDirectory;
 
     // Returns the current language setting bypassing the standard SettingsGroup path. This should only be used