Update extra ir remotes to new style

applications/main/infrared/scenes/infrared_scene_universal_digital_sign.c

@@ -18,52 +18,58 @@ void infrared_scene_universal_digital_sign_on_enter(void* context) {
         i,
         0,
         0,
-        3,
-        19,
+        6,
+        24,
         &I_power_19x20,
         &I_power_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 4, 46, &I_power_text_24x5);
     infrared_brute_force_add_record(brute_force, i++, "POWER");
+
     button_panel_add_item(
         button_panel,
         i,
         1,
         0,
-        36,
-        19,
-        &I_Input_25x27,
-        &I_Input_hvr_25x27,
+        38,
+        24,
+        &I_input_19x20,
+        &I_input_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 36, 46, &I_input_text_24x5);
     infrared_brute_force_add_record(brute_force, i++, "SOURCE");
+
     button_panel_add_item(
         button_panel,
         i,
         0,
         1,
-        3,
-        64,
-        &I_Play_25x27,
-        &I_Play_hvr_25x27,
+        6,
+        58,
+        &I_play_19x20,
+        &I_play_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 6, 80, &I_play_text_19x5);
     infrared_brute_force_add_record(brute_force, i++, "PLAY");
+
     button_panel_add_item(
         button_panel,
         i,
         1,
         1,
-        36,
-        64,
-        &I_Stop_25x27,
-        &I_Stop_hvr_25x27,
+        38,
+        58,
+        &I_stop_19x20,
+        &I_stop_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 38, 80, &I_stop_text_19x5);
     infrared_brute_force_add_record(brute_force, i++, "STOP");
 
     button_panel_add_label(button_panel, 6, 11, FontPrimary, "Digital Sign");
-    button_panel_add_label(button_panel, 17, 60, FontSecondary, "Control");
 
     view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);

applications/main/infrared/scenes/infrared_scene_universal_led.c

@@ -18,52 +18,58 @@ void infrared_scene_universal_led_on_enter(void* context) {
         i,
         0,
         0,
-        3,
-        19,
+        6,
+        24,
         &I_power_19x20,
         &I_power_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 4, 46, &I_power_text_24x5);
     infrared_brute_force_add_record(brute_force, i++, "POWER");
+
     button_panel_add_item(
         button_panel,
         i,
         1,
         0,
-        36,
-        19,
-        &I_Flash_25x27,
-        &I_Flash_hvr_25x27,
-        infrared_scene_universal_common_item_callback,
-        context);
-    infrared_brute_force_add_record(brute_force, i++, "FLASH");
-    button_panel_add_item(
-        button_panel,
-        i,
-        0,
-        1,
-        3,
-        64,
+        37,
+        21,
         &I_volup_24x21,
         &I_volup_hover_24x21,
         infrared_scene_universal_common_item_callback,
         context);
     infrared_brute_force_add_record(brute_force, i++, "BRIGHTNESS+");
+
     button_panel_add_item(
         button_panel,
         i,
         1,
         1,
-        36,
-        64,
+        37,
+        55,
         &I_voldown_24x21,
         &I_voldown_hover_24x21,
         infrared_scene_universal_common_item_callback,
         context);
     infrared_brute_force_add_record(brute_force, i++, "BRIGHTNESS-");
 
+    button_panel_add_icon(button_panel, 34, 34, &I_bright_text_30x30);
+
+    button_panel_add_item(
+        button_panel,
+        i,
+        0,
+        1,
+        6,
+        53,
+        &I_flash_19x20,
+        &I_flash_hover_19x20,
+        infrared_scene_universal_common_item_callback,
+        context);
+    button_panel_add_icon(button_panel, 6, 75, &I_flash_text_21x5);
+    infrared_brute_force_add_record(brute_force, i++, "FLASH");
+
     button_panel_add_label(button_panel, 5, 11, FontPrimary, "LED Remote");
-    button_panel_add_label(button_panel, 13, 60, FontSecondary, "Brightness");
 
     view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);

applications/main/infrared/scenes/infrared_scene_universal_monitor.c

@@ -19,52 +19,58 @@ void infrared_scene_universal_monitor_on_enter(void* context) {
         i,
         0,
         0,
-        3,
+        6,
         24,
         &I_power_19x20,
         &I_power_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 4, 46, &I_power_text_24x5);
     infrared_brute_force_add_record(brute_force, i++, "POWER");
+
     button_panel_add_item(
         button_panel,
         i,
         1,
         0,
-        36,
+        38,
         24,
-        &I_Input_25x27,
-        &I_Input_hvr_25x27,
+        &I_input_19x20,
+        &I_input_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 36, 46, &I_input_text_24x5);
     infrared_brute_force_add_record(brute_force, i++, "SOURCE");
+
     button_panel_add_item(
         button_panel,
         i,
         0,
         1,
-        3,
-        66,
+        6,
+        58,
         &I_mode_19x20,
         &I_mode_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 6, 80, &I_menu_text_20x5);
     infrared_brute_force_add_record(brute_force, i++, "MENU");
+
     button_panel_add_item(
         button_panel,
         i,
         1,
         1,
-        36,
-        66,
-        &I_Exit_25x27,
-        &I_Exit_hvr_25x27,
+        38,
+        58,
+        &I_exit_19x20,
+        &I_exit_hover_19x20,
         infrared_scene_universal_common_item_callback,
         context);
+    button_panel_add_icon(button_panel, 39, 80, &I_exit_text_18x5);
     infrared_brute_force_add_record(brute_force, i++, "EXIT");
 
     button_panel_add_label(button_panel, 11, 11, FontPrimary, "Monitor");
-    button_panel_add_label(button_panel, 19, 60, FontSecondary, "Menu");
 
     view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);

firmware/targets/f7/api_symbols.csv

@@ -3403,22 +3403,16 @@ Variable,+,I_EviSmile1_18x21,Icon,
 Variable,+,I_EviSmile2_18x21,Icon,
 Variable,+,I_EviWaiting1_18x21,Icon,
 Variable,+,I_EviWaiting2_18x21,Icon,
-Variable,+,I_Exit_25x27,Icon,
-Variable,+,I_Exit_hvr_25x27,Icon,
 Variable,+,I_FaceCharging_29x14,Icon,
 Variable,+,I_FaceConfused_29x14,Icon,
 Variable,+,I_FaceNopower_29x14,Icon,
 Variable,+,I_FaceNormal_29x14,Icon,
 Variable,+,I_Fishing_123x52,Icon,
-Variable,+,I_Flash_25x27,Icon,
-Variable,+,I_Flash_hvr_25x27,Icon,
 Variable,+,I_Health_16x16,Icon,
 Variable,+,I_Hidden_window_9x8,Icon,
 Variable,+,I_InfraredArrowDown_4x8,Icon,
 Variable,+,I_InfraredArrowUp_4x8,Icon,
 Variable,+,I_InfraredLearnShort_128x31,Icon,
-Variable,+,I_Input_25x27,Icon,
-Variable,+,I_Input_hvr_25x27,Icon,
 Variable,+,I_KeyBackspaceSelected_17x11,Icon,
 Variable,+,I_KeyBackspace_17x11,Icon,
 Variable,+,I_KeyKeyboardSelected_10x11,Icon,
@@ -3466,8 +3460,6 @@ Variable,+,I_SmallArrowUp_3x5,Icon,
 Variable,+,I_Smile_18x18,Icon,
 Variable,+,I_Space_65x18,Icon,
 Variable,+,I_Static_9x7,Icon,
-Variable,+,I_Stop_25x27,Icon,
-Variable,+,I_Stop_hvr_25x27,Icon,
 Variable,+,I_Temperature_16x16,Icon,
 Variable,+,I_Unlock_7x8,Icon,
 Variable,+,I_Unplug_bg_bottom_128x10,Icon,
@@ -3481,6 +3473,7 @@ Variable,+,I_WarningDolphin_45x42,Icon,
 Variable,+,I_Warning_30x23,Icon,
 Variable,+,I_back_10px,Icon,
 Variable,+,I_badkb_10px,Icon,
+Variable,+,I_bright_text_30x30,Icon,
 Variable,+,I_celsius_24x23,Icon,
 Variable,+,I_celsius_hover_24x23,Icon,
 Variable,+,I_ch_down_24x21,Icon,
@@ -3493,8 +3486,14 @@ Variable,+,I_dir_10px,Icon,
 Variable,+,I_dry_19x20,Icon,
 Variable,+,I_dry_hover_19x20,Icon,
 Variable,+,I_dry_text_15x5,Icon,
+Variable,+,I_exit_19x20,Icon,
+Variable,+,I_exit_hover_19x20,Icon,
+Variable,+,I_exit_text_18x5,Icon,
 Variable,+,I_fahren_24x23,Icon,
 Variable,+,I_fahren_hover_24x23,Icon,
+Variable,+,I_flash_19x20,Icon,
+Variable,+,I_flash_hover_19x20,Icon,
+Variable,+,I_flash_text_21x5,Icon,
 Variable,+,I_heat_30x51,Icon,
 Variable,+,I_hourglass0_24x24,Icon,
 Variable,+,I_hourglass1_24x24,Icon,
@@ -3506,12 +3505,16 @@ Variable,+,I_hourglass6_24x24,Icon,
 Variable,+,I_iButtonDolphinVerySuccess_108x52,Icon,
 Variable,+,I_iButtonKey_49x44,Icon,
 Variable,+,I_ibutt_10px,Icon,
+Variable,+,I_input_19x20,Icon,
+Variable,+,I_input_hover_19x20,Icon,
+Variable,+,I_input_text_24x5,Icon,
 Variable,+,I_ir_10px,Icon,
 Variable,+,I_ir_scope_10px,Icon,
 Variable,+,I_keyboard_10px,Icon,
 Variable,+,I_loading_10px,Icon,
 Variable,+,I_max_24x23,Icon,
 Variable,+,I_max_hover_24x23,Icon,
+Variable,+,I_menu_text_20x5,Icon,
 Variable,+,I_mode_19x20,Icon,
 Variable,+,I_mode_hover_19x20,Icon,
 Variable,+,I_mode_text_20x5,Icon,
@@ -3543,6 +3546,9 @@ Variable,+,I_rotate_hover_19x20,Icon,
 Variable,+,I_rotate_text_24x5,Icon,
 Variable,+,I_search_10px,Icon,
 Variable,+,I_speed_text_30x30,Icon,
+Variable,+,I_stop_19x20,Icon,
+Variable,+,I_stop_hover_19x20,Icon,
+Variable,+,I_stop_text_19x5,Icon,
 Variable,+,I_sub1_10px,Icon,
 Variable,+,I_subplaylist_10px,Icon,
 Variable,+,I_subrem_10px,Icon,