diff --git a/src/gamedetails.cpp b/src/gamedetails.cpp
index e2be559..fc8b0f8 100644
--- a/src/gamedetails.cpp
+++ b/src/gamedetails.cpp
@@ -128,8 +128,8 @@ void gameDetails::makeFilepaths(const DirectoryConfig& config)
     {
         subdir = config.bSubDirectories ? config.sDLCSubdir + "/" + config.sInstallersSubdir : "";
         this->dlcs[i].serialsFilepath = Util::makeFilepath(directory, "serials.txt", this->gamename, subdir, 0);
-        this->dlcs[i].logoFilepath = Util::makeFilepath(directory, "logo" + logo_ext, this->gamename, subdir, 0);
-        this->dlcs[i].iconFilepath = Util::makeFilepath(directory, "icon" + icon_ext, this->gamename, subdir, 0);
+        this->dlcs[i].logoFilepath = Util::makeFilepath(directory, "logo" + logo_ext, this->gamename, subdir, 0, this->dlcs[i].gamename);
+        this->dlcs[i].iconFilepath = Util::makeFilepath(directory, "icon" + icon_ext, this->gamename, subdir, 0, this->dlcs[i].gamename);
         this->dlcs[i].changelogFilepath = Util::makeFilepath(directory, "changelog_" + this->dlcs[i].gamename + ".html", this->gamename, subdir, 0);
         for (unsigned int j = 0; j < this->dlcs[i].installers.size(); ++j)
         {
diff --git a/src/util.cpp b/src/util.cpp
index f62a83f..e577e7f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -439,6 +439,12 @@ void Util::filepathReplaceReservedStrings(std::string& str, const std::string& g
             platform = "no_platform";
     }
 
+		// Don't save artwork in "no_platform" folder
+    if (str.rfind("/icon.png") != std::string::npos || str.rfind("/logo.jpg") != std::string::npos)
+    {
+        platform = "";
+    }
+
     std::string gamename_firstletter;
     if (!gamename.empty())
     {