EdgeTX · pfeerick · Jan 21, 2026 · Nov 5, 2025 · Nov 5, 2025 · Nov 5, 2025
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ compile_commands.json
 /.idea
 /.vs
 CMakeUserPresets.json
+.DS_Store
diff --git a/radio/src/bitmaps/320x240/CMakeLists.txt b/radio/src/bitmaps/320x240/CMakeLists.txt
@@ -2,23 +2,12 @@ set(BITMAP_SIZE_ARGS --size-format 2)
 set(BITMAP_LZ4_ARGS ${BITMAP_SIZE_ARGS} --lz4)
 set(MASK_LZ4_ARGS ${BITMAP_SIZE_ARGS} --lz4)
 
-add_bitmaps_target(bm320_splash_logo "${RADIO_SRC_DIR}/bitmaps/320x240/splash_logo.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
+add_bitmaps_target(bm320_bmps "${RADIO_SRC_DIR}/bitmaps/320x240/bmp_*.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
 add_bitmaps_target(bm320_masks "${RADIO_SRC_DIR}/bitmaps/320x240/mask_*.png" 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm320_slider_masks "${RADIO_SRC_DIR}/bitmaps/320x240/slider/*.png" 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm320_volume_masks ${RADIO_SRC_DIR}/bitmaps/320x240/volume/*.png 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm320_themes_masks "${RADIO_SRC_DIR}/bitmaps/320x240/default_theme/mask_*.png" 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm320_themes_alpha "${RADIO_SRC_DIR}/bitmaps/320x240/default_theme/alpha_*.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
-
-add_bitmaps_target(bm320_bootloader_bitmaps "${RADIO_SRC_DIR}/bitmaps/320x240/bootloader/bmp_*.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
 
 add_custom_target(bm320_bitmaps)
 
 add_dependencies(bm320_bitmaps
-  bm320_splash_logo
+  bm320_bmps
   bm320_masks
-  bm320_slider_masks
-  bm320_themes_masks
-  bm320_themes_alpha
-  bm320_volume_masks
-  bm320_bootloader_bitmaps
   )
diff --git a/radio/src/bitmaps/320x240/bmp_bootloader_plug_usb.png b/radio/src/bitmaps/320x240/bmp_bootloader_plug_usb.png
diff --git a/radio/src/bitmaps/320x240/bmp_bootloader_usb_plugged.png b/radio/src/bitmaps/320x240/bmp_bootloader_usb_plugged.png
diff --git a/radio/src/bitmaps/320x240/bmp_logo_edgetx_splash.png b/radio/src/bitmaps/320x240/bmp_logo_edgetx_splash.png
diff --git a/radio/src/bitmaps/320x240/bmp_radio_stick_background.png b/radio/src/bitmaps/320x240/bmp_radio_stick_background.png
diff --git a/radio/src/bitmaps/320x240/bmp_radio_stick_pointer.png b/radio/src/bitmaps/320x240/bmp_radio_stick_pointer.png
diff --git a/radio/src/bitmaps/320x240/bootloader/bmp_plug_usb.png b/radio/src/bitmaps/320x240/bootloader/bmp_plug_usb.png
diff --git a/radio/src/bitmaps/320x240/bootloader/bmp_usb_plugged.png b/radio/src/bitmaps/320x240/bootloader/bmp_usb_plugged.png
diff --git a/radio/src/bitmaps/320x240/default_theme/alpha_stick_background.png b/radio/src/bitmaps/320x240/default_theme/alpha_stick_background.png
diff --git a/radio/src/bitmaps/320x240/default_theme/alpha_stick_pointer.png b/radio/src/bitmaps/320x240/default_theme/alpha_stick_pointer.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_btn_close.png b/radio/src/bitmaps/320x240/default_theme/mask_btn_close.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_btn_next.png b/radio/src/bitmaps/320x240/default_theme/mask_btn_next.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_btn_prev.png b/radio/src/bitmaps/320x240/default_theme/mask_btn_prev.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_busy.png b/radio/src/bitmaps/320x240/default_theme/mask_busy.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_currentmenu_bg.png b/radio/src/bitmaps/320x240/default_theme/mask_currentmenu_bg.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_currentmenu_dot.png b/radio/src/bitmaps/320x240/default_theme/mask_currentmenu_dot.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_currentmenu_shadow.png b/radio/src/bitmaps/320x240/default_theme/mask_currentmenu_shadow.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_edgetx.png b/radio/src/bitmaps/320x240/default_theme/mask_edgetx.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_error.png b/radio/src/bitmaps/320x240/default_theme/mask_error.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_favs.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_favs.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_model.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_model.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_model_select.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_model_select.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_notes.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_notes.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_radio.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_radio.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_stats.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_stats.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_menu_theme.png b/radio/src/bitmaps/320x240/default_theme/mask_menu_theme.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_curves.png b/radio/src/bitmaps/320x240/default_theme/mask_model_curves.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_flight_modes.png b/radio/src/bitmaps/320x240/default_theme/mask_model_flight_modes.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_grid_large.png b/radio/src/bitmaps/320x240/default_theme/mask_model_grid_large.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_grid_small.png b/radio/src/bitmaps/320x240/default_theme/mask_model_grid_small.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_gvars.png b/radio/src/bitmaps/320x240/default_theme/mask_model_gvars.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_heli.png b/radio/src/bitmaps/320x240/default_theme/mask_model_heli.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_inputs.png b/radio/src/bitmaps/320x240/default_theme/mask_model_inputs.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_list_one.png b/radio/src/bitmaps/320x240/default_theme/mask_model_list_one.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_list_two.png b/radio/src/bitmaps/320x240/default_theme/mask_model_list_two.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_logical_switches.png b/radio/src/bitmaps/320x240/default_theme/mask_model_logical_switches.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_lua_scripts.png b/radio/src/bitmaps/320x240/default_theme/mask_model_lua_scripts.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_mixer.png b/radio/src/bitmaps/320x240/default_theme/mask_model_mixer.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_outputs.png b/radio/src/bitmaps/320x240/default_theme/mask_model_outputs.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_setup.png b/radio/src/bitmaps/320x240/default_theme/mask_model_setup.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_special_functions.png b/radio/src/bitmaps/320x240/default_theme/mask_model_special_functions.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_telemetry.png b/radio/src/bitmaps/320x240/default_theme/mask_model_telemetry.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_model_usb.png b/radio/src/bitmaps/320x240/default_theme/mask_model_usb.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_monitor.png b/radio/src/bitmaps/320x240/default_theme/mask_monitor.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_monitor_inver.png b/radio/src/bitmaps/320x240/default_theme/mask_monitor_inver.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_monitor_lockch.png b/radio/src/bitmaps/320x240/default_theme/mask_monitor_lockch.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_monitor_logsw.png b/radio/src/bitmaps/320x240/default_theme/mask_monitor_logsw.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_mplex_add.png b/radio/src/bitmaps/320x240/default_theme/mask_mplex_add.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_mplex_multi.png b/radio/src/bitmaps/320x240/default_theme/mask_mplex_multi.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_mplex_replace.png b/radio/src/bitmaps/320x240/default_theme/mask_mplex_replace.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_calibration.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_calibration.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_edit_theme.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_edit_theme.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_global_functions.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_global_functions.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_hardware.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_hardware.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_sd_browser.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_sd_browser.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_setup.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_setup.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_tools.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_tools.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_trainer.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_trainer.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_radio_version.png b/radio/src/bitmaps/320x240/default_theme/mask_radio_version.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_shutdown.png b/radio/src/bitmaps/320x240/default_theme/mask_shutdown.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_stats_analogs.png b/radio/src/bitmaps/320x240/default_theme/mask_stats_analogs.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_stats_debug.png b/radio/src/bitmaps/320x240/default_theme/mask_stats_debug.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_stats_timers.png b/radio/src/bitmaps/320x240/default_theme/mask_stats_timers.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_textline_curve.png b/radio/src/bitmaps/320x240/default_theme/mask_textline_curve.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_textline_fm.png b/radio/src/bitmaps/320x240/default_theme/mask_textline_fm.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_add_view.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_add_view.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_setup.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_setup.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view1.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view1.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view10.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view10.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view2.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view2.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view3.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view3.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view4.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view4.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view5.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view5.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view6.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view6.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view7.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view7.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view8.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view8.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_theme_view9.png b/radio/src/bitmaps/320x240/default_theme/mask_theme_view9.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_tools_apps.png b/radio/src/bitmaps/320x240/default_theme/mask_tools_apps.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_tools_reset.png b/radio/src/bitmaps/320x240/default_theme/mask_tools_reset.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_top_logo.png b/radio/src/bitmaps/320x240/default_theme/mask_top_logo.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_topleft.png b/radio/src/bitmaps/320x240/default_theme/mask_topleft.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_trim.png b/radio/src/bitmaps/320x240/default_theme/mask_trim.png
diff --git a/radio/src/bitmaps/320x240/default_theme/mask_trim_shadow.png b/radio/src/bitmaps/320x240/default_theme/mask_trim_shadow.png
diff --git a/radio/src/bitmaps/320x240/mask_antenna.png b/radio/src/bitmaps/320x240/mask_antenna.png
diff --git a/radio/src/bitmaps/320x240/mask_dot.png b/radio/src/bitmaps/320x240/mask_dot.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_edgetx.png b/radio/src/bitmaps/320x240/mask_icon_edgetx.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_menu_favs.png b/radio/src/bitmaps/320x240/mask_icon_menu_favs.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_menu_manage_models.png b/radio/src/bitmaps/320x240/mask_icon_menu_manage_models.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_menu_model_setup.png b/radio/src/bitmaps/320x240/mask_icon_menu_model_setup.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_menu_radio_setup.png b/radio/src/bitmaps/320x240/mask_icon_menu_radio_setup.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_menu_tools.png b/radio/src/bitmaps/320x240/mask_icon_menu_tools.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_menu_ui_setup.png b/radio/src/bitmaps/320x240/mask_icon_menu_ui_setup.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_curves.png b/radio/src/bitmaps/320x240/mask_icon_model_curves.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_flight_modes.png b/radio/src/bitmaps/320x240/mask_icon_model_flight_modes.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_general.png b/radio/src/bitmaps/320x240/mask_icon_model_general.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_gvars.png b/radio/src/bitmaps/320x240/mask_icon_model_gvars.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_heli.png b/radio/src/bitmaps/320x240/mask_icon_model_heli.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_inputs.png b/radio/src/bitmaps/320x240/mask_icon_model_inputs.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_logical_switches.png b/radio/src/bitmaps/320x240/mask_icon_model_logical_switches.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_mixer.png b/radio/src/bitmaps/320x240/mask_icon_model_mixer.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_mixer_scripts.png b/radio/src/bitmaps/320x240/mask_icon_model_mixer_scripts.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_notes.png b/radio/src/bitmaps/320x240/mask_icon_model_notes.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_outputs.png b/radio/src/bitmaps/320x240/mask_icon_model_outputs.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_special_functions.png b/radio/src/bitmaps/320x240/mask_icon_model_special_functions.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_telemetry.png b/radio/src/bitmaps/320x240/mask_icon_model_telemetry.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_timers.png b/radio/src/bitmaps/320x240/mask_icon_model_timers.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_model_usb.png b/radio/src/bitmaps/320x240/mask_icon_model_usb.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_about.png b/radio/src/bitmaps/320x240/mask_icon_radio_about.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_analogs.png b/radio/src/bitmaps/320x240/mask_icon_radio_analogs.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_calibration.png b/radio/src/bitmaps/320x240/mask_icon_radio_calibration.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_general.png b/radio/src/bitmaps/320x240/mask_icon_radio_general.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_global_functions.png b/radio/src/bitmaps/320x240/mask_icon_radio_global_functions.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_hardware.png b/radio/src/bitmaps/320x240/mask_icon_radio_hardware.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_radio_trainer.png b/radio/src/bitmaps/320x240/mask_icon_radio_trainer.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_apps.png b/radio/src/bitmaps/320x240/mask_icon_tools_apps.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_debug.png b/radio/src/bitmaps/320x240/mask_icon_tools_debug.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_monitor_ch.png b/radio/src/bitmaps/320x240/mask_icon_tools_monitor_ch.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_monitor_ls.png b/radio/src/bitmaps/320x240/mask_icon_tools_monitor_ls.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_reset.png b/radio/src/bitmaps/320x240/mask_icon_tools_reset.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_stats.png b/radio/src/bitmaps/320x240/mask_icon_tools_stats.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_tools_storage.png b/radio/src/bitmaps/320x240/mask_icon_tools_storage.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_themes.png b/radio/src/bitmaps/320x240/mask_icon_ui_themes.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_topbar_setup.png b/radio/src/bitmaps/320x240/mask_icon_ui_topbar_setup.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view1.png b/radio/src/bitmaps/320x240/mask_icon_ui_view1.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view10.png b/radio/src/bitmaps/320x240/mask_icon_ui_view10.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view2.png b/radio/src/bitmaps/320x240/mask_icon_ui_view2.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view3.png b/radio/src/bitmaps/320x240/mask_icon_ui_view3.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view4.png b/radio/src/bitmaps/320x240/mask_icon_ui_view4.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view5.png b/radio/src/bitmaps/320x240/mask_icon_ui_view5.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view6.png b/radio/src/bitmaps/320x240/mask_icon_ui_view6.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view7.png b/radio/src/bitmaps/320x240/mask_icon_ui_view7.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view8.png b/radio/src/bitmaps/320x240/mask_icon_ui_view8.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view9.png b/radio/src/bitmaps/320x240/mask_icon_ui_view9.png
diff --git a/radio/src/bitmaps/320x240/mask_icon_ui_view_add.png b/radio/src/bitmaps/320x240/mask_icon_ui_view_add.png
diff --git a/radio/src/bitmaps/320x240/mask_info_busy.png b/radio/src/bitmaps/320x240/mask_info_busy.png
diff --git a/radio/src/bitmaps/320x240/mask_info_error.png b/radio/src/bitmaps/320x240/mask_info_error.png
diff --git a/radio/src/bitmaps/320x240/mask_info_shutdown.png b/radio/src/bitmaps/320x240/mask_info_shutdown.png
diff --git a/radio/src/bitmaps/320x240/mask_info_shutdown_circle0.png b/radio/src/bitmaps/320x240/mask_info_shutdown_circle0.png
diff --git a/radio/src/bitmaps/320x240/mask_info_shutdown_circle1.png b/radio/src/bitmaps/320x240/mask_info_shutdown_circle1.png
diff --git a/radio/src/bitmaps/320x240/mask_info_shutdown_circle2.png b/radio/src/bitmaps/320x240/mask_info_shutdown_circle2.png
diff --git a/radio/src/bitmaps/320x240/mask_info_shutdown_circle3.png b/radio/src/bitmaps/320x240/mask_info_shutdown_circle3.png
diff --git a/radio/src/bitmaps/320x240/mask_info_usb_plugged.png b/radio/src/bitmaps/320x240/mask_info_usb_plugged.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_add.png b/radio/src/bitmaps/320x240/mask_inline_add.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_curve.png b/radio/src/bitmaps/320x240/mask_inline_curve.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_dot.png b/radio/src/bitmaps/320x240/mask_inline_dot.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_fm.png b/radio/src/bitmaps/320x240/mask_inline_fm.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_inverted.png b/radio/src/bitmaps/320x240/mask_inline_inverted.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_locked.png b/radio/src/bitmaps/320x240/mask_inline_locked.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_multiply.png b/radio/src/bitmaps/320x240/mask_inline_multiply.png
diff --git a/radio/src/bitmaps/320x240/mask_inline_replace.png b/radio/src/bitmaps/320x240/mask_inline_replace.png
diff --git a/radio/src/bitmaps/320x240/mask_menu_edgetx.png b/radio/src/bitmaps/320x240/mask_menu_edgetx.png
diff --git a/radio/src/bitmaps/320x240/mask_menu_favs.png b/radio/src/bitmaps/320x240/mask_menu_favs.png
diff --git a/radio/src/bitmaps/320x240/mask_round_title_left.png b/radio/src/bitmaps/320x240/mask_round_title_left.png
diff --git a/radio/src/bitmaps/320x240/mask_round_title_right.png b/radio/src/bitmaps/320x240/mask_round_title_right.png
diff --git a/radio/src/bitmaps/320x240/mask_shutdown_circle0.png b/radio/src/bitmaps/320x240/mask_shutdown_circle0.png
diff --git a/radio/src/bitmaps/320x240/mask_shutdown_circle1.png b/radio/src/bitmaps/320x240/mask_shutdown_circle1.png
diff --git a/radio/src/bitmaps/320x240/mask_shutdown_circle2.png b/radio/src/bitmaps/320x240/mask_shutdown_circle2.png
diff --git a/radio/src/bitmaps/320x240/mask_shutdown_circle3.png b/radio/src/bitmaps/320x240/mask_shutdown_circle3.png
diff --git a/radio/src/bitmaps/320x240/mask_timer.png b/radio/src/bitmaps/320x240/mask_timer.png
diff --git a/radio/src/bitmaps/320x240/mask_timer_bg.png b/radio/src/bitmaps/320x240/mask_timer_bg.png
diff --git a/radio/src/bitmaps/320x240/mask_topmenu_gps_18.png b/radio/src/bitmaps/320x240/mask_topmenu_gps_18.png
diff --git a/radio/src/bitmaps/320x240/mask_txbat.png b/radio/src/bitmaps/320x240/mask_txbat.png
diff --git a/radio/src/bitmaps/320x240/mask_txbat_charging.png b/radio/src/bitmaps/320x240/mask_txbat_charging.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_bg_tile_top_left.png b/radio/src/bitmaps/320x240/mask_ui_bg_tile_top_left.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_bg_tile_top_right.png b/radio/src/bitmaps/320x240/mask_ui_bg_tile_top_right.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_bg_topbar_left.png b/radio/src/bitmaps/320x240/mask_ui_bg_topbar_left.png
diff --git a/...s/320x240/default_theme/mask_topright.png → ...tmaps/320x240/mask_ui_bg_topbar_right.png b/...s/320x240/default_theme/mask_topright.png → ...tmaps/320x240/mask_ui_bg_topbar_right.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_close.png b/radio/src/bitmaps/320x240/mask_ui_btn_close.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_grid_large.png b/radio/src/bitmaps/320x240/mask_ui_btn_grid_large.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_grid_small.png b/radio/src/bitmaps/320x240/mask_ui_btn_grid_small.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_list_one.png b/radio/src/bitmaps/320x240/mask_ui_btn_list_one.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_list_two.png b/radio/src/bitmaps/320x240/mask_ui_btn_list_two.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_next.png b/radio/src/bitmaps/320x240/mask_ui_btn_next.png
diff --git a/radio/src/bitmaps/320x240/mask_ui_btn_prev.png b/radio/src/bitmaps/320x240/mask_ui_btn_prev.png
diff --git a/radio/src/bitmaps/320x240/mask_usb_symbol.png b/radio/src/bitmaps/320x240/mask_usb_symbol.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_antenna.png b/radio/src/bitmaps/320x240/mask_widget_antenna.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_gps.png b/radio/src/bitmaps/320x240/mask_widget_gps.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_timer.png b/radio/src/bitmaps/320x240/mask_widget_timer.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_timer_bg.png b/radio/src/bitmaps/320x240/mask_widget_timer_bg.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_trim.png b/radio/src/bitmaps/320x240/mask_widget_trim.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_trim_shadow.png b/radio/src/bitmaps/320x240/mask_widget_trim_shadow.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_txbat.png b/radio/src/bitmaps/320x240/mask_widget_txbat.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_txbat_charging.png b/radio/src/bitmaps/320x240/mask_widget_txbat_charging.png
diff --git a/.../src/bitmaps/320x240/mask_topmenu_usb.png → ...o/src/bitmaps/320x240/mask_widget_usb.png b/.../src/bitmaps/320x240/mask_topmenu_usb.png → ...o/src/bitmaps/320x240/mask_widget_usb.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_volume0.png b/radio/src/bitmaps/320x240/mask_widget_volume0.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_volume1.png b/radio/src/bitmaps/320x240/mask_widget_volume1.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_volume2.png b/radio/src/bitmaps/320x240/mask_widget_volume2.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_volume3.png b/radio/src/bitmaps/320x240/mask_widget_volume3.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_volume4.png b/radio/src/bitmaps/320x240/mask_widget_volume4.png
diff --git a/radio/src/bitmaps/320x240/mask_widget_volume_scale.png b/radio/src/bitmaps/320x240/mask_widget_volume_scale.png
diff --git a/radio/src/bitmaps/320x240/splash_logo.png b/radio/src/bitmaps/320x240/splash_logo.png
diff --git a/radio/src/bitmaps/320x240/volume/mask_volume_0.png b/radio/src/bitmaps/320x240/volume/mask_volume_0.png
diff --git a/radio/src/bitmaps/320x240/volume/mask_volume_1.png b/radio/src/bitmaps/320x240/volume/mask_volume_1.png
diff --git a/radio/src/bitmaps/320x240/volume/mask_volume_2.png b/radio/src/bitmaps/320x240/volume/mask_volume_2.png
diff --git a/radio/src/bitmaps/320x240/volume/mask_volume_3.png b/radio/src/bitmaps/320x240/volume/mask_volume_3.png
diff --git a/radio/src/bitmaps/320x240/volume/mask_volume_4.png b/radio/src/bitmaps/320x240/volume/mask_volume_4.png
diff --git a/radio/src/bitmaps/320x240/volume/mask_volume_scale.png b/radio/src/bitmaps/320x240/volume/mask_volume_scale.png
diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt
@@ -2,23 +2,12 @@ set(BITMAP_SIZE_ARGS --size-format 2)
 set(BITMAP_LZ4_ARGS ${BITMAP_SIZE_ARGS} --lz4)
 set(MASK_LZ4_ARGS ${BITMAP_SIZE_ARGS} --lz4)
 
-add_bitmaps_target(bm480_splash_logo "${RADIO_SRC_DIR}/bitmaps/480x272/splash_logo.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
+add_bitmaps_target(bm480_bmps "${RADIO_SRC_DIR}/bitmaps/480x272/bmp_*.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
 add_bitmaps_target(bm480_masks "${RADIO_SRC_DIR}/bitmaps/480x272/mask_*.png" 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm480_slider_masks "${RADIO_SRC_DIR}/bitmaps/480x272/slider/*.png" 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm480_volume_masks ${RADIO_SRC_DIR}/bitmaps/480x272/volume/*.png 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm480_themes_masks "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/mask_*.png" 8bits "${MASK_LZ4_ARGS}")
-add_bitmaps_target(bm480_themes_alpha "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/alpha_*.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
-
-add_bitmaps_target(bm480_bootloader_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png" "4/4/4/4" "${BITMAP_LZ4_ARGS}")
 
 add_custom_target(bm480_bitmaps)
 
 add_dependencies(bm480_bitmaps
-  bm480_splash_logo
+  bm480_bmps
   bm480_masks
-  bm480_slider_masks
-  bm480_themes_masks
-  bm480_themes_alpha
-  bm480_volume_masks
-  bm480_bootloader_bitmaps
   )
diff --git a/radio/src/bitmaps/480x272/bmp_bootloader_plug_usb.png b/radio/src/bitmaps/480x272/bmp_bootloader_plug_usb.png
diff --git a/radio/src/bitmaps/480x272/bmp_bootloader_usb_plugged.png b/radio/src/bitmaps/480x272/bmp_bootloader_usb_plugged.png
diff --git a/radio/src/bitmaps/480x272/bmp_logo_edgetx_splash.png b/radio/src/bitmaps/480x272/bmp_logo_edgetx_splash.png
diff --git a/radio/src/bitmaps/480x272/bmp_radio_stick_background.png b/radio/src/bitmaps/480x272/bmp_radio_stick_background.png
diff --git a/radio/src/bitmaps/480x272/bmp_radio_stick_pointer.png b/radio/src/bitmaps/480x272/bmp_radio_stick_pointer.png
diff --git a/radio/src/bitmaps/480x272/bootloader/bmp_plug_usb.png b/radio/src/bitmaps/480x272/bootloader/bmp_plug_usb.png
diff --git a/radio/src/bitmaps/480x272/bootloader/bmp_usb_plugged.png b/radio/src/bitmaps/480x272/bootloader/bmp_usb_plugged.png
diff --git a/radio/src/bitmaps/480x272/default_theme/alpha_stick_background.png b/radio/src/bitmaps/480x272/default_theme/alpha_stick_background.png
diff --git a/radio/src/bitmaps/480x272/default_theme/alpha_stick_pointer.png b/radio/src/bitmaps/480x272/default_theme/alpha_stick_pointer.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_btn_close.png b/radio/src/bitmaps/480x272/default_theme/mask_btn_close.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_btn_next.png b/radio/src/bitmaps/480x272/default_theme/mask_btn_next.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_btn_prev.png b/radio/src/bitmaps/480x272/default_theme/mask_btn_prev.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_busy.png b/radio/src/bitmaps/480x272/default_theme/mask_busy.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_bg.png b/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_bg.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_dot.png b/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_dot.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_shadow.png b/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_shadow.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_edgetx.png b/radio/src/bitmaps/480x272/default_theme/mask_edgetx.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_error.png b/radio/src/bitmaps/480x272/default_theme/mask_error.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_model.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_model.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_model_select.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_model_select.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_notes.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_notes.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_radio.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_radio.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_stats.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_stats.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_theme.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_theme.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_curves.png b/radio/src/bitmaps/480x272/default_theme/mask_model_curves.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_flight_modes.png b/radio/src/bitmaps/480x272/default_theme/mask_model_flight_modes.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_grid_large.png b/radio/src/bitmaps/480x272/default_theme/mask_model_grid_large.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_grid_small.png b/radio/src/bitmaps/480x272/default_theme/mask_model_grid_small.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_gvars.png b/radio/src/bitmaps/480x272/default_theme/mask_model_gvars.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_heli.png b/radio/src/bitmaps/480x272/default_theme/mask_model_heli.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_inputs.png b/radio/src/bitmaps/480x272/default_theme/mask_model_inputs.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_list_one.png b/radio/src/bitmaps/480x272/default_theme/mask_model_list_one.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_list_two.png b/radio/src/bitmaps/480x272/default_theme/mask_model_list_two.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_logical_switches.png b/radio/src/bitmaps/480x272/default_theme/mask_model_logical_switches.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_lua_scripts.png b/radio/src/bitmaps/480x272/default_theme/mask_model_lua_scripts.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_mixer.png b/radio/src/bitmaps/480x272/default_theme/mask_model_mixer.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_outputs.png b/radio/src/bitmaps/480x272/default_theme/mask_model_outputs.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_special_functions.png b/radio/src/bitmaps/480x272/default_theme/mask_model_special_functions.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_telemetry.png b/radio/src/bitmaps/480x272/default_theme/mask_model_telemetry.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_model_usb.png b/radio/src/bitmaps/480x272/default_theme/mask_model_usb.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_monitor.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_monitor_inver.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_inver.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_monitor_lockch.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_lockch.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_monitor_logsw.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_logsw.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_mplex_add.png b/radio/src/bitmaps/480x272/default_theme/mask_mplex_add.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_mplex_multi.png b/radio/src/bitmaps/480x272/default_theme/mask_mplex_multi.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_mplex_replace.png b/radio/src/bitmaps/480x272/default_theme/mask_mplex_replace.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_calibration.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_calibration.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_edit_theme.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_edit_theme.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_global_functions.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_global_functions.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_hardware.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_hardware.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_sd_browser.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_sd_browser.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_tools.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_tools.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_trainer.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_trainer.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_radio_version.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_version.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_shutdown.png b/radio/src/bitmaps/480x272/default_theme/mask_shutdown.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_stats_analogs.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_analogs.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_stats_debug.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_debug.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_stats_timers.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_timers.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_textline_curve.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_curve.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_textline_fm.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_fm.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_add_view.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_add_view.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_setup.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_setup.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view1.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view1.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view10.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view10.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view2.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view2.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view3.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view3.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view4.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view4.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view5.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view5.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view6.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view6.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view7.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view7.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view8.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view8.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_theme_view9.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view9.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_tools_apps.png b/radio/src/bitmaps/480x272/default_theme/mask_tools_apps.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_tools_reset.png b/radio/src/bitmaps/480x272/default_theme/mask_tools_reset.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_top_logo.png b/radio/src/bitmaps/480x272/default_theme/mask_top_logo.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_topright.png b/radio/src/bitmaps/480x272/default_theme/mask_topright.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_trim.png b/radio/src/bitmaps/480x272/default_theme/mask_trim.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_trim_shadow.png b/radio/src/bitmaps/480x272/default_theme/mask_trim_shadow.png
diff --git a/radio/src/bitmaps/480x272/mask_antenna.png b/radio/src/bitmaps/480x272/mask_antenna.png
diff --git a/radio/src/bitmaps/480x272/mask_dot.png b/radio/src/bitmaps/480x272/mask_dot.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_edgetx.png b/radio/src/bitmaps/480x272/mask_icon_edgetx.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_menu_favs.png b/radio/src/bitmaps/480x272/mask_icon_menu_favs.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_menu_manage_models.png b/radio/src/bitmaps/480x272/mask_icon_menu_manage_models.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_menu_model_setup.png b/radio/src/bitmaps/480x272/mask_icon_menu_model_setup.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_menu_radio_setup.png b/radio/src/bitmaps/480x272/mask_icon_menu_radio_setup.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_menu_tools.png b/radio/src/bitmaps/480x272/mask_icon_menu_tools.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_menu_ui_setup.png b/radio/src/bitmaps/480x272/mask_icon_menu_ui_setup.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_curves.png b/radio/src/bitmaps/480x272/mask_icon_model_curves.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_flight_modes.png b/radio/src/bitmaps/480x272/mask_icon_model_flight_modes.png
diff --git a/...80x272/default_theme/mask_model_setup.png → ...tmaps/480x272/mask_icon_model_general.png b/...80x272/default_theme/mask_model_setup.png → ...tmaps/480x272/mask_icon_model_general.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_gvars.png b/radio/src/bitmaps/480x272/mask_icon_model_gvars.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_heli.png b/radio/src/bitmaps/480x272/mask_icon_model_heli.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_inputs.png b/radio/src/bitmaps/480x272/mask_icon_model_inputs.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_logical_switches.png b/radio/src/bitmaps/480x272/mask_icon_model_logical_switches.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_mixer.png b/radio/src/bitmaps/480x272/mask_icon_model_mixer.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_mixer_scripts.png b/radio/src/bitmaps/480x272/mask_icon_model_mixer_scripts.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_notes.png b/radio/src/bitmaps/480x272/mask_icon_model_notes.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_outputs.png b/radio/src/bitmaps/480x272/mask_icon_model_outputs.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_special_functions.png b/radio/src/bitmaps/480x272/mask_icon_model_special_functions.png
diff --git a/radio/src/bitmaps/480x272/mask_icon_model_telemetry.png b/radio/src/bitmaps/480x272/mask_icon_model_telemetry.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,4 @@ compile_commands.json @@
     /.idea
     /.vs
     CMakeUserPresets.json
+    .DS_Store