diff --git a/.gitignore b/.gitignore
index 023ea2a..fcd678b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,7 @@
 
 # Qt project user file
 *.pro.user
+
+# Gettext translation files
+*.po
+*.pot
diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp
index cda5287..75655a6 100644
--- a/SnapmaticPicture.cpp
+++ b/SnapmaticPicture.cpp
@@ -44,6 +44,7 @@
 #define snapmaticUsefulLength 260
 #define snapmaticFileMaxSize 528192
 #define jpegHeaderLineDifStr 2
+#define jpegHeaderLineDifLim 8
 #define jpegPreHeaderLength 14
 #define jpegPicStreamLength 524288
 #define jsonStreamLength 3076
@@ -57,6 +58,9 @@
 #define titlStreamEditorLength 256
 #define titlStreamCharacterMax 39
 
+// LIMIT ALLOCATIONS
+#define jpegStreamLimitBegin 288
+
 // IMAGES VALUES
 #define snapmaticResolutionW 960
 #define snapmaticResolutionH 536
@@ -305,6 +309,12 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo
         return false;
     }
 
+    // Get JPEG Size Limit
+    jpegHeaderLine.remove(0, jpegHeaderLineDifLim);
+    QString jpegHeaderLineStr = QString::fromUtf8(jpegHeaderLine.toHex().remove(8 - 2, 2));
+    QString hexadecimalStr = jpegHeaderLineStr.mid(4, 2) % jpegHeaderLineStr.mid(2, 2) % jpegHeaderLineStr.mid(0, 2);
+    jpegRawContentSize = hexadecimalStr.toInt(0, 16);
+
     // Read JPEG Stream
     if (!picStream->isReadable())
     {
@@ -314,18 +324,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo
         return false;
     }
     QByteArray jpegRawContent = picStream->read(jpegPicStreamLength);
-    if (jpegRawContent.contains("\xFF\xD9"))
-    {
-        int jpegRawContentSizeT = jpegRawContent.indexOf("\xFF\xD9") + 2;
-        jpegRawContentSizeE = jpegRawContentSizeT;
-        jpegRawContentSize = jpegRawContentSizeT;
-        if (jpegRawContent.contains("\xFF\x45\x4F\x49"))
-        {
-            jpegRawContentSizeT = jpegRawContent.indexOf("\xFF\x45\x4F\x49");
-        }
-        jpegRawContent = jpegRawContent.left(jpegRawContentSize);
-        jpegRawContentSize = jpegRawContentSizeT;
-    }
     if (cacheEnabled) picOk = cachePicture.loadFromData(jpegRawContent, "JPEG");
     if (!cacheEnabled)
     {
@@ -507,7 +505,7 @@ bool SnapmaticPicture::setImage(const QImage &picture)
             picStreamT.close();
             if (saveSuccess)
             {
-                if (picByteArrayT.length() > jpegRawContentSize)
+                if (picByteArrayT.length() > jpegPicStreamLength)
                 {
                     comLvl--;
                     saveSuccess = false;
@@ -527,29 +525,34 @@ bool SnapmaticPicture::setPictureStream(const QByteArray &streamArray) // clean
 {
     if (writeEnabled)
     {
-        bool customEOI = false;
         QByteArray picByteArray = streamArray;
         if (lowRamMode) { rawPicContent = qUncompress(rawPicContent); }
         QBuffer snapmaticStream(&rawPicContent);
         snapmaticStream.open(QIODevice::ReadWrite);
         if (!snapmaticStream.seek(jpegStreamEditorBegin)) return false;
         if (picByteArray.length() > jpegPicStreamLength) return false;
-        if (picByteArray.length() < jpegRawContentSize && jpegRawContentSize + 4 < jpegPicStreamLength)
-        {
-            customEOI = true;
-        }
         while (picByteArray.length() != jpegPicStreamLength)
         {
             picByteArray += '\x00';
         }
-        if (customEOI)
+        int result = snapmaticStream.write(picByteArray);
+        QString hexadecimalStr;
+        hexadecimalStr.setNum(streamArray.length(), 16);
+        while (hexadecimalStr.length() != 6)
         {
-            picByteArray.replace(jpegRawContentSize, 4, "\xFF\x45\x4F\x49");
+            hexadecimalStr.prepend('0');
+        }
+        hexadecimalStr = hexadecimalStr.mid(4, 2) % hexadecimalStr.mid(2, 2) % hexadecimalStr.mid(0, 2);
+        bool updatedRawContentSize = false;
+        if (snapmaticStream.seek(jpegStreamLimitBegin))
+        {
+            snapmaticStream.write(QByteArray::fromHex(hexadecimalStr.toUtf8()));
+            updatedRawContentSize = true;
         }
-        int result = snapmaticStream.write(picByteArray);
         snapmaticStream.close();
         if (result != 0)
         {
+            if (updatedRawContentSize) { jpegRawContentSize = streamArray.length(); }
             if (cacheEnabled)
             {
                 QImage replacedPicture;
@@ -1031,7 +1034,7 @@ void SnapmaticPicture::parseJsonContent()
         if (jsonObject["rsedtr"].isBool()) { localProperties.isFromRSEditor = jsonObject["rsedtr"].toBool(); }
         else { jsonError = true; }
     }
-    else { jsonIncomplete = true; }
+    // else { jsonIncomplete = true; } // Game release Snapmatic pictures prior May 2015 left out rsedtr, so don't force exists on that one
 
     if (!jsonIncomplete && !jsonError)
     {
diff --git a/main.cpp b/main.cpp
index 5b58da3..b9c67b7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -70,6 +70,8 @@ int main(int argc, char *argv[])
     a.setApplicationVersion(GTA5SYNC_APPVER);
     a.setQuitOnLastWindowClosed(false);
 
+    QResource::registerResource(":/global/global.rcc");
+
     QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
     settings.beginGroup("Startup");
 
@@ -292,8 +294,6 @@ int main(int argc, char *argv[])
     QObject::connect(&threadDB, SIGNAL(finished()), &a, SLOT(quit()));
     threadDB.start();
 
-    QResource::registerResource(":/global/global.rcc");
-
     UserInterface uiWindow(&profileDB, &crewDB, &threadDB);
     uiWindow.setWindowIcon(IconLoader::loadingAppIcon());
     uiWindow.setupDirEnv();