diff --git a/applications/main/infrared/infrared_app.c b/applications/main/infrared/infrared_app.c
index 51e92ed19f..726caf85fe 100644
--- a/applications/main/infrared/infrared_app.c
+++ b/applications/main/infrared/infrared_app.c
@@ -195,6 +195,10 @@ static InfraredApp* infrared_alloc() {
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewMove, infrared_move_view_get_view(infrared->move_view));
 
+    infrared->loading = loading_alloc();
+    view_dispatcher_add_view(
+        view_dispatcher, InfraredViewLoading, loading_get_view(infrared->loading));
+
     if(app_state->is_debug_enabled) {
         infrared->debug_view = infrared_debug_view_alloc();
         view_dispatcher_add_view(
@@ -204,7 +208,6 @@ static InfraredApp* infrared_alloc() {
     }
 
     infrared->button_panel = button_panel_alloc();
-    infrared->loading = loading_alloc();
     infrared->progress = infrared_progress_view_alloc();
 
     infrared->last_settings = infrared_last_settings_alloc();
@@ -253,13 +256,15 @@ static void infrared_free(InfraredApp* infrared) {
     view_dispatcher_remove_view(view_dispatcher, InfraredViewMove);
     infrared_move_view_free(infrared->move_view);
 
+    view_dispatcher_remove_view(view_dispatcher, InfraredViewLoading);
+    loading_free(infrared->loading);
+
     if(app_state->is_debug_enabled) {
         view_dispatcher_remove_view(view_dispatcher, InfraredViewDebugView);
         infrared_debug_view_free(infrared->debug_view);
     }
 
     button_panel_free(infrared->button_panel);
-    loading_free(infrared->loading);
     infrared_progress_view_free(infrared->progress);
 
     view_dispatcher_free(view_dispatcher);
@@ -401,14 +406,13 @@ void infrared_tx_stop(InfraredApp* infrared) {
 }
 
 void infrared_blocking_task_start(InfraredApp* infrared, FuriThreadCallback callback) {
-    view_stack_add_view(infrared->view_stack, loading_get_view(infrared->loading));
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewLoading);
     furi_thread_set_callback(infrared->task_thread, callback);
     furi_thread_start(infrared->task_thread);
 }
 
 bool infrared_blocking_task_finalize(InfraredApp* infrared) {
     furi_thread_join(infrared->task_thread);
-    view_stack_remove_view(infrared->view_stack, loading_get_view(infrared->loading));
     return furi_thread_get_return_code(infrared->task_thread);
 }
 
diff --git a/applications/main/infrared/infrared_app_i.h b/applications/main/infrared/infrared_app_i.h
index cd5fec98d6..f45e0be8ed 100644
--- a/applications/main/infrared/infrared_app_i.h
+++ b/applications/main/infrared/infrared_app_i.h
@@ -146,6 +146,7 @@ typedef enum {
     InfraredViewDebugView,
     InfraredViewMove,
     InfraredViewVariableItemList,
+    InfraredViewLoading,
 } InfraredView;
 
 /**
@@ -218,8 +219,8 @@ void infrared_tx_stop(InfraredApp* infrared);
 /**
  * @brief Start a blocking task in a separate thread.
  *
- * If a ViewStack is currently on screen, a busy "Hourglass" animation
- * will be shown and no input will be accepted until completion.
+ * Before starting a blocking task, the current view will be replaced
+ * with a busy animation. All subsequent user input will be ignored.
  *
  * @param[in,out] infrared pointer to the application instance.
  * @param[in] callback pointer to the function to be run in the thread.
@@ -227,10 +228,11 @@ void infrared_tx_stop(InfraredApp* infrared);
 void infrared_blocking_task_start(InfraredApp* infrared, FuriThreadCallback callback);
 
 /**
- * @brief Wait for a blocking task to finish and receive the result.
+ * @brief Wait for a blocking task to finish and get the result.
  *
- * Upon the completion of a blocking task, the busy animation will be hidden
- * and input will be accepted again.
+ * The busy animation shown during the infrared_blocking_task_start() call
+ * will NOT be hidden and WILL remain on screen. If another view is needed
+ * (e.g. to display the results), the caller code MUST set it explicitly.
  *
  * @param[in,out] infrared pointer to the application instance.
  * @return true if the blocking task finished successfully, false otherwise.
diff --git a/applications/main/infrared/infrared_cli.c b/applications/main/infrared/infrared_cli.c
index c960ffa285..8ac3e65b64 100644
--- a/applications/main/infrared/infrared_cli.c
+++ b/applications/main/infrared/infrared_cli.c
@@ -10,8 +10,10 @@
 #include "infrared_signal.h"
 #include "infrared_brute_force.h"
 
-#define INFRARED_CLI_BUF_SIZE 10
-#define INFRARED_ASSETS_FOLDER "infrared/assets"
+#define INFRARED_CLI_BUF_SIZE (10U)
+#define INFRARED_CLI_FILE_NAME_SIZE (256U)
+#define INFRARED_FILE_EXTENSION ".ir"
+#define INFRARED_ASSETS_FOLDER EXT_PATH("infrared/assets")
 #define INFRARED_BRUTE_FORCE_DUMMY_INDEX 0
 
 DICT_DEF2(dict_signals, FuriString*, FURI_STRING_OPLIST, int, M_DEFAULT_OPLIST)
@@ -66,6 +68,37 @@ static void signal_received_callback(void* context, InfraredWorkerSignal* receiv
     }
 }
 
+static void infrared_cli_print_universal_remotes(void) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    File* dir = storage_file_alloc(storage);
+
+    do {
+        if(!storage_dir_open(dir, INFRARED_ASSETS_FOLDER)) break;
+
+        FileInfo file_info;
+        char file_name[INFRARED_CLI_FILE_NAME_SIZE];
+
+        while(storage_dir_read(dir, &file_info, file_name, sizeof(file_name))) {
+            if(file_info.flags & FSF_DIRECTORY) {
+                continue;
+            }
+
+            char* file_ext = strstr(file_name, INFRARED_FILE_EXTENSION);
+            if((file_ext == NULL) || (strcmp(file_ext, INFRARED_FILE_EXTENSION) != 0)) {
+                continue;
+            }
+
+            *file_ext = '\0';
+            printf("%s ", file_name);
+        }
+
+        printf("\r\n");
+    } while(false);
+
+    storage_file_free(dir);
+    furi_record_close(RECORD_STORAGE);
+}
+
 static void infrared_cli_print_usage(void) {
     printf("Usage:\r\n");
     printf("\tir rx [raw]\r\n");
@@ -85,8 +118,9 @@ static void infrared_cli_print_usage(void) {
     printf("\tir decode <input_file> [<output_file>]\r\n");
     printf("\tir universal <remote_name> <signal_name>\r\n");
     printf("\tir universal list <remote_name>\r\n");
-    // TODO FL-3496: Do not hardcode universal remote names
-    printf("\tAvailable universal remotes: tv audio ac projector\r\n");
+    printf("\tAvailable universal remotes: ");
+
+    infrared_cli_print_universal_remotes();
 }
 
 static void infrared_cli_start_ir_rx(Cli* cli, FuriString* args) {
@@ -211,7 +245,6 @@ static bool infrared_cli_decode_raw_signal(
 
     size_t i;
     for(i = 0; i < raw_signal->timings_size; ++i) {
-        // TODO FL-3523: Any infrared_check_decoder_ready() magic?
         const InfraredMessage* message = infrared_decode(decoder, level, raw_signal->timings[i]);
 
         if(message) {
@@ -365,7 +398,10 @@ static void infrared_cli_list_remote_signals(FuriString* remote_name) {
     Storage* storage = furi_record_open(RECORD_STORAGE);
     FlipperFormat* ff = flipper_format_buffered_file_alloc(storage);
     FuriString* remote_path = furi_string_alloc_printf(
-        "%s/%s.ir", EXT_PATH(INFRARED_ASSETS_FOLDER), furi_string_get_cstr(remote_name));
+        "%s/%s%s",
+        INFRARED_ASSETS_FOLDER,
+        furi_string_get_cstr(remote_name),
+        INFRARED_FILE_EXTENSION);
 
     do {
         if(!flipper_format_buffered_file_open_existing(ff, furi_string_get_cstr(remote_path))) {
@@ -413,7 +449,7 @@ static void
     infrared_cli_brute_force_signals(Cli* cli, FuriString* remote_name, FuriString* signal_name) {
     InfraredBruteForce* brute_force = infrared_brute_force_alloc();
     FuriString* remote_path = furi_string_alloc_printf(
-        "%s/%s.ir", EXT_PATH(INFRARED_ASSETS_FOLDER), furi_string_get_cstr(remote_name));
+        "%s/%s.ir", INFRARED_ASSETS_FOLDER, furi_string_get_cstr(remote_name));
 
     infrared_brute_force_set_db_filename(brute_force, furi_string_get_cstr(remote_path));
     infrared_brute_force_add_record(
diff --git a/applications/main/infrared/resources/infrared/assets/ac.ir b/applications/main/infrared/resources/infrared/assets/ac.ir
index 2f076fbabd..38db599b23 100644
--- a/applications/main/infrared/resources/infrared/assets/ac.ir
+++ b/applications/main/infrared/resources/infrared/assets/ac.ir
@@ -983,3 +983,41 @@ type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 301 132136 5036 2167 337 1766 361 689 358 692 366 684 363 1770 357 692 366 684 363 718 329 690 357 1776 361 687 360 1773 364 1767 360 689 358 1775 362 1769 357 1774 363 1768 359 1773 364 684 363 718 329 1773 364 684 363 718 329 691 356 694 364 716 331 719 328 1775 362 1769 358 1774 363 1768 359 1772 365 714 333 1770 357 1774 363 716 331 719 328 722 336 715 332 718 329 721 326 724 334 716 331 719 328 722 336 715 332 718 329 1773 364 1767 360 1772 354 1777 360 719 328 721 326 725 333 717 330 29455 5036 2139 354 1777 360 688 359 691 367 714 333 1770 356 692 366 684 363 687 360 690 357 1776 361 688 359 1773 364 1768 359 689 358 1775 362 1769 357 1774 363 1768 359 1773 364 684 363 687 360 1773 364 685 362 688 359 691 356 694 364 686 361 689 358 692 366 685 362 688 359 691 356 1777 360 1771 355 693 365 685 362 1771 355 693 365 1768 359 1773 364 1767 360 689 358 692 366 685 362 1771 355 1775 362 687 360 690 357 1775 362 687 360 690 357 693 365 716 331 689 358 1774 363 686 361 689 358 692 366 685 362 688 359 691 356 694 364 686 361 689 358 692 366 685 362 688 359 691 356 694 364 686 361 689 358 692 366 685 362 1771 355 693 365 1768 358 1773 364 684 363 687 360 690 357 693 365 1768 359 690 357 1776 361 688 359 691 356 694 364 686 361 689 358 692 366 685 362 1770 356 693 365 685 362 688 359 691 356 1777 360 1771 355 693 365 686 361 689 358 692 366 685 362 1770 356
+#
+# Model: Fujitsu ASYG24KMTB
+#
+name: Dh
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3302 1639 405 423 407 420 410 1234 405 421 409 1210 440 387 432 420 410 417 413 1231 408 1238 412 388 431 422 408 392 438 1233 406 1238 412 389 430 396 434 419 411 390 440 413 406 394 436 391 439 388 431 421 409 417 413 414 405 421 409 392 438 1233 406 421 409 417 413 414 405 395 435 418 412 388 432 421 409 1236 414 387 432 420 410 390 440 388 431 1213 437 1208 431 1239 411 1234 405 1213 437 1208 431 1214 436 1235 415 386 433 420 410 1234 405 422 408 418 412 389 431 396 434 1211 439 388 432 422 408 418 412 1233 406 1238 412 415 404 422 408 1237 413 388 432 422 408 1236 414 1205 434 1210 440 1205 434 392 438 390 440 1231 408 392 438 415 404 396 434 392 438 415 404 422 408 419 411 416 414 412 407 394 436 417 413 414 405 421 409 417 413 1232 407 419 411 390 440 1204 435 418 412 415 415 412 407 419 411 1208 431 421 409 418 412 388 432 421 409 392 438 415 404 395 435 1211 439 388 432 1213 437 416 414 386 433 1212 438 415 404 396 434 392 438 416 414 413 406 420 410 417 413 1231 409 418 412 389 430 1240 410 391 439 1205 434 420 410 390 440 387 432 420 410 417 413
+# 
+name: Cool_hi
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3293 1649 405 396 434 419 411 1207 432 395 435 1236 414 413 406 394 436 417 413 1232 407 1212 438 415 404 396 434 419 411 1234 405 1239 411 417 413 414 405 421 409 419 411 389 430 423 407 393 437 416 414 387 432 394 436 417 413 388 431 421 409 1236 414 387 432 421 409 418 412 414 405 422 408 418 412 415 404 1240 410 391 439 414 405 421 409 419 411 1234 405 1239 411 1208 431 1239 411 1235 404 1214 436 1210 440 1205 434 419 411 416 414 1204 435 418 412 415 404 396 434 393 437 1235 404 396 434 420 410 416 414 1231 408 1210 440 387 432 421 409 1235 415 414 405 395 435 418 412 1232 407 420 410 1208 431 422 408 1237 413 415 404 396 434 419 411 416 414 413 406 420 410 417 413 414 405 421 409 418 412 415 404 422 408 419 411 416 414 413 406 1238 412 415 404 422 408 1237 413 414 405 421 409 418 412 416 414 1231 408 418 412 415 404 422 408 419 411 416 414 413 406 420 410 1235 404 423 407 420 410 1234 405 422 408 1210 440 414 405 421 409 392 438 415 404 422 408 420 410 417 413 1231 408 419 411 416 414 413 406 1237 413 415 404 1239 411 417 413 1232 407 420 410 417 413
+# 
+name: Cool_lo
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3302 1614 440 414 405 421 409 1235 414 413 406 1238 411 415 404 422 408 419 411 1234 405 1240 409 418 412 415 404 422 408 1237 412 1232 407 420 410 417 413 414 405 422 408 419 411 416 414 413 406 420 410 417 413 414 405 421 409 418 412 415 404 1239 410 418 412 415 404 422 408 419 411 416 414 413 406 420 410 1234 405 422 408 419 411 416 414 414 405 1239 411 1207 432 1239 410 1235 414 1230 409 1236 413 1232 407 1237 412 415 415 412 407 1237 412 414 405 422 408 419 411 416 414 1231 408 419 411 416 414 413 406 1238 411 1206 433 421 409 418 412 1206 433 421 409 418 412 1206 433 1238 412 1207 432 1213 436 390 440 1232 407 420 410 417 413 414 405 421 409 418 412 415 404 422 408 419 411 416 414 413 406 421 409 418 412 415 404 422 408 419 411 1233 406 421 409 418 412 1232 407 420 410 418 412 389 430 422 408 1210 440 414 405 395 435 418 412 415 404 423 407 420 410 416 414 414 405 422 408 418 412 415 404 1240 409 1235 414 413 406 420 410 417 413 414 405 422 408 419 411 416 414 1231 408 418 412 415 404 1240 409 1209 440 387 432 1212 437 1234 405 1214 435 1209 440 1204 435
+# 
+name: Heat_hi
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3301 1615 439 415 404 422 408 1210 439 414 405 1239 410 416 414 414 405 395 435 1209 440 1205 434 419 411 417 413 414 405 1212 437 1207 432 422 408 419 411 416 414 414 405 421 409 418 412 415 404 422 408 393 437 416 414 413 406 420 410 417 413 1205 434 420 410 417 413 414 405 421 409 418 412 415 404 422 408 1210 439 414 405 422 408 419 411 417 413 1205 434 1236 413 1206 433 1211 438 1207 432 1212 437 1209 440 1204 435 418 412 415 415 1204 435 418 412 415 404 422 408 419 411 1208 441 412 407 420 410 417 413 1205 434 1237 412 414 405 422 408 1210 439 415 404 396 434 419 411 1207 432 1213 436 417 413 1205 434 420 410 417 413 1231 408 419 411 416 414 413 406 421 409 418 412 414 405 422 408 419 411 415 404 424 406 421 409 418 412 415 404 1239 410 417 413 414 405 1239 410 416 414 413 406 422 408 419 411 1233 406 421 409 418 412 415 404 423 407 419 411 416 414 413 406 1238 411 416 414 413 406 421 409 1235 414 1230 409 418 412 415 415 412 407 420 410 417 413 414 405 422 408 1236 413 413 406 421 409 1235 414 1204 435 1210 439 1206 433 1212 437 1207 432 395 435 1236 413
+# 
+name: Heat_lo
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3295 1646 408 420 410 390 440 1205 434 393 437 1234 405 421 409 419 411 415 415 1230 409 1210 440 414 405 421 409 418 412 1233 406 1212 437 416 414 413 406 394 436 418 412 415 404 422 408 393 437 416 414 413 406 420 410 417 413 414 405 421 409 1236 413 414 405 421 409 418 412 415 404 423 407 419 411 416 414 1231 408 418 412 415 415 412 407 421 409 1235 414 1204 435 1209 441 1205 434 1210 440 1205 434 1212 437 1207 432 395 435 419 411 1233 406 421 409 418 412 415 404 422 408 1238 411 415 404 396 434 419 411 1234 405 1239 410 417 413 414 405 1213 436 417 413 414 405 1213 436 1235 404 1214 435 1209 441 413 406 421 409 418 412 1206 433 394 436 418 412 388 431 422 408 419 411 415 415 386 433 420 410 418 412 414 405 422 408 419 411 389 430 1241 408 418 412 415 404 1240 409 417 413 414 405 395 435 419 411 1233 406 395 435 418 412 415 404 422 408 419 411 416 414 413 406 421 409 1236 413 413 406 394 436 1235 414 1230 409 418 412 415 404 422 408 420 410 417 413 414 405 421 409 1236 413 413 406 420 410 417 413 1232 407 1237 412 416 414 1230 409 1236 413 1205 434 1210 439
+# 
+name: Off
+type: raw
+frequency: 38000
+duty_cycle: 0.330000
+data: 3302 1640 404 423 407 420 410 1212 437 390 440 1234 405 395 435 392 438 415 415 1207 432 1242 407 420 410 391 439 414 405 1243 406 1241 408 392 438 415 415 386 433 393 437 390 440 414 405 396 434 419 411 389 441 412 407 420 410 390 440 387 432 1242 407 393 437 390 440 414 405 395 435 392 438 389 430 396 434 1240 409 417 413 414 405 395 435 419 411 1237 412 389 430 396 434 393 437 416 414 387 432 394 436 1212 437 389 441 1234 405 1217 432 1241 408 1213 436 1212 437 1210 439
diff --git a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
index 9fc48bd46b..9bdcdc4a82 100644
--- a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
+++ b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c
@@ -46,7 +46,6 @@ void infrared_scene_universal_common_on_enter(void* context) {
     InfraredApp* infrared = context;
     view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
     view_stack_add_view(infrared->view_stack, button_panel_get_view(infrared->button_panel));
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
 
     // Load universal remote data in background
     infrared_blocking_task_start(infrared, infrared_scene_universal_common_task_callback);
@@ -98,6 +97,8 @@ bool infrared_scene_universal_common_on_event(void* context, SceneManagerEvent e
 
                 if(!task_success) {
                     scene_manager_next_scene(infrared->scene_manager, InfraredSceneErrorDatabases);
+                } else {
+                    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
                 }
             }
             consumed = true;
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_delete.c b/applications/main/infrared/scenes/infrared_scene_edit_delete.c
index 8dc4ab6f9f..90a2633d33 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_delete.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_delete.c
@@ -91,10 +91,7 @@ void infrared_scene_edit_delete_on_enter(void* context) {
     dialog_ex_set_result_callback(dialog_ex, infrared_scene_edit_delete_dialog_result_callback);
     dialog_ex_set_context(dialog_ex, context);
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationHorizontal);
-    view_stack_add_view(infrared->view_stack, dialog_ex_get_view(infrared->dialog_ex));
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewDialogEx);
 }
 
 bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event) {
@@ -136,5 +133,5 @@ bool infrared_scene_edit_delete_on_event(void* context, SceneManagerEvent event)
 
 void infrared_scene_edit_delete_on_exit(void* context) {
     InfraredApp* infrared = context;
-    view_stack_remove_view(infrared->view_stack, dialog_ex_get_view(infrared->dialog_ex));
+    dialog_ex_reset(infrared->dialog_ex);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_move.c b/applications/main/infrared/scenes/infrared_scene_edit_move.c
index 500f3d791e..fcac1fc15e 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_move.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_move.c
@@ -38,10 +38,7 @@ void infrared_scene_edit_move_on_enter(void* context) {
     infrared_move_view_set_callback(
         infrared->move_view, infrared_scene_edit_move_button_callback, infrared);
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationHorizontal);
-    view_stack_add_view(infrared->view_stack, infrared_move_view_get_view(infrared->move_view));
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewMove);
 }
 
 bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
@@ -62,6 +59,8 @@ bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
                 infrared_show_error_message(infrared, "Failed to move\n\"%s\"", signal_name);
                 scene_manager_search_and_switch_to_previous_scene(
                     infrared->scene_manager, InfraredSceneRemoteList);
+            } else {
+                view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewMove);
             }
         }
         consumed = true;
@@ -72,6 +71,5 @@ bool infrared_scene_edit_move_on_event(void* context, SceneManagerEvent event) {
 
 void infrared_scene_edit_move_on_exit(void* context) {
     InfraredApp* infrared = context;
-    view_stack_remove_view(infrared->view_stack, infrared_move_view_get_view(infrared->move_view));
     infrared_move_view_reset(infrared->move_view);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_rename.c b/applications/main/infrared/scenes/infrared_scene_edit_rename.c
index 2763c27773..a546ad6e50 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_rename.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_rename.c
@@ -75,10 +75,7 @@ void infrared_scene_edit_rename_on_enter(void* context) {
         enter_name_length,
         false);
 
-    view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationHorizontal);
-    view_stack_add_view(infrared->view_stack, text_input_get_view(infrared->text_input));
-
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewTextInput);
 }
 
 bool infrared_scene_edit_rename_on_event(void* context, SceneManagerEvent event) {
@@ -117,12 +114,10 @@ void infrared_scene_edit_rename_on_exit(void* context) {
     InfraredApp* infrared = context;
     TextInput* text_input = infrared->text_input;
 
-    view_stack_remove_view(infrared->view_stack, text_input_get_view(text_input));
-
-    void* validator_context = text_input_get_validator_callback_context(text_input);
-    text_input_set_validator(text_input, NULL, NULL);
-
+    ValidatorIsFile* validator_context = text_input_get_validator_callback_context(text_input);
     if(validator_context) {
-        validator_is_file_free((ValidatorIsFile*)validator_context);
+        validator_is_file_free(validator_context);
     }
+
+    text_input_reset(text_input);
 }
diff --git a/applications/main/infrared/scenes/infrared_scene_remote_list.c b/applications/main/infrared/scenes/infrared_scene_remote_list.c
index 744409a7ab..9c880ac2fb 100644
--- a/applications/main/infrared/scenes/infrared_scene_remote_list.c
+++ b/applications/main/infrared/scenes/infrared_scene_remote_list.c
@@ -18,9 +18,6 @@ static void infrared_scene_remote_list_select_and_load(InfraredApp* infrared) {
         infrared->dialogs, infrared->file_path, infrared->file_path, &browser_options);
 
     if(file_selected) {
-        view_set_orientation(view_stack_get_view(infrared->view_stack), ViewOrientationVertical);
-        view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
         // Load the remote in a separate thread
         infrared_blocking_task_start(infrared, infrared_scene_remote_list_task_callback);
 
diff --git a/applications/main/infrared/scenes/infrared_scene_rpc.c b/applications/main/infrared/scenes/infrared_scene_rpc.c
index 03a2bff010..4c263a1175 100644
--- a/applications/main/infrared/scenes/infrared_scene_rpc.c
+++ b/applications/main/infrared/scenes/infrared_scene_rpc.c
@@ -30,11 +30,8 @@ void infrared_scene_rpc_on_enter(void* context) {
     popup_set_context(popup, context);
     popup_set_callback(popup, infrared_popup_closed_callback);
 
-    view_stack_add_view(infrared->view_stack, popup_get_view(infrared->popup));
-    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewStack);
-
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewPopup);
     scene_manager_set_scene_state(infrared->scene_manager, InfraredSceneRpc, InfraredRpcStateIdle);
-
     notification_message(infrared->notifications, &sequence_display_backlight_on);
 }
 
@@ -69,6 +66,7 @@ bool infrared_scene_rpc_on_event(void* context, SceneManagerEvent event) {
 
             popup_set_text(
                 infrared->popup, infrared->text_store[0], 89, 44, AlignCenter, AlignTop);
+            view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewPopup);
 
             rpc_system_app_confirm(infrared->rpc_ctx, task_success);
 
@@ -135,6 +133,5 @@ void infrared_scene_rpc_on_exit(void* context) {
         infrared_tx_stop(infrared);
     }
 
-    view_stack_remove_view(infrared->view_stack, popup_get_view(infrared->popup));
     popup_reset(infrared->popup);
 }
diff --git a/applications/services/gui/view_dispatcher.h b/applications/services/gui/view_dispatcher.h
index 67a3fc40ba..bec15f6e3b 100644
--- a/applications/services/gui/view_dispatcher.h
+++ b/applications/services/gui/view_dispatcher.h
@@ -1,6 +1,8 @@
 /**
  * @file view_dispatcher.h
- * GUI: ViewDispatcher API
+ * @brief GUI: ViewDispatcher API
+ *
+ * @warning Views added to a ViewDispatcher MUST NOT be in a ViewStack at the same time.
  */
 
 #pragma once
diff --git a/applications/services/gui/view_holder.h b/applications/services/gui/view_holder.h
index 8e7db3b857..0bd29652ce 100644
--- a/applications/services/gui/view_holder.h
+++ b/applications/services/gui/view_holder.h
@@ -1,3 +1,9 @@
+/**
+ * @file view_holder.h
+ * @brief GUI: ViewHolder API
+ *
+ * @warning View added to a ViewHolder MUST NOT be in a ViewStack at the same time.
+ */
 #pragma once
 
 #include <gui/view.h>
diff --git a/applications/services/gui/view_stack.h b/applications/services/gui/view_stack.h
index ebe65ab88f..5cfcbc5abb 100644
--- a/applications/services/gui/view_stack.h
+++ b/applications/services/gui/view_stack.h
@@ -1,11 +1,13 @@
 /**
  * @file view_stack.h
- * GUI: ViewStack API
+ * @brief GUI: ViewStack API
  *
  * ViewStack accumulates several Views in one stack.
  * Draw callbacks are called sequentially starting from
  * first added. Input callbacks are called in reverse order.
  * Consumed input is not passed on underlying layers.
+ *
+ * @warning Views added to a ViewStack MUST NOT be in a ViewDispatcher or a ViewHolder at the same time.
  */
 
 #pragma once
diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c
index 9f9a2a8dd6..15a1338183 100644
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -193,8 +193,6 @@ bool rpc_pb_stream_read(pb_istream_t* istream, pb_byte_t* buf, size_t count) {
     furi_assert(session);
     furi_assert(istream->bytes_left);
 
-    /* TODO FL-3768 this function may be called after
-       marking the worker for termination */
     if(session->terminate) {
         return false;
     }
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
index 5af033d4ca..f6e638d7c5 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
@@ -225,8 +225,8 @@ static bool mf_desfire_poller_detect(NfcGenericEvent event, void* context) {
     bool protocol_detected = false;
 
     if(iso14443_4a_event->type == Iso14443_4aPollerEventTypeReady) {
-        MfDesfireVersion version = {};
-        const MfDesfireError error = mf_desfire_poller_read_version(instance, &version);
+        MfDesfireKeyVersion key_version = 0;
+        MfDesfireError error = mf_desfire_poller_read_key_version(instance, 0, &key_version);
         protocol_detected = (error == MfDesfireErrorNone);
     }
 
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
index 6ef2f3f68d..707df42cd6 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.h
@@ -91,6 +91,21 @@ MfDesfireError
 MfDesfireError
     mf_desfire_poller_read_key_settings(MfDesfirePoller* instance, MfDesfireKeySettings* data);
 
+/**
+ * @brief Read key version on MfDesfire card.
+ *
+ * Must ONLY be used inside the callback function.
+ *
+ * @param[in, out] instance pointer to the instance to be used in the transaction.
+ * @param[out] key_num key number.
+ * @param[in] data pointer to the MfDesfireKeyVersion structure to be filled with key version data.
+ * @return MfDesfireErrorNone on success, an error code on failure.
+ */
+MfDesfireError mf_desfire_poller_read_key_version(
+    MfDesfirePoller* instance,
+    uint8_t key_num,
+    MfDesfireKeyVersion* data);
+
 /**
  * @brief Read key versions on MfDesfire card.
  *
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
index 0b2d841382..1a91c5261a 100644
--- a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
+++ b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
@@ -139,6 +139,28 @@ MfDesfireError
     return error;
 }
 
+MfDesfireError mf_desfire_poller_read_key_version(
+    MfDesfirePoller* instance,
+    uint8_t key_num,
+    MfDesfireKeyVersion* data) {
+    furi_assert(instance);
+    furi_assert(data);
+
+    bit_buffer_set_size_bytes(instance->input_buffer, sizeof(uint8_t) * 2);
+    bit_buffer_set_byte(instance->input_buffer, 0, MF_DESFIRE_CMD_GET_KEY_VERSION);
+    bit_buffer_set_byte(instance->input_buffer, 1, key_num);
+
+    MfDesfireError error =
+        mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer);
+    if(error == MfDesfireErrorNone) {
+        if(!mf_desfire_key_version_parse(data, instance->result_buffer)) {
+            error = MfDesfireErrorProtocol;
+        }
+    }
+
+    return error;
+}
+
 MfDesfireError mf_desfire_poller_read_key_versions(
     MfDesfirePoller* instance,
     SimpleArray* data,
@@ -148,22 +170,11 @@ MfDesfireError mf_desfire_poller_read_key_versions(
 
     simple_array_init(data, count);
 
-    bit_buffer_set_size_bytes(instance->input_buffer, sizeof(uint8_t) * 2);
-    bit_buffer_set_byte(instance->input_buffer, 0, MF_DESFIRE_CMD_GET_KEY_VERSION);
-
     MfDesfireError error = MfDesfireErrorNone;
 
     for(uint32_t i = 0; i < count; ++i) {
-        bit_buffer_set_byte(instance->input_buffer, 1, i);
-
-        error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer);
-
+        error = mf_desfire_poller_read_key_version(instance, i, simple_array_get(data, i));
         if(error != MfDesfireErrorNone) break;
-
-        if(!mf_desfire_key_version_parse(simple_array_get(data, i), instance->result_buffer)) {
-            error = MfDesfireErrorProtocol;
-            break;
-        }
     }
 
     return error;
diff --git a/lib/nfc/protocols/slix/slix.c b/lib/nfc/protocols/slix/slix.c
index b575baa728..6361787d3f 100644
--- a/lib/nfc/protocols/slix/slix.c
+++ b/lib/nfc/protocols/slix/slix.c
@@ -78,8 +78,8 @@ typedef struct {
 static const SlixPasswordConfig slix_password_configs[] = {
     [SlixPasswordTypeRead] = {SLIX_PASSWORD_READ_KEY, SLIX_TYPE_FEATURE_READ, 0x00000000U},
     [SlixPasswordTypeWrite] = {SLIX_PASSWORD_WRITE_KEY, SLIX_TYPE_FEATURE_WRITE, 0x00000000U},
-    [SlixPasswordTypePrivacy] = {SLIX_PASSWORD_PRIVACY_KEY, SLIX_TYPE_FEATURE_PRIVACY, 0xFFFFFFFFU},
-    [SlixPasswordTypeDestroy] = {SLIX_PASSWORD_DESTROY_KEY, SLIX_TYPE_FEATURE_DESTROY, 0xFFFFFFFFU},
+    [SlixPasswordTypePrivacy] = {SLIX_PASSWORD_PRIVACY_KEY, SLIX_TYPE_FEATURE_PRIVACY, 0x0F0F0F0FU},
+    [SlixPasswordTypeDestroy] = {SLIX_PASSWORD_DESTROY_KEY, SLIX_TYPE_FEATURE_DESTROY, 0x0F0F0F0FU},
     [SlixPasswordTypeEasAfi] = {SLIX_PASSWORD_EAS_KEY, SLIX_TYPE_FEATURE_EAS, 0x00000000U},
 };
 
diff --git a/lib/nfc/protocols/slix/slix_poller.c b/lib/nfc/protocols/slix/slix_poller.c
index d9d38d1020..3c9a7cce4b 100644
--- a/lib/nfc/protocols/slix/slix_poller.c
+++ b/lib/nfc/protocols/slix/slix_poller.c
@@ -73,17 +73,62 @@ static NfcCommand slix_poller_handler_read_signature(SlixPoller* instance) {
     if(slix_type_has_features(instance->type, SLIX_TYPE_FEATURE_SIGNATURE)) {
         instance->error = slix_poller_read_signature(instance, &instance->data->signature);
         if(instance->error == SlixErrorNone) {
-            instance->poller_state = SlixPollerStateReady;
+            instance->poller_state = SlixPollerStateCheckPrivacyPassword;
         } else {
             instance->poller_state = SlixPollerStateError;
         }
     } else {
-        instance->poller_state = SlixPollerStateReady;
+        instance->poller_state = SlixPollerStateCheckPrivacyPassword;
     }
 
     return NfcCommandContinue;
 }
 
+static NfcCommand slix_poller_handler_check_privacy_password(SlixPoller* instance) {
+    NfcCommand command = NfcCommandContinue;
+
+    do {
+        if(!slix_type_has_features(instance->type, SLIX_TYPE_FEATURE_PRIVACY)) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+        if(instance->privacy_password_checked) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+
+        instance->slix_event.type = SlixPollerEventTypePrivacyUnlockRequest;
+        command = instance->callback(instance->general_event, instance->context);
+
+        if(!instance->slix_event_data.privacy_password.password_set) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+
+        SlixPassword pwd = instance->slix_event_data.privacy_password.password;
+        FURI_LOG_I(TAG, "Trying to check privacy password: %08lX", pwd);
+
+        instance->error = slix_poller_get_random_number(instance, &instance->random_number);
+        if(instance->error != SlixErrorNone) {
+            instance->poller_state = SlixPollerStateReady;
+            break;
+        }
+
+        instance->error = slix_poller_set_password(instance, SlixPasswordTypePrivacy, pwd);
+        if(instance->error != SlixErrorNone) {
+            command = NfcCommandReset;
+            break;
+        }
+
+        FURI_LOG_I(TAG, "Found privacy password");
+        instance->data->passwords[SlixPasswordTypePrivacy] = pwd;
+        instance->privacy_password_checked = true;
+        instance->poller_state = SlixPollerStateReady;
+    } while(false);
+
+    return command;
+}
+
 static NfcCommand slix_poller_handler_privacy_unlock(SlixPoller* instance) {
     NfcCommand command = NfcCommandContinue;
     instance->poller_state = SlixPollerStateError;
@@ -108,6 +153,7 @@ static NfcCommand slix_poller_handler_privacy_unlock(SlixPoller* instance) {
 
         FURI_LOG_I(TAG, "Privacy mode disabled");
         instance->data->passwords[SlixPasswordTypePrivacy] = pwd;
+        instance->privacy_password_checked = true;
         instance->poller_state = SlixPollerStateIdle;
         slix_unlocked = true;
     } while(false);
@@ -140,6 +186,7 @@ static const SlixPollerStateHandler slix_poller_state_handler[SlixPollerStateNum
     [SlixPollerStateError] = slix_poller_handler_error,
     [SlixPollerStateGetNxpSysInfo] = slix_poller_handler_get_nfc_system_info,
     [SlixPollerStateReadSignature] = slix_poller_handler_read_signature,
+    [SlixPollerStateCheckPrivacyPassword] = slix_poller_handler_check_privacy_password,
     [SlixPollerStatePrivacyUnlock] = slix_poller_handler_privacy_unlock,
     [SlixPollerStateReady] = slix_poller_handler_ready,
 };
diff --git a/lib/nfc/protocols/slix/slix_poller_i.h b/lib/nfc/protocols/slix/slix_poller_i.h
index 7a3b543b7b..38c23c297b 100644
--- a/lib/nfc/protocols/slix/slix_poller_i.h
+++ b/lib/nfc/protocols/slix/slix_poller_i.h
@@ -14,6 +14,7 @@ typedef enum {
     SlixPollerStateIdle,
     SlixPollerStateGetNxpSysInfo,
     SlixPollerStateReadSignature,
+    SlixPollerStateCheckPrivacyPassword,
     SlixPollerStatePrivacyUnlock,
     SlixPollerStateReady,
     SlixPollerStateError,
@@ -27,6 +28,7 @@ struct SlixPoller {
     SlixPollerState poller_state;
     SlixError error;
     SlixRandomNumber random_number;
+    bool privacy_password_checked;
 
     BitBuffer* tx_buffer;
     BitBuffer* rx_buffer;
diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
index bdfa8c7a4e..8f6b8530e1 100644
--- a/targets/f18/api_symbols.csv
+++ b/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,58.0,,
+Version,+,58.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 1b29d5f3e2..8a6ef10ec6 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,58.0,,
+Version,+,58.1,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/main/archive/helpers/archive_helpers_ext.h,,
 Header,+,applications/main/subghz/subghz_fap.h,,
@@ -2553,6 +2553,7 @@ Function,+,mf_desfire_poller_read_file_settings_multi,MfDesfireError,"MfDesfireP
 Function,+,mf_desfire_poller_read_file_value,MfDesfireError,"MfDesfirePoller*, MfDesfireFileId, MfDesfireFileData*"
 Function,+,mf_desfire_poller_read_free_memory,MfDesfireError,"MfDesfirePoller*, MfDesfireFreeMemory*"
 Function,+,mf_desfire_poller_read_key_settings,MfDesfireError,"MfDesfirePoller*, MfDesfireKeySettings*"
+Function,+,mf_desfire_poller_read_key_version,MfDesfireError,"MfDesfirePoller*, uint8_t, MfDesfireKeyVersion*"
 Function,+,mf_desfire_poller_read_key_versions,MfDesfireError,"MfDesfirePoller*, SimpleArray*, uint32_t"
 Function,+,mf_desfire_poller_read_version,MfDesfireError,"MfDesfirePoller*, MfDesfireVersion*"
 Function,+,mf_desfire_poller_select_application,MfDesfireError,"MfDesfirePoller*, const MfDesfireApplicationId*"