9 files changed, 241 insertions, 65 deletions

diff --git a/src/app.c b/src/app.c
index 73771609..a9ec6a26 100644
--- a/src/app.c
+++ b/src/app.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "bookmarks.h"
 #include "defs.h"
-#include "embedded.h"
+#include "resources.h"
 #include "feeds.h"
 #include "mimehooks.h"
 #include "gmcerts.h"
@@ -711,19 +711,17 @@ static void init_App_(iApp *d, int argc, char **argv) {
         }
         SDL_free(exec);
     }
-#if defined (iHaveLoadEmbed)
     /* Load the resources from a file. Check the executable directory first, then a
        system-wide location, and as a final fallback, the current working directory. */ {
-        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
-            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
-                if (!load_Embed("resources.lgr")) {
+        if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
+            if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
+                if (!init_Resources("resources.lgr")) {
                     fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
                     exit(-1);
                 }
             }
         }
     }
-#endif
     init_Lang();
     /* Configure the valid command line options. */ {
         defineValues_CommandLine(&d->args, "close-tab", 0);
@@ -742,7 +740,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     iStringList *openCmds = new_StringList();
     /* Handle command line options. */ {
         if (contains_CommandLine(&d->args, "help")) {
-            puts(cstr_Block(&blobArghelp_Embedded));
+            puts(cstr_Block(&blobArghelp_Resources));
             terminate_App_(0);
         }
         if (contains_CommandLine(&d->args, "version;V")) {
diff --git a/src/fontpack.c b/src/fontpack.c
index 40e4c96c..78181fd4 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -21,7 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "fontpack.h"
-#include "embedded.h"
+#include "resources.h"
 #include "ui/window.h"
 #include "app.h"
 
@@ -564,11 +564,8 @@ void init_Fonts(const char *userDir) {
     /* Load the required fonts. */ {
         iFontPack *pack = new_FontPack();
         setCStr_String(&pack->id, "default");
-        iArchive *arch = new_Archive();
         setReadOnly_FontPack(pack, iTrue);
-        openData_Archive(arch, &fontpackDefault_Embedded);
-        loadArchive_FontPack(pack, arch); /* should never fail if we've made it this far */
-        iRelease(arch);
+        loadArchive_FontPack(pack, archive_Resources()); /* should never fail if we've made it this far */
         pushBack_PtrArray(&d->packs, pack);
     }
     /* Find and load .fontpack files in known locations. */ {
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 03a6d999..23845475 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "feeds.h"
 #include "bookmarks.h"
 #include "ui/text.h"
-#include "embedded.h"
+#include "resources.h"
 #include "defs.h"
 
 #include <the_Foundation/archive.h>
@@ -344,19 +344,19 @@ static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
 static const iBlock *aboutPageSource_(iRangecc path, iRangecc query) {
     const iBlock *src = NULL;
     if (equalCase_Rangecc(path, "about")) {
-        return &blobAbout_Embedded;
+        return &blobAbout_Resources;
     }
     if (equalCase_Rangecc(path, "lagrange")) {
-        return &blobLagrange_Embedded;
+        return &blobLagrange_Resources;
     }
     if (equalCase_Rangecc(path, "help")) {
-        return &blobHelp_Embedded;
+        return &blobHelp_Resources;
     }
     if (equalCase_Rangecc(path, "license")) {
-        return &blobLicense_Embedded;
+        return &blobLicense_Resources;
     }
     if (equalCase_Rangecc(path, "version")) {
-        return &blobVersion_Embedded;
+        return &blobVersion_Resources;
     }
     if (equalCase_Rangecc(path, "debug")) {
         return utf8_String(debugInfo_App());
@@ -396,7 +396,7 @@ static const iBlock *replaceVariables_(const iBlock *block) {
 #if 0
             else if (startsWith_Rangecc(name, "BT:")) { /* block text */
                 repl = range_String(collect_String(renderBlockChars_Text(
-                    &fontFiraSansRegular_Embedded,
+                    &fontFiraSansRegular_Resources,
                     11, /* should be larger if shaded */
                     quadrants_TextBlockMode,
                     &(iString){ iBlockLiteral(
@@ -404,7 +404,7 @@ static const iBlock *replaceVariables_(const iBlock *block) {
             }
             else if (startsWith_Rangecc(name, "ST:")) { /* shaded text */
                 repl = range_String(collect_String(renderBlockChars_Text(
-                    &fontSmolEmojiRegular_Embedded,
+                    &fontSmolEmojiRegular_Resources,
                     20,
                     shading_TextBlockMode,
                     &(iString){ iBlockLiteral(
diff --git a/src/lang.c b/src/lang.c
index f54ab2d7..017937cf 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -21,7 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "lang.h"
-#include "embedded.h"
+#include "resources.h"
 
 #include <the_Foundation/sortedarray.h>
 #include <the_Foundation/string.h>
@@ -30,7 +30,7 @@ iDeclareType(Lang)
 iDeclareType(MsgStr)
 
 struct Impl_MsgStr {
-    iRangecc id; /* these point to null-terminated strings in embedded data */
+    iRangecc id; /* these point to null-terminated strings in resources */
     iRangecc str;
 };
 
@@ -83,41 +83,41 @@ static void clear_Lang_(iLang *d) {
 }
 
 static void load_Lang_(iLang *d, const char *id) {
-    /* Load compiled language strings from an embedded blob. */
+    /* Load compiled language strings from a resource blob. */
     iUnused(id);
-    const iBlock *data = equal_CStr(id, "fi")      ? &blobFi_Embedded
-                       : equal_CStr(id, "fr")      ? &blobFr_Embedded
-                       : equal_CStr(id, "ru")      ? &blobRu_Embedded
-                       : equal_CStr(id, "eo")      ? &blobEo_Embedded
-                       : equal_CStr(id, "es")      ? &blobEs_Embedded
-                       : equal_CStr(id, "es_MX")   ? &blobEs_MX_Embedded
-                       : equal_CStr(id, "de")      ? &blobDe_Embedded
-                       : equal_CStr(id, "gl")      ? &blobGl_Embedded
-                       : equal_CStr(id, "ia")      ? &blobIa_Embedded
-                       : equal_CStr(id, "ie")      ? &blobIe_Embedded
-                       : equal_CStr(id, "isv")     ? &blobIsv_Embedded
-                       : equal_CStr(id, "pl")      ? &blobPl_Embedded
-                       : equal_CStr(id, "sk")      ? &blobSk_Embedded
-                       : equal_CStr(id, "sr")      ? &blobSr_Embedded
-                       : equal_CStr(id, "tok")     ? &blobTok_Embedded
-                       : equal_CStr(id, "uk")      ? &blobUk_Embedded
-                       : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Embedded
-                       : equal_CStr(id, "zh_Hant") ? &blobZh_Hant_Embedded
-                                                   : &blobEn_Embedded;
-    if (data == &blobRu_Embedded || data == &blobSr_Embedded || data == &blobUk_Embedded) {
+    const iBlock *data = equal_CStr(id, "fi")      ? &blobFi_Resources
+                       : equal_CStr(id, "fr")      ? &blobFr_Resources
+                       : equal_CStr(id, "ru")      ? &blobRu_Resources
+                       : equal_CStr(id, "eo")      ? &blobEo_Resources
+                       : equal_CStr(id, "es")      ? &blobEs_Resources
+                       : equal_CStr(id, "es_MX")   ? &blobEs_MX_Resources
+                       : equal_CStr(id, "de")      ? &blobDe_Resources
+                       : equal_CStr(id, "gl")      ? &blobGl_Resources
+                       : equal_CStr(id, "ia")      ? &blobIa_Resources
+                       : equal_CStr(id, "ie")      ? &blobIe_Resources
+                       : equal_CStr(id, "isv")     ? &blobIsv_Resources
+                       : equal_CStr(id, "pl")      ? &blobPl_Resources
+                       : equal_CStr(id, "sk")      ? &blobSk_Resources
+                       : equal_CStr(id, "sr")      ? &blobSr_Resources
+                       : equal_CStr(id, "tok")     ? &blobTok_Resources
+                       : equal_CStr(id, "uk")      ? &blobUk_Resources
+                       : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Resources
+                       : equal_CStr(id, "zh_Hant") ? &blobZh_Hant_Resources
+                                                   : &blobEn_Resources;
+    if (data == &blobRu_Resources || data == &blobSr_Resources || data == &blobUk_Resources) {
         d->pluralType = slavic_PluralType;
     }
-    else if (data == &blobIsv_Embedded) {
+    else if (data == &blobIsv_Resources) {
         d->pluralType = oneTwoMany_PluralType;
     }
-    else if (data == &blobSk_Embedded) {
+    else if (data == &blobSk_Resources) {
         d->pluralType = oneFewMany_PluralType;
     }
-    else if (data == &blobPl_Embedded) {
+    else if (data == &blobPl_Resources) {
         d->pluralType = polish_PluralType;
     }
-    else if (data == &blobZh_Hans_Embedded || data == &blobZh_Hant_Embedded ||
-             data == &blobTok_Embedded) {
+    else if (data == &blobZh_Hans_Resources || data == &blobZh_Hant_Resources ||
+             data == &blobTok_Resources) {
         d->pluralType = none_PluralType;
     }
     else {
diff --git a/src/resources.c b/src/resources.c
new file mode 100644
index 00000000..da78708a
--- /dev/null
+++ b/src/resources.c
@@ -0,0 +1,121 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "resources.h"
+
+#include <the_Foundation/archive.h>
+#include <the_Foundation/version.h>
+
+static iArchive *archive_;
+    
+iBlock blobAbout_Resources;
+iBlock blobHelp_Resources;
+iBlock blobLagrange_Resources;
+iBlock blobLicense_Resources;
+iBlock blobVersion_Resources;
+iBlock blobArghelp_Resources;
+iBlock blobDe_Resources;
+iBlock blobEn_Resources;
+iBlock blobEo_Resources;
+iBlock blobEs_Resources;
+iBlock blobEs_MX_Resources;
+iBlock blobFi_Resources;
+iBlock blobFr_Resources;
+iBlock blobGl_Resources;
+iBlock blobIa_Resources;
+iBlock blobIe_Resources;
+iBlock blobIsv_Resources;
+iBlock blobPl_Resources;
+iBlock blobRu_Resources;
+iBlock blobSk_Resources;
+iBlock blobSr_Resources;
+iBlock blobTok_Resources;
+iBlock blobUk_Resources;
+iBlock blobZh_Hans_Resources;
+iBlock blobZh_Hant_Resources;
+iBlock imageShadow_Resources;
+
+static struct {
+    iBlock *data;
+    const char *archivePath;
+} entries_[] = {
+    { &blobAbout_Resources, "about/about.gmi" },
+    { &blobHelp_Resources, "about/help.gmi" },
+    { &blobLagrange_Resources, "about/lagrange.gmi" },
+    { &blobLicense_Resources, "about/license.gmi" },
+    { &blobVersion_Resources, "about/version.gmi" },
+    { &blobArghelp_Resources, "arg-help.txt" },
+    { &blobDe_Resources, "lang/de.bin" },
+    { &blobEn_Resources, "lang/en.bin" },
+    { &blobEo_Resources, "lang/eo.bin" },
+    { &blobEs_Resources, "lang/es.bin" },
+    { &blobEs_MX_Resources, "lang/es_MX.bin" },
+    { &blobFi_Resources, "lang/fi.bin" },
+    { &blobFr_Resources, "lang/fr.bin" },
+    { &blobGl_Resources, "lang/gl.bin" },
+    { &blobIa_Resources, "lang/ia.bin" },
+    { &blobIe_Resources, "lang/ie.bin" },
+    { &blobIsv_Resources, "lang/isv.bin" },
+    { &blobPl_Resources, "lang/pl.bin" },
+    { &blobRu_Resources, "lang/ru.bin" },
+    { &blobSk_Resources, "lang/sk.bin" },
+    { &blobSr_Resources, "lang/sr.bin" },
+    { &blobTok_Resources, "lang/tok.bin" },
+    { &blobUk_Resources, "lang/uk.bin" },
+    { &blobZh_Hans_Resources, "lang/zh_Hans.bin" },
+    { &blobZh_Hant_Resources, "lang/zh_Hant.bin" },
+    { &imageShadow_Resources, "shadow.png" },
+};
+
+iBool init_Resources(const char *path) {
+    archive_ = new_Archive();
+    if (openFile_Archive(archive_, collectNewCStr_String(path))) {
+        iVersion appVer;
+        init_Version(&appVer, range_CStr(LAGRANGE_APP_VERSION));
+        iVersion resVer;
+        init_Version(&resVer, range_Block(dataCStr_Archive(archive_, "VERSION")));
+        if (!cmp_Version(&resVer, &appVer)) {
+            iForIndices(i, entries_) {
+                const iBlock *data = dataCStr_Archive(archive_, entries_[i].archivePath);
+                if (data) {
+                    initCopy_Block(entries_[i].data, data);
+                }
+            }
+            return iTrue;
+        }
+        fprintf(stderr, "[Resources] %s: version mismatch (%s != " LAGRANGE_APP_VERSION ")\n",
+                path, cstr_Block(dataCStr_Archive(archive_, "VERSION")));
+    }
+    iRelease(archive_);
+    return iFalse;
+}
+
+void deinit_Resources(void) {
+    iForIndices(i, entries_) {
+        deinit_Block(entries_[i].data);
+    }
+    iRelease(archive_);
+}
+
+const iArchive *archive_Resources(void) {
+    return archive_;
+}
diff --git a/src/resources.h b/src/resources.h
new file mode 100644
index 00000000..a9a5c767
--- /dev/null
+++ b/src/resources.h
@@ -0,0 +1,60 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include <the_Foundation/block.h>
+
+iDeclareType(Archive)
+
+iBool               init_Resources      (const char *path);
+void                deinit_Resources    (void);
+
+const iArchive *    archive_Resources   (void);
+
+extern iBlock blobAbout_Resources;
+extern iBlock blobHelp_Resources;
+extern iBlock blobLagrange_Resources;
+extern iBlock blobLicense_Resources;
+extern iBlock blobVersion_Resources;
+extern iBlock blobArghelp_Resources;
+extern iBlock blobDe_Resources;
+extern iBlock blobEn_Resources;
+extern iBlock blobEo_Resources;
+extern iBlock blobEs_Resources;
+extern iBlock blobEs_MX_Resources;
+extern iBlock blobFi_Resources;
+extern iBlock blobFr_Resources;
+extern iBlock blobGl_Resources;
+extern iBlock blobIa_Resources;
+extern iBlock blobIe_Resources;
+extern iBlock blobIsv_Resources;
+extern iBlock blobPl_Resources;
+extern iBlock blobRu_Resources;
+extern iBlock blobSk_Resources;
+extern iBlock blobSr_Resources;
+extern iBlock blobTok_Resources;
+extern iBlock blobUk_Resources;
+extern iBlock blobZh_Hans_Resources;
+extern iBlock blobZh_Hant_Resources;
+extern iBlock imageShadow_Resources;
+extern iBlock fontpackDefault_Resources;
diff --git a/src/ui/root.c b/src/ui/root.c
index d847480f..f66e0f29 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "command.h"
 #include "defs.h"
 #include "documentwidget.h"
-#include "embedded.h"
+#include "resources.h"
 #include "inputwidget.h"
 #include "keys.h"
 #include "labelwidget.h"
diff --git a/src/ui/text.c b/src/ui/text.c
index 09c01d46..e762b891 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "text.h"
 #include "color.h"
 #include "metrics.h"
-#include "embedded.h"
+#include "resources.h"
 #include "window.h"
 #include "paint.h"
 #include "app.h"
@@ -180,21 +180,21 @@ static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *font
     d->data = NULL;
     d->family = undefined_TextFont;
     /* Note: We only use `family` currently for applying a kerning fix to Nunito. */
-    if (data == &fontNunitoRegular_Embedded ||
-        data == &fontNunitoBold_Embedded ||
-        data == &fontNunitoExtraBold_Embedded ||
-        //data == &fontNunitoLightItalic_Embedded ||
-        data == &fontNunitoExtraLight_Embedded) {
+    if (data == &fontNunitoRegular_Resources ||
+        data == &fontNunitoBold_Resources ||
+        data == &fontNunitoExtraBold_Resources ||
+        //data == &fontNunitoLightItalic_Resources ||
+        data == &fontNunitoExtraLight_Resources) {
         d->family = nunito_TextFont;
     }
-    else if (//data == &fontScheherazadeNewRegular_Embedded) {
-             data == &fontNotoSansArabicUIRegular_Embedded) {
+    else if (//data == &fontScheherazadeNewRegular_Resources) {
+             data == &fontNotoSansArabicUIRegular_Resources) {
         d->family = arabic_TextFont;
     }
-    else if (data == &fontNotoSansSymbolsRegular_Embedded ||
-             data == &fontNotoSansSymbols2Regular_Embedded ||
-             data == &fontNotoEmojiRegular_Embedded ||
-             data == &fontSmolEmojiRegular_Embedded) {
+    else if (data == &fontNotoSansSymbolsRegular_Resources ||
+             data == &fontNotoSansSymbols2Regular_Resources ||
+             data == &fontNotoEmojiRegular_Resources ||
+             data == &fontSmolEmojiRegular_Resources) {
         d->family = emojiAndSymbols_TextFont;
     }
 #endif
diff --git a/src/ui/window.c b/src/ui/window.c
index c63ad76a..8016e8ef 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "bookmarks.h"
 #include "command.h"
 #include "defs.h"
-#include "embedded.h"
+#include "resources.h"
 #include "keys.h"
 #include "labelwidget.h"
 #include "documentwidget.h"
@@ -583,7 +583,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #if defined (iPlatformLinux)
     SDL_SetWindowMinimumSize(d->base.win, minSize.x * d->base.pixelRatio, minSize.y * d->base.pixelRatio);
     /* Load the window icon. */ {
-        SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, 0);
+        SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, 0);
         SDL_SetWindowIcon(d->base.win, surf);
         free(surf->pixels);
         SDL_FreeSurface(surf);
@@ -597,7 +597,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
     setupUserInterface_MainWindow(d);
     postCommand_App("~bindings.changed"); /* update from bindings */
     /* Load the border shadow texture. */ {
-        SDL_Surface *surf = loadImage_(&imageShadow_Embedded, 0);
+        SDL_Surface *surf = loadImage_(&imageShadow_Resources, 0);
         d->base.borderShadow = SDL_CreateTextureFromSurface(d->base.render, surf);
         SDL_SetTextureBlendMode(d->base.borderShadow, SDL_BLENDMODE_BLEND);
         free(surf->pixels);
@@ -607,7 +607,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
     /* Load the app icon for drawing in the title bar. */
     if (prefs_App()->customFrame) {
-        SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, appIconSize_Root());
+        SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, appIconSize_Root());
         SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
         d->appIcon = SDL_CreateTextureFromSurface(d->base.render, surf);
         free(surf->pixels);