diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
index c1ecf2e2c9..841a8df94f 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
@@ -1827,9 +1827,9 @@ private:
 
         if (! app->hasAttribute ("android:icon"))
         {
-            std::unique_ptr<Drawable> bigIcon (getBigIcon()), smallIcon (getSmallIcon());
+            const auto icons = getIcons();
 
-            if (bigIcon != nullptr || smallIcon != nullptr)
+            if (icons.big != nullptr || icons.small != nullptr)
                 app->setAttribute ("android:icon", "@drawable/icon");
         }
 
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
index 4b298ffc3a..5cfb1c21c4 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
@@ -867,14 +867,14 @@ void ProjectExporter::createDefaultConfigs()
     }
 }
 
-std::unique_ptr<Drawable> ProjectExporter::getBigIcon() const
+build_tools::Icons ProjectExporter::getIcons() const
 {
-    return project.getMainGroup().findItemWithID (settings [Ids::bigIcon]).loadAsImageFile();
-}
+    const auto loadIcon = [this] (auto id)
+    {
+        return project.getMainGroup().findItemWithID (settings[id]).loadAsImageFile();
+    };
 
-std::unique_ptr<Drawable> ProjectExporter::getSmallIcon() const
-{
-    return project.getMainGroup().findItemWithID (settings [Ids::smallIcon]).loadAsImageFile();
+    return { loadIcon (Ids::smallIcon), loadIcon (Ids::bigIcon) };
 }
 
 //==============================================================================
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h
index eff3dd63f8..e5540a54e8 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h
@@ -238,9 +238,7 @@ public:
 
     void addProjectPathToBuildPathList (StringArray&, const build_tools::RelativePath&, int index = -1) const;
 
-    std::unique_ptr<Drawable> getBigIcon() const;
-    std::unique_ptr<Drawable> getSmallIcon() const;
-    build_tools::Icons getIcons() const { return { getSmallIcon(), getBigIcon() }; }
+    build_tools::Icons getIcons() const;
 
     String getExporterIdentifierMacro() const
     {