Merge branch 'ofwdev' into 420

scripts/fbt/appmanifest.py

@@ -65,6 +65,7 @@ class FlipperApplication:
     fap_author: str = ""
     fap_weburl: str = ""
     fap_icon_assets: Optional[str] = None
+    fap_icon_assets_symbol: Optional[str] = None
     fap_extbuild: List[ExternallyBuiltFile] = field(default_factory=list)
     fap_private_libs: List[Library] = field(default_factory=list)
     # Internally used by fbt

scripts/fbt_tools/fbt_extapps.py

@@ -60,7 +60,7 @@ def BuildAppElf(env, app):
         fap_icons = app_env.CompileIcons(
             app_env.Dir(app_work_dir),
             app._appdir.Dir(app.fap_icon_assets),
-            icon_bundle_name=f"{app.appid}_icons",
+            icon_bundle_name=f"{app.fap_icon_assets_symbol if app.fap_icon_assets_symbol else app.appid }_icons",
         )
         app_env.Alias("_fap_icons", fap_icons)