diff --git a/applications/debug/accessor/helpers/wiegand.cpp b/applications/debug/accessor/helpers/wiegand.cpp
index 5cb3a85f5..10b284eaa 100644
--- a/applications/debug/accessor/helpers/wiegand.cpp
+++ b/applications/debug/accessor/helpers/wiegand.cpp
@@ -174,7 +174,7 @@ bool WIEGAND::DoWiegandConversion() {
                     return false;
                 }
 
-                // TODO: Handle validation failure case!
+                // TODO FL-3490: Handle validation failure case!
             } else if(4 == _bitCount) {
                 // 4-bit Wiegand codes have no data integrity check so we just
                 // read the LOW nibble.
diff --git a/applications/debug/subghz_test/views/subghz_test_packet.c b/applications/debug/subghz_test/views/subghz_test_packet.c
index bab83ab5b..1f3458296 100644
--- a/applications/debug/subghz_test/views/subghz_test_packet.c
+++ b/applications/debug/subghz_test/views/subghz_test_packet.c
@@ -56,7 +56,6 @@ static void subghz_test_packet_rx_callback(bool level, uint32_t duration, void*
     subghz_decoder_princeton_for_testing_parse(instance->decoder, level, duration);
 }
 
-//todo
 static void subghz_test_packet_rx_pt_callback(SubGhzDecoderPrinceton* parser, void* context) {
     UNUSED(parser);
     furi_assert(context);
diff --git a/applications/debug/unit_tests/furi/furi_memmgr_test.c b/applications/debug/unit_tests/furi/furi_memmgr_test.c
index f7bc234a0..05d967a99 100644
--- a/applications/debug/unit_tests/furi/furi_memmgr_test.c
+++ b/applications/debug/unit_tests/furi/furi_memmgr_test.c
@@ -26,7 +26,7 @@ void test_furi_memmgr() {
         mu_assert_int_eq(66, ((uint8_t*)ptr)[i]);
     }
 
-    // TODO: fix realloc to copy only old size, and write testcase that leftover of reallocated memory is zero-initialized
+    // TODO FL-3492: fix realloc to copy only old size, and write testcase that leftover of reallocated memory is zero-initialized
     free(ptr);
 
     // allocate and zero-initialize array (calloc)
diff --git a/applications/debug/unit_tests/furi/furi_string_test.c b/applications/debug/unit_tests/furi/furi_string_test.c
index 3ea95b92b..6cbcc0dcc 100644
--- a/applications/debug/unit_tests/furi/furi_string_test.c
+++ b/applications/debug/unit_tests/furi/furi_string_test.c
@@ -69,7 +69,7 @@ MU_TEST(mu_test_furi_string_mem) {
     mu_check(string != NULL);
     mu_check(!furi_string_empty(string));
 
-    // TODO: how to test furi_string_reserve?
+    // TODO FL-3493: how to test furi_string_reserve?
 
     // test furi_string_reset
     furi_string_reset(string);
diff --git a/applications/debug/unit_tests/lfrfid/bit_lib_test.c b/applications/debug/unit_tests/lfrfid/bit_lib_test.c
index 726615703..dcb69de7f 100644
--- a/applications/debug/unit_tests/lfrfid/bit_lib_test.c
+++ b/applications/debug/unit_tests/lfrfid/bit_lib_test.c
@@ -311,7 +311,7 @@ MU_TEST(test_bit_lib_test_parity) {
 }
 
 MU_TEST(test_bit_lib_remove_bit_every_nth) {
-    // TODO: more tests
+    // TODO FL-3494: more tests
     uint8_t data_i[1] = {0b00001111};
     uint8_t data_o[1] = {0b00011111};
     size_t length;
diff --git a/applications/debug/unit_tests/test_index.c b/applications/debug/unit_tests/test_index.c
index f7a53d7c8..edaf950c5 100644
--- a/applications/debug/unit_tests/test_index.c
+++ b/applications/debug/unit_tests/test_index.c
@@ -90,7 +90,7 @@ void unit_tests_cli(Cli* cli, FuriString* args, void* context) {
     Loader* loader = furi_record_open(RECORD_LOADER);
     NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
 
-    // TODO: lock device while test running
+    // TODO FL-3491: lock device while test running
     if(loader_is_locked(loader)) {
         printf("RPC: stop all applications to run tests\r\n");
         notification_message(notification, &sequence_blink_magenta_100);
diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
index e9560ce5f..eb0ec56a4 100644
--- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
+++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
@@ -333,7 +333,7 @@ bool subghz_device_cc1101_ext_rx_pipe_not_empty() {
         (CC1101_STATUS_RXBYTES) | CC1101_BURST,
         (uint8_t*)status);
     furi_hal_spi_release(subghz_device_cc1101_ext->spi_bus_handle);
-    // TODO: you can add a buffer overflow flag if needed
+    // TODO FL-3520: you can add a buffer overflow flag if needed
     if(status->NUM_RXBYTES > 0) {
         return true;
     } else {
diff --git a/applications/main/gpio/scenes/gpio_scene_usb_uart.c b/applications/main/gpio/scenes/gpio_scene_usb_uart.c
index aa41aaf98..52b2142dc 100644
--- a/applications/main/gpio/scenes/gpio_scene_usb_uart.c
+++ b/applications/main/gpio/scenes/gpio_scene_usb_uart.c
@@ -19,7 +19,7 @@ void gpio_scene_usb_uart_on_enter(void* context) {
     uint32_t prev_state = scene_manager_get_scene_state(app->scene_manager, GpioAppViewUsbUart);
     if(prev_state == 0) {
         scene_usb_uart = malloc(sizeof(SceneUsbUartBridge));
-        scene_usb_uart->cfg.vcp_ch = 0; // TODO: settings load
+        scene_usb_uart->cfg.vcp_ch = 0; // TODO FL-3495: settings load
         scene_usb_uart->cfg.uart_ch = 0;
         scene_usb_uart->cfg.flow_pins = 0;
         scene_usb_uart->cfg.baudrate_mode = 0;
diff --git a/applications/main/infrared/infrared_cli.c b/applications/main/infrared/infrared_cli.c
index 3fa99cb02..54b5cabab 100644
--- a/applications/main/infrared/infrared_cli.c
+++ b/applications/main/infrared/infrared_cli.c
@@ -85,7 +85,7 @@ 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: Do not hardcode universal remote names
+    // TODO FL-3496: Do not hardcode universal remote names
     printf("\tAvailable universal remotes: tv audio ac projector\r\n");
 }
 
@@ -211,7 +211,7 @@ static bool infrared_cli_decode_raw_signal(
 
     size_t i;
     for(i = 0; i < raw_signal->timings_size; ++i) {
-        // TODO: Any infrared_check_decoder_ready() magic?
+        // TODO FL-3523: Any infrared_check_decoder_ready() magic?
         const InfraredMessage* message = infrared_decode(decoder, level, raw_signal->timings[i]);
 
         if(message) {
diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c
index cbd47f5e5..747ed7327 100644
--- a/applications/main/subghz/helpers/subghz_txrx.c
+++ b/applications/main/subghz/helpers/subghz_txrx.c
@@ -334,7 +334,6 @@ static void subghz_txrx_tx_stop(SubGhzTxRx* instance) {
     }
     subghz_txrx_idle(instance);
     subghz_txrx_speaker_off(instance);
-    //Todo: Show message
 }
 
 FlipperFormat* subghz_txrx_get_fff_data(SubGhzTxRx* instance) {
diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
index 06a855c23..b5d47cea9 100644
--- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
+++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c
@@ -30,7 +30,7 @@ bool subghz_txrx_gen_data_protocol(
         subghz_receiver_search_decoder_base_by_name(instance->receiver, protocol_name);
 
     if(instance->decoder_result == NULL) {
-        //TODO: Error
+        //TODO FL-3502: Error
         // furi_string_set(error_str, "Protocol not\nfound!");
         // scene_manager_next_scene(scene_manager, SubGhzSceneShowErrorSub);
         FURI_LOG_E(TAG, "Protocol not found!");
diff --git a/applications/main/subghz/scenes/subghz_scene_radio_setting.c b/applications/main/subghz/scenes/subghz_scene_radio_setting.c
index 0a47d5bfd..de05417ca 100644
--- a/applications/main/subghz/scenes/subghz_scene_radio_setting.c
+++ b/applications/main/subghz/scenes/subghz_scene_radio_setting.c
@@ -24,7 +24,7 @@ static void subghz_scene_radio_settings_set_device(VariableItem* item) {
     if(!subghz_txrx_radio_device_is_external_connected(
            subghz->txrx, SUBGHZ_DEVICE_CC1101_EXT_NAME) &&
        radio_device_value[index] == SubGhzRadioDeviceTypeExternalCC1101) {
-        //ToDo correct if there is more than 1 module
+        // TODO FL-3501: correct if there is more than 1 module
         index = 0;
     }
     variable_item_set_current_value_text(item, radio_device_text[index]);
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_info.c b/applications/main/subghz/scenes/subghz_scene_receiver_info.c
index 9b57165e7..7180bb3a4 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver_info.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_info.c
@@ -23,7 +23,7 @@ static bool subghz_scene_receiver_info_update_parser(void* context) {
     if(subghz_txrx_load_decoder_by_name_protocol(
            subghz->txrx,
            subghz_history_get_protocol_name(subghz->history, subghz->idx_menu_chosen))) {
-        //todo we are trying to deserialize without checking for errors, since it is assumed that we just received this chignal
+        // we are trying to deserialize without checking for errors, since it is assumed that we just received this chignal
         subghz_protocol_decoder_base_deserialize(
             subghz_txrx_get_decoder(subghz->txrx),
             subghz_history_get_raw_data(subghz->history, subghz->idx_menu_chosen));
diff --git a/applications/main/subghz/subghz_i.c b/applications/main/subghz/subghz_i.c
index 55036846c..55f33d200 100644
--- a/applications/main/subghz/subghz_i.c
+++ b/applications/main/subghz/subghz_i.c
@@ -134,7 +134,7 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
         SubGhzSetting* setting = subghz_txrx_get_setting(subghz->txrx);
 
         if(!strcmp(furi_string_get_cstr(temp_str), "CUSTOM")) {
-            //Todo add Custom_preset_module
+            //TODO FL-3551: add Custom_preset_module
             //delete preset if it already exists
             subghz_setting_delete_custom_preset(setting, furi_string_get_cstr(temp_str));
             //load custom preset from file
@@ -289,7 +289,7 @@ bool subghz_save_protocol_to_file(
         if(!storage_simply_remove(storage, dev_file_name)) {
             break;
         }
-        //ToDo check Write
+        //TODO FL-3552: check Write
         stream_seek(flipper_format_stream, 0, StreamOffsetFromStart);
         stream_save_to_file(flipper_format_stream, storage, dev_file_name, FSOM_CREATE_ALWAYS);
 
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 490f3686f..333c444db 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -101,7 +101,7 @@ static void desktop_clock_draw_callback(Canvas* canvas, void* context) {
     char buffer[20];
     snprintf(buffer, sizeof(buffer), "%02u:%02u", hour, desktop->time_minute);
 
-    // ToDo: never do that, may cause visual glitches
+    // TODO FL-3515: never do that, may cause visual glitches
     view_port_set_width(
         desktop->clock_viewport,
         canvas_string_width(canvas, buffer) - 1 + (desktop->time_minute % 10 == 1));
@@ -126,7 +126,7 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         return true;
     case DesktopGlobalAfterAppFinished:
         animation_manager_load_and_continue_animation(desktop->animation_manager);
-        // TODO: Implement a message mechanism for loading settings and (optionally)
+        // TODO FL-3497: Implement a message mechanism for loading settings and (optionally)
         // locking and unlocking
         DESKTOP_SETTINGS_LOAD(&desktop->settings);
 
diff --git a/applications/services/gui/modules/button_panel.c b/applications/services/gui/modules/button_panel.c
index 9b816eed0..503be2dac 100644
--- a/applications/services/gui/modules/button_panel.c
+++ b/applications/services/gui/modules/button_panel.c
@@ -103,7 +103,6 @@ void button_panel_reserve(ButtonPanel* button_panel, size_t reserve_x, size_t re
                 ButtonArray_t* array = ButtonMatrix_get(model->button_matrix, i);
                 ButtonArray_init(*array);
                 ButtonArray_reserve(*array, reserve_x);
-                // TODO: do we need to clear allocated memory of ptr-s to ButtonItem ??
             }
             LabelList_init(model->labels);
         },
diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c
index 920b3c139..83f0edbea 100644
--- a/applications/services/gui/view_dispatcher.c
+++ b/applications/services/gui/view_dispatcher.c
@@ -272,7 +272,7 @@ void view_dispatcher_handle_input(ViewDispatcher* view_dispatcher, InputEvent* e
             } else if(view_dispatcher->navigation_event_callback) {
                 // Dispatch navigation event
                 if(!view_dispatcher->navigation_event_callback(view_dispatcher->event_context)) {
-                    // TODO: should we allow view_dispatcher to stop without navigation_event_callback?
+                    // TODO FL-3514: should we allow view_dispatcher to stop without navigation_event_callback?
                     view_dispatcher_stop(view_dispatcher);
                     return;
                 }
diff --git a/applications/services/gui/view_port.c b/applications/services/gui/view_port.c
index 8c2ff6fe0..57c0fddb4 100644
--- a/applications/services/gui/view_port.c
+++ b/applications/services/gui/view_port.c
@@ -7,7 +7,7 @@
 #include "gui.h"
 #include "gui_i.h"
 
-// TODO add mutex to view_port ops
+// TODO FL-3498: add mutex to view_port ops
 
 _Static_assert(ViewPortOrientationMAX == 4, "Incorrect ViewPortOrientation count");
 _Static_assert(
diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c
index ee5f87e97..53f70a1ec 100644
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -62,7 +62,7 @@ LoaderStatus loader_start_with_gui_error(Loader* loader, const char* name, const
         dialog_message_free(message);
         furi_record_close(RECORD_DIALOGS);
     } else if(status == LoaderStatusErrorUnknownApp || status == LoaderStatusErrorInternal) {
-        // TODO: we have many places where we can emit a double start, ex: desktop, menu
+        // TODO FL-3522: we have many places where we can emit a double start, ex: desktop, menu
         // so i prefer to not show LoaderStatusErrorAppStarted error message for now
         DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
         DialogMessage* message = dialog_message_alloc();
diff --git a/applications/services/loader/loader_cli.c b/applications/services/loader/loader_cli.c
index cbec4adca..489a576e5 100644
--- a/applications/services/loader/loader_cli.c
+++ b/applications/services/loader/loader_cli.c
@@ -28,7 +28,7 @@ static void loader_cli_info(Loader* loader) {
     if(!loader_is_locked(loader)) {
         printf("No application is running\r\n");
     } else {
-        // TODO: print application name ???
+        // TODO FL-3513: print application name ???
         printf("Application is running\r\n");
     }
 }
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index aadb5f46e..e39a84eaf 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -30,7 +30,7 @@ void power_draw_battery_callback(Canvas* canvas, void* context) {
         if(power->state == PowerStateCharging) {
             canvas_set_bitmap_mode(canvas, 1);
             canvas_set_color(canvas, ColorWhite);
-            // TODO: replace -1 magic for uint8_t with re-framing
+            // TODO FL-3510: replace -1 magic for uint8_t with re-framing
             canvas_draw_icon(canvas, 8, -1, &I_Charging_lightning_mask_9x10);
             canvas_set_color(canvas, ColorBlack);
             canvas_draw_icon(canvas, 8, -1, &I_Charging_lightning_9x10);
diff --git a/applications/services/rpc/rpc_gui.c b/applications/services/rpc/rpc_gui.c
index 9ba20a832..9eff4bca6 100644
--- a/applications/services/rpc/rpc_gui.c
+++ b/applications/services/rpc/rpc_gui.c
@@ -279,7 +279,7 @@ static void rpc_system_gui_start_virtual_display_process(const PB_Main* request,
         return;
     }
 
-    // TODO: consider refactoring
+    // TODO FL-3511: consider refactoring
     // Using display framebuffer size as an XBM buffer size is like comparing apples and oranges
     // Glad they both are 1024 for now
     size_t buffer_size = canvas_get_buffer_size(rpc_gui->gui->canvas);
diff --git a/applications/services/storage/storage_processing.c b/applications/services/storage/storage_processing.c
index e6b426961..70cb7b92f 100644
--- a/applications/services/storage/storage_processing.c
+++ b/applications/services/storage/storage_processing.c
@@ -399,7 +399,7 @@ static FS_Error storage_process_common_fs_info(
 }
 
 /****************** Raw SD API ******************/
-// TODO think about implementing a custom storage API to split that kind of api linkage
+// TODO FL-3521: think about implementing a custom storage API to split that kind of api linkage
 #include "storages/storage_ext.h"
 
 static FS_Error storage_process_sd_format(Storage* app) {
diff --git a/applications/services/storage/storages/storage_ext.c b/applications/services/storage/storages/storage_ext.c
index 15a355dc2..35b3ee253 100644
--- a/applications/services/storage/storages/storage_ext.c
+++ b/applications/services/storage/storages/storage_ext.c
@@ -100,7 +100,7 @@ FS_Error sd_unmount_card(StorageData* storage) {
     storage->status = StorageStatusNotReady;
     error = FR_DISK_ERR;
 
-    // TODO do i need to close the files?
+    // TODO FL-3522: do i need to close the files?
     f_mount(0, sd_data->path, 0);
 
     return storage_ext_parse_error(error);
diff --git a/applications/system/updater/scenes/updater_scene_main.c b/applications/system/updater/scenes/updater_scene_main.c
index 2ef0732ca..9fd68161f 100644
--- a/applications/system/updater/scenes/updater_scene_main.c
+++ b/applications/system/updater/scenes/updater_scene_main.c
@@ -80,7 +80,7 @@ bool updater_scene_main_on_event(void* context, SceneManagerEvent event) {
             break;
 
         case UpdaterCustomEventSdUnmounted:
-            // TODO: error out, stop worker (it's probably dead actually)
+            // TODO FL-3499: error out, stop worker (it's probably dead actually)
             break;
         default:
             break;
diff --git a/firmware/targets/f18/furi_hal/furi_hal_resources.c b/firmware/targets/f18/furi_hal/furi_hal_resources.c
index 32c9b619c..f28f98b09 100644
--- a/firmware/targets/f18/furi_hal/furi_hal_resources.c
+++ b/firmware/targets/f18/furi_hal/furi_hal_resources.c
@@ -225,7 +225,7 @@ void furi_hal_resources_init() {
 }
 
 int32_t furi_hal_resources_get_ext_pin_number(const GpioPin* gpio) {
-    // TODO: describe second ROW
+    // TODO FL-3500: describe second ROW
     if(gpio == &gpio_ext_pa7)
         return 2;
     else if(gpio == &gpio_ext_pa6)
diff --git a/firmware/targets/f7/ble_glue/ble_glue.c b/firmware/targets/f7/ble_glue/ble_glue.c
index 1cb5501d9..746df71c7 100644
--- a/firmware/targets/f7/ble_glue/ble_glue.c
+++ b/firmware/targets/f7/ble_glue/ble_glue.c
@@ -222,7 +222,7 @@ bool ble_glue_wait_for_c2_start(int32_t timeout) {
     bool started = false;
 
     do {
-        // TODO: use mutex?
+        // TODO FL-3505: use mutex?
         started = ble_glue->status == BleGlueStatusC2Started;
         if(!started) {
             timeout--;
diff --git a/firmware/targets/f7/ble_glue/services/gatt_char.c b/firmware/targets/f7/ble_glue/services/gatt_char.c
index 9b6a44f61..e0539c34f 100644
--- a/firmware/targets/f7/ble_glue/services/gatt_char.c
+++ b/firmware/targets/f7/ble_glue/services/gatt_char.c
@@ -14,7 +14,7 @@ void flipper_gatt_characteristic_init(
     furi_assert(char_instance);
 
     // Copy the descriptor to the instance, since it may point to stack memory
-    // TODO: only copy if really comes from stack
+    // TODO FL-3506: only copy if really comes from stack
     char_instance->characteristic = malloc(sizeof(FlipperGattCharacteristicParams));
     memcpy(
         (void*)char_instance->characteristic,
diff --git a/firmware/targets/f7/fatfs/sd_spi_io.c b/firmware/targets/f7/fatfs/sd_spi_io.c
index e8e542b32..d420524df 100644
--- a/firmware/targets/f7/fatfs/sd_spi_io.c
+++ b/firmware/targets/f7/fatfs/sd_spi_io.c
@@ -283,7 +283,7 @@ static SdSpiCmdAnswer
         cmd_answer.r1 = sd_spi_wait_for_data_and_read();
         break;
     case SdSpiCmdAnswerTypeR1B:
-        // TODO: can be wrong, at least for SD_CMD12_STOP_TRANSMISSION you need to purge one byte before reading R1
+        // TODO FL-3507: can be wrong, at least for SD_CMD12_STOP_TRANSMISSION you need to purge one byte before reading R1
         cmd_answer.r1 = sd_spi_wait_for_data_and_read();
 
         // In general this shenenigans seems suspicious, please double check SD specs if you are using SdSpiCmdAnswerTypeR1B
@@ -322,7 +322,7 @@ static SdSpiDataResponce sd_spi_get_data_response(uint32_t timeout_ms) {
 
     switch(responce & 0x1F) {
     case SdSpiDataResponceOK:
-        // TODO: check timings
+        // TODO FL-3508: check timings
         sd_spi_deselect_card();
         sd_spi_select_card();
 
@@ -684,7 +684,7 @@ static SdSpiStatus sd_spi_cmd_write_blocks(
         }
 
         // Send dummy byte for NWR timing : one byte between CMD_WRITE and TOKEN
-        // TODO: check bytes count
+        // TODO FL-3509: check bytes count
         sd_spi_write_byte(SD_DUMMY_BYTE);
         sd_spi_write_byte(SD_DUMMY_BYTE);
 
diff --git a/firmware/targets/f7/furi_hal/furi_hal_nfc.h b/firmware/targets/f7/furi_hal/furi_hal_nfc.h
index c87f04a9a..f4051926a 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_nfc.h
+++ b/firmware/targets/f7/furi_hal/furi_hal_nfc.h
@@ -402,7 +402,6 @@ void furi_hal_nfc_ll_txrx_on();
 
 void furi_hal_nfc_ll_txrx_off();
 
-// TODO rework all pollers with furi_hal_nfc_ll_txrx_bits
 FuriHalNfcReturn furi_hal_nfc_ll_txrx(
     uint8_t* txBuf,
     uint16_t txBufLen,
diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.c b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
index ac5adefb8..327e42a87 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_subghz.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
@@ -207,7 +207,7 @@ bool furi_hal_subghz_rx_pipe_not_empty() {
     cc1101_read_reg(
         &furi_hal_spi_bus_handle_subghz, (CC1101_STATUS_RXBYTES) | CC1101_BURST, (uint8_t*)status);
     furi_hal_spi_release(&furi_hal_spi_bus_handle_subghz);
-    // TODO: you can add a buffer overflow flag if needed
+    // TODO FL-3503: you can add a buffer overflow flag if needed
     if(status->NUM_RXBYTES > 0) {
         return true;
     } else {
diff --git a/firmware/targets/f7/src/update.c b/firmware/targets/f7/src/update.c
index c6235a150..520305410 100644
--- a/firmware/targets/f7/src/update.c
+++ b/firmware/targets/f7/src/update.c
@@ -38,7 +38,7 @@ static bool flipper_update_mount_sd() {
 }
 
 static bool flipper_update_init() {
-    // TODO: Configure missing peripherals properly
+    // TODO FL-3504: Configure missing peripherals properly
     furi_hal_bus_enable(FuriHalBusHSEM);
     furi_hal_bus_enable(FuriHalBusIPCC);
     furi_hal_bus_enable(FuriHalBusRNG);
diff --git a/lib/SConscript b/lib/SConscript
index ab78c6ea4..907a5a41d 100644
--- a/lib/SConscript
+++ b/lib/SConscript
@@ -23,7 +23,7 @@ env.Append(
 env.Append(
     CPPPATH=[
         "#/",
-        "#/lib",  # TODO: remove!
+        "#/lib",  # TODO FL-3553: remove!
         "#/lib/mlib",
         # Ugly hack
         Dir("../assets/compiled"),
diff --git a/lib/drivers/bq27220.c b/lib/drivers/bq27220.c
index 92dbfcd6a..4a9feed9b 100644
--- a/lib/drivers/bq27220.c
+++ b/lib/drivers/bq27220.c
@@ -69,7 +69,7 @@ static bool bq27220_parameter_check(
 
             uint8_t checksum = bq27220_get_checksum(buffer, size + 2);
             buffer[0] = checksum;
-            buffer[1] = 4 + size; // TODO: why 4?
+            buffer[1] = 4 + size; // TODO FL-3519: why 4?
             if(!furi_hal_i2c_write_mem(
                    handle, BQ27220_ADDRESS, CommandMACDataSum, buffer, 2, BQ27220_I2C_TIMEOUT)) {
                 FURI_LOG_I(TAG, "CRC write failed");
diff --git a/lib/flipper_application/application_manifest.h b/lib/flipper_application/application_manifest.h
index 25e4f8d0a..d09ec9004 100644
--- a/lib/flipper_application/application_manifest.h
+++ b/lib/flipper_application/application_manifest.h
@@ -16,7 +16,7 @@ extern "C" {
 #define FAP_MANIFEST_SUPPORTED_VERSION 1
 
 #define FAP_MANIFEST_MAX_APP_NAME_LENGTH 32
-#define FAP_MANIFEST_MAX_ICON_SIZE 32 // TODO: reduce size?
+#define FAP_MANIFEST_MAX_ICON_SIZE 32 // TODO FL-3524: reduce size?
 
 #pragma pack(push, 1)
 
diff --git a/lib/flipper_application/elf/elf_file.c b/lib/flipper_application/elf/elf_file.c
index 539a48c85..7df3eb090 100644
--- a/lib/flipper_application/elf/elf_file.c
+++ b/lib/flipper_application/elf/elf_file.c
@@ -507,7 +507,7 @@ static SectionType elf_preload_section(
 #endif
 
     // ignore .ARM and .rel.ARM sections
-    // TODO: how to do it not by name?
+    // TODO FL-3525: how to do it not by name?
     // .ARM: type 0x70000001, flags SHF_ALLOC | SHF_LINK_ORDER
     // .rel.ARM: type 0x9, flags SHT_REL
     if(str_prefix(name, ".ARM.") || str_prefix(name, ".rel.ARM.") ||
@@ -792,7 +792,7 @@ bool elf_file_load_section_table(ELFFile* elf) {
     FuriString* name = furi_string_alloc();
 
     FURI_LOG_D(TAG, "Scan ELF indexs...");
-    // TODO: why we start from 1?
+    // TODO FL-3526: why we start from 1?
     for(size_t section_idx = 1; section_idx < elf->sections_count; section_idx++) {
         Elf32_Shdr section_header;
 
@@ -828,7 +828,7 @@ ElfProcessSectionResult elf_process_section(
     Elf32_Shdr section_header;
 
     // find section
-    // TODO: why we start from 1?
+    // TODO FL-3526: why we start from 1?
     for(size_t section_idx = 1; section_idx < elf->sections_count; section_idx++) {
         furi_string_reset(section_name);
         if(!elf_read_section(elf, section_idx, &section_header, section_name)) {
diff --git a/lib/ibutton/ibutton_worker_modes.c b/lib/ibutton/ibutton_worker_modes.c
index 1b8e0a3b8..83e207de9 100644
--- a/lib/ibutton/ibutton_worker_modes.c
+++ b/lib/ibutton/ibutton_worker_modes.c
@@ -127,7 +127,7 @@ void ibutton_worker_mode_write_blank_tick(iButtonWorker* worker) {
     furi_assert(worker->key);
 
     const bool success = ibutton_protocols_write_blank(worker->protocols, worker->key);
-    // TODO: pass a proper result to the callback
+    // TODO FL-3527: pass a proper result to the callback
     const iButtonWorkerWriteResult result = success ? iButtonWorkerWriteOK :
                                                       iButtonWorkerWriteNoDetect;
     if(worker->write_cb != NULL) {
@@ -139,7 +139,7 @@ void ibutton_worker_mode_write_copy_tick(iButtonWorker* worker) {
     furi_assert(worker->key);
 
     const bool success = ibutton_protocols_write_copy(worker->protocols, worker->key);
-    // TODO: pass a proper result to the callback
+    // TODO FL-3527: pass a proper result to the callback
     const iButtonWorkerWriteResult result = success ? iButtonWorkerWriteOK :
                                                       iButtonWorkerWriteNoDetect;
     if(worker->write_cb != NULL) {
diff --git a/lib/ibutton/protocols/blanks/rw1990.c b/lib/ibutton/protocols/blanks/rw1990.c
index d3350fcf0..f86e43d99 100644
--- a/lib/ibutton/protocols/blanks/rw1990.c
+++ b/lib/ibutton/protocols/blanks/rw1990.c
@@ -62,7 +62,7 @@ bool rw1990_write_v1(OneWireHost* host, const uint8_t* data, size_t data_size) {
     onewire_host_write_bit(host, true);
     furi_delay_us(10000);
 
-    // TODO: Better error handling
+    // TODO FL-3528: Better error handling
     return rw1990_read_and_compare(host, data, data_size);
 }
 
@@ -90,6 +90,6 @@ bool rw1990_write_v2(OneWireHost* host, const uint8_t* data, size_t data_size) {
     onewire_host_write_bit(host, false);
     furi_delay_us(10000);
 
-    // TODO: Better error handling
+    // TODO Fl-3528: Better error handling
     return rw1990_read_and_compare(host, data, data_size);
 }
diff --git a/lib/ibutton/protocols/blanks/tm2004.c b/lib/ibutton/protocols/blanks/tm2004.c
index ef6f0619e..b020a218d 100644
--- a/lib/ibutton/protocols/blanks/tm2004.c
+++ b/lib/ibutton/protocols/blanks/tm2004.c
@@ -21,7 +21,7 @@ bool tm2004_write(OneWireHost* host, const uint8_t* data, size_t data_size) {
 
         onewire_host_write(host, data[i]);
         answer = onewire_host_read(host);
-        // TODO: check answer CRC
+        // TODO FL-3529: check answer CRC
 
         // pulse indicating that data is correct
         furi_delay_us(600);
@@ -37,6 +37,6 @@ bool tm2004_write(OneWireHost* host, const uint8_t* data, size_t data_size) {
         }
     }
 
-    // TODO: Better error handling
+    // TODO FL-3529: Better error handling
     return i == data_size;
 }
diff --git a/lib/ibutton/protocols/dallas/dallas_common.c b/lib/ibutton/protocols/dallas/dallas_common.c
index ebf57e555..6e99a3be2 100644
--- a/lib/ibutton/protocols/dallas/dallas_common.c
+++ b/lib/ibutton/protocols/dallas/dallas_common.c
@@ -149,7 +149,7 @@ bool dallas_common_emulate_search_rom(OneWireSlave* bus, const DallasCommonRomDa
             if(!onewire_slave_send_bit(bus, !bit)) return false;
 
             onewire_slave_receive_bit(bus);
-            // TODO: check for errors and return if any
+            // TODO FL-3530: check for errors and return if any
         }
     }
 
diff --git a/lib/ibutton/protocols/dallas/protocol_ds1971.c b/lib/ibutton/protocols/dallas/protocol_ds1971.c
index a806acb22..b65e64584 100644
--- a/lib/ibutton/protocols/dallas/protocol_ds1971.c
+++ b/lib/ibutton/protocols/dallas/protocol_ds1971.c
@@ -53,7 +53,7 @@ const iButtonProtocolDallasBase ibutton_protocol_ds1971 = {
     .name = DS1971_FAMILY_NAME,
 
     .read = dallas_ds1971_read,
-    .write_blank = NULL, // TODO: Implement writing to blank
+    .write_blank = NULL, // TODO FL-3531: Implement writing to blank
     .write_copy = dallas_ds1971_write_copy,
     .emulate = dallas_ds1971_emulate,
     .save = dallas_ds1971_save,
diff --git a/lib/ibutton/protocols/dallas/protocol_ds1992.c b/lib/ibutton/protocols/dallas/protocol_ds1992.c
index 0b4d4b34f..7440882ea 100644
--- a/lib/ibutton/protocols/dallas/protocol_ds1992.c
+++ b/lib/ibutton/protocols/dallas/protocol_ds1992.c
@@ -73,7 +73,7 @@ bool dallas_ds1992_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
 
 bool dallas_ds1992_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
     DS1992ProtocolData* data = protocol_data;
-    // TODO: Make this work, currently broken
+    // TODO FL-3532: Make this work, currently broken
     return tm2004_write(host, (uint8_t*)data, sizeof(DallasCommonRomData) + DS1992_SRAM_DATA_SIZE);
 }
 
diff --git a/lib/ibutton/protocols/dallas/protocol_ds1996.c b/lib/ibutton/protocols/dallas/protocol_ds1996.c
index 5358b63e2..5970a67bb 100644
--- a/lib/ibutton/protocols/dallas/protocol_ds1996.c
+++ b/lib/ibutton/protocols/dallas/protocol_ds1996.c
@@ -159,7 +159,7 @@ static bool dallas_ds1996_command_callback(uint8_t command, void* context) {
 
     case DALLAS_COMMON_CMD_MATCH_ROM:
     case DALLAS_COMMON_CMD_OVERDRIVE_MATCH_ROM:
-        /* TODO: Match ROM command support */
+        /* TODO FL-3533: Match ROM command support */
     default:
         return false;
     }
diff --git a/lib/lfrfid/lfrfid_dict_file.c b/lib/lfrfid/lfrfid_dict_file.c
index 7ae84f8b6..18bf505f0 100644
--- a/lib/lfrfid/lfrfid_dict_file.c
+++ b/lib/lfrfid/lfrfid_dict_file.c
@@ -17,13 +17,13 @@ bool lfrfid_dict_file_save(ProtocolDict* dict, ProtocolId protocol, const char*
         if(!flipper_format_file_open_always(file, filename)) break;
         if(!flipper_format_write_header_cstr(file, LFRFID_DICT_FILETYPE, 1)) break;
 
-        // TODO: write comment about protocol types into file
+        // TODO FL-3517: write comment about protocol types into file
 
         if(!flipper_format_write_string_cstr(
                file, "Key type", protocol_dict_get_name(dict, protocol)))
             break;
 
-        // TODO: write comment about protocol sizes into file
+        // TODO FL-3517: write comment about protocol sizes into file
 
         protocol_dict_get_data(dict, protocol, data, data_size);
 
diff --git a/lib/lfrfid/lfrfid_worker.h b/lib/lfrfid/lfrfid_worker.h
index def9f89a4..22135097e 100644
--- a/lib/lfrfid/lfrfid_worker.h
+++ b/lib/lfrfid/lfrfid_worker.h
@@ -26,8 +26,8 @@ typedef enum {
 } LFRFIDWorkerReadType;
 
 typedef enum {
-    LFRFIDWorkerReadSenseStart, // TODO: not implemented
-    LFRFIDWorkerReadSenseEnd, // TODO: not implemented
+    LFRFIDWorkerReadSenseStart, // TODO FL-3516: not implemented
+    LFRFIDWorkerReadSenseEnd, // TODO FL-3516: not implemented
     LFRFIDWorkerReadSenseCardStart,
     LFRFIDWorkerReadSenseCardEnd,
     LFRFIDWorkerReadStartASK,
diff --git a/lib/lfrfid/protocols/protocol_hid_ex_generic.c b/lib/lfrfid/protocols/protocol_hid_ex_generic.c
index 240128cbe..35500ab59 100644
--- a/lib/lfrfid/protocols/protocol_hid_ex_generic.c
+++ b/lib/lfrfid/protocols/protocol_hid_ex_generic.c
@@ -193,7 +193,7 @@ bool protocol_hid_ex_generic_write_data(ProtocolHIDEx* protocol, void* data) {
 };
 
 void protocol_hid_ex_generic_render_data(ProtocolHIDEx* protocol, FuriString* result) {
-    // TODO: parser and render functions
+    // TODO FL-3518: parser and render functions
     UNUSED(protocol);
     furi_string_printf(result, "Generic HID Extended\r\nData: Unknown");
 };
diff --git a/lib/lfrfid/tools/bit_lib.c b/lib/lfrfid/tools/bit_lib.c
index 54decb3e8..e0d0ff402 100644
--- a/lib/lfrfid/tools/bit_lib.c
+++ b/lib/lfrfid/tools/bit_lib.c
@@ -38,7 +38,7 @@ uint8_t bit_lib_get_bits(const uint8_t* data, size_t position, uint8_t length) {
     if(shift == 0) {
         return data[position / 8] >> (8 - length);
     } else {
-        // TODO fix read out of bounds
+        // TODO FL-3534: fix read out of bounds
         uint8_t value = (data[position / 8] << (shift));
         value |= data[position / 8 + 1] >> (8 - shift);
         value = value >> (8 - length);
diff --git a/lib/nfc/protocols/nfcv.c b/lib/nfc/protocols/nfcv.c
index 017b06cae..281463281 100644
--- a/lib/nfc/protocols/nfcv.c
+++ b/lib/nfc/protocols/nfcv.c
@@ -29,7 +29,7 @@ ReturnCode nfcv_inventory(uint8_t* uid) {
     ReturnCode ret = ERR_NONE;
 
     for(int tries = 0; tries < NFCV_COMMAND_RETRIES; tries++) {
-        /* TODO: needs proper abstraction via fury_hal(_ll)_* */
+        /* TODO: needs proper abstraction via furi_hal(_ll)_* */
         ret = rfalNfcvPollerInventory(RFAL_NFCV_NUM_SLOTS_1, 0, NULL, &res, &received);
 
         if(ret == ERR_NONE) {
@@ -89,7 +89,7 @@ ReturnCode nfcv_read_sysinfo(FuriHalNfcDevData* nfc_data, NfcVData* nfcv_data) {
     FURI_LOG_D(TAG, "Read SYSTEM INFORMATION...");
 
     for(int tries = 0; tries < NFCV_COMMAND_RETRIES; tries++) {
-        /* TODO: needs proper abstraction via fury_hal(_ll)_* */
+        /* TODO: needs proper abstraction via furi_hal(_ll)_* */
         ret = rfalNfcvPollerGetSystemInformation(
             RFAL_NFCV_REQ_FLAG_DEFAULT, NULL, rxBuf, sizeof(rxBuf), &received);
 
diff --git a/lib/print/wrappers.c b/lib/print/wrappers.c
index 5cfe10600..b248aeb3d 100644
--- a/lib/print/wrappers.c
+++ b/lib/print/wrappers.c
@@ -59,7 +59,6 @@ int __wrap_fflush(FILE* stream) {
 __attribute__((__noreturn__)) void __wrap___assert(const char* file, int line, const char* e) {
     UNUSED(file);
     UNUSED(line);
-    // TODO: message file and line number
     furi_crash(e);
 }
 
@@ -68,6 +67,5 @@ __attribute__((__noreturn__)) void
     UNUSED(file);
     UNUSED(line);
     UNUSED(func);
-    // TODO: message file and line number
     furi_crash(e);
 }
\ No newline at end of file
diff --git a/lib/subghz/devices/registry.c b/lib/subghz/devices/registry.c
index c0d5bb292..779ba81d7 100644
--- a/lib/subghz/devices/registry.c
+++ b/lib/subghz/devices/registry.c
@@ -22,7 +22,7 @@ void subghz_device_registry_init(void) {
         SUBGHZ_RADIO_DEVICE_PLUGIN_API_VERSION,
         firmware_api_interface);
 
-    //ToDo: fix path to plugins
+    //TODO FL-3556: fix path to plugins
     if(plugin_manager_load_all(subghz_device->manager, "/any/apps_data/subghz/plugins") !=
        //if(plugin_manager_load_all(subghz_device->manager, APP_DATA_PATH("plugins")) !=
        PluginManagerErrorNone) {
diff --git a/lib/subghz/protocols/bin_raw.c b/lib/subghz/protocols/bin_raw.c
index 123a4ba9d..c3dbf84fe 100644
--- a/lib/subghz/protocols/bin_raw.c
+++ b/lib/subghz/protocols/bin_raw.c
@@ -744,7 +744,7 @@ static bool
 
                             bin_raw_debug("\r\n\r\n");
 #endif
-                            //todo can be optimized
+                            //TODO FL-3557: can be optimized
                             BinRAW_Markup markup_temp[BIN_RAW_MAX_MARKUP_COUNT];
                             memcpy(
                                 markup_temp,
@@ -770,7 +770,7 @@ static bool
                 }
             }
         }
-        //todo can be optimized
+        //TODO FL-3557: can be optimized
         if(bin_raw_type == BinRAWTypeGap) {
             if(data_temp != 0) { //there are sequences with the same number of bits
 
diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c
index 80fecbbf9..8789a0f20 100644
--- a/lib/subghz/protocols/keeloq.c
+++ b/lib/subghz/protocols/keeloq.c
@@ -122,7 +122,7 @@ static bool subghz_protocol_keeloq_gen_data(SubGhzProtocolEncoderKeeloq* instanc
     uint32_t fix = (uint32_t)btn << 28 | instance->generic.serial;
     uint32_t decrypt = (uint32_t)btn << 28 |
                        (instance->generic.serial & 0x3FF)
-                           << 16 | //ToDo in some protocols the discriminator is 0
+                           << 16 | //TODO FL-3558: in some protocols the discriminator is 0
                        instance->generic.cnt;
     uint32_t hop = 0;
     uint64_t man = 0;
@@ -149,7 +149,7 @@ static bool subghz_protocol_keeloq_gen_data(SubGhzProtocolEncoderKeeloq* instanc
                     hop = subghz_protocol_keeloq_common_encrypt(decrypt, man);
                     break;
                 case KEELOQ_LEARNING_UNKNOWN:
-                    hop = 0; //todo
+                    hop = 0; //TODO FL-3559
                     break;
                 }
                 break;
@@ -200,7 +200,7 @@ static bool
 
     //gen new key
     if(subghz_protocol_keeloq_gen_data(instance, btn)) {
-        //ToDo if you need to add a callback to automatically update the data on the display
+        //TODO FL-3560: if you need to add a callback to automatically update the data on the display
     } else {
         return false;
     }
diff --git a/lib/subghz/protocols/raw.c b/lib/subghz/protocols/raw.c
index 1288c9573..c9d2b3017 100644
--- a/lib/subghz/protocols/raw.c
+++ b/lib/subghz/protocols/raw.c
@@ -265,7 +265,7 @@ SubGhzProtocolStatus
     furi_assert(context);
     UNUSED(context);
     UNUSED(flipper_format);
-    //ToDo stub, for backwards compatibility
+    // stub, for backwards compatibility
     return SubGhzProtocolStatusOk;
 }
 
@@ -273,7 +273,6 @@ void subghz_protocol_decoder_raw_get_string(void* context, FuriString* output) {
     furi_assert(context);
     //SubGhzProtocolDecoderRAW* instance = context;
     UNUSED(context);
-    //ToDo no use
     furi_string_cat_printf(output, "RAW Date");
 }
 
diff --git a/lib/subghz/protocols/secplus_v2.c b/lib/subghz/protocols/secplus_v2.c
index c8ecbea22..48ee66982 100644
--- a/lib/subghz/protocols/secplus_v2.c
+++ b/lib/subghz/protocols/secplus_v2.c
@@ -380,7 +380,7 @@ static void subghz_protocol_secplus_v2_encode(SubGhzProtocolEncoderSecPlus_v2* i
     uint8_t roll_2[9] = {0};
 
     instance->generic.cnt++;
-    //ToDo it is not known what value the counter starts
+    //TODO Fl-3548: it is not known what value the counter starts
     if(instance->generic.cnt > 0xFFFFFFF) instance->generic.cnt = 0xE500000;
     uint32_t rolling = subghz_protocol_blocks_reverse_key(instance->generic.cnt, 28);
 
diff --git a/lib/subghz/subghz_setting.c b/lib/subghz/subghz_setting.c
index 9804f8277..c0216913f 100644
--- a/lib/subghz/subghz_setting.c
+++ b/lib/subghz/subghz_setting.c
@@ -344,7 +344,7 @@ void subghz_setting_load(SubGhzSetting* instance, const char* file_path) {
             }
             while(flipper_format_read_uint32(
                 fff_data_file, "Frequency", (uint32_t*)&temp_data32, 1)) {
-                //Todo: add a frequency support check depending on the selected radio device
+                //Todo FL-3535: add a frequency support check depending on the selected radio device
                 if(furi_hal_subghz_is_frequency_valid(temp_data32)) {
                     FURI_LOG_I(TAG, "Frequency loaded %lu", temp_data32);
                     FrequencyList_push_back(instance->frequencies, temp_data32);
diff --git a/lib/subghz/subghz_tx_rx_worker.c b/lib/subghz/subghz_tx_rx_worker.c
index 250e6666f..833d90bfd 100644
--- a/lib/subghz/subghz_tx_rx_worker.c
+++ b/lib/subghz/subghz_tx_rx_worker.c
@@ -165,7 +165,7 @@ static int32_t subghz_tx_rx_worker_thread(void* context) {
                     SUBGHZ_TXRX_WORKER_TIMEOUT_READ_WRITE_BUF);
                 subghz_tx_rx_worker_tx(instance, data, SUBGHZ_TXRX_WORKER_MAX_TXRX_SIZE);
             } else {
-                //todo checking that he managed to write all the data to the TX buffer
+                //TODO FL-3554: checking that it managed to write all the data to the TX buffer
                 furi_stream_buffer_receive(
                     instance->stream_tx, &data, size_tx, SUBGHZ_TXRX_WORKER_TIMEOUT_READ_WRITE_BUF);
                 subghz_tx_rx_worker_tx(instance, data, size_tx);
@@ -178,7 +178,7 @@ static int32_t subghz_tx_rx_worker_thread(void* context) {
                        furi_stream_buffer_bytes_available(instance->stream_rx) == 0) {
                         callback_rx = true;
                     }
-                    //todo checking that he managed to write all the data to the RX buffer
+                    //TODO FL-3554: checking that it managed to write all the data to the RX buffer
                     furi_stream_buffer_send(
                         instance->stream_rx,
                         &data,
@@ -189,7 +189,7 @@ static int32_t subghz_tx_rx_worker_thread(void* context) {
                         callback_rx = false;
                     }
                 } else {
-                    //todo RX buffer overflow
+                    //TODO FL-3555: RX buffer overflow
                 }
             }
         }
diff --git a/lib/toolbox/crc32_calc.c b/lib/toolbox/crc32_calc.c
index c8ae3524a..c0cd169b1 100644
--- a/lib/toolbox/crc32_calc.c
+++ b/lib/toolbox/crc32_calc.c
@@ -4,7 +4,7 @@
 #define CRC_DATA_BUFFER_MAX_LEN 512
 
 uint32_t crc32_calc_buffer(uint32_t crc, const void* buffer, size_t size) {
-    // TODO: consider removing dependency on LFS
+    // TODO FL-3547: consider removing dependency on LFS
     return ~lfs_crc(~crc, buffer, size);
 }
 
diff --git a/lib/toolbox/stream/file_stream.c b/lib/toolbox/stream/file_stream.c
index 064912168..095dce472 100644
--- a/lib/toolbox/stream/file_stream.c
+++ b/lib/toolbox/stream/file_stream.c
@@ -134,7 +134,7 @@ static size_t file_stream_size(FileStream* stream) {
 }
 
 static size_t file_stream_write(FileStream* stream, const uint8_t* data, size_t size) {
-    // TODO cache
+    // TODO FL-3545: cache
     size_t need_to_write = size;
     while(need_to_write > 0) {
         uint16_t was_written =
@@ -148,7 +148,7 @@ static size_t file_stream_write(FileStream* stream, const uint8_t* data, size_t
 }
 
 static size_t file_stream_read(FileStream* stream, uint8_t* data, size_t size) {
-    // TODO cache
+    // TODO FL-3545: cache
     size_t need_to_read = size;
     while(need_to_read > 0) {
         uint16_t was_read =
@@ -172,7 +172,7 @@ static bool file_stream_delete_and_insert(
     // open scratchpad
     Stream* scratch_stream = file_stream_alloc(_stream->storage);
 
-    // TODO: we need something like "storage_open_tmpfile and storage_close_tmpfile"
+    // TODO FL-3546: we need something like "storage_open_tmpfile and storage_close_tmpfile"
     FuriString* scratch_name;
     FuriString* tmp_name;
     tmp_name = furi_string_alloc();
diff --git a/lib/toolbox/stream/string_stream.c b/lib/toolbox/stream/string_stream.c
index 075f0b26f..f8a360c03 100644
--- a/lib/toolbox/stream/string_stream.c
+++ b/lib/toolbox/stream/string_stream.c
@@ -106,7 +106,7 @@ static size_t string_stream_size(StringStream* stream) {
 }
 
 static size_t string_stream_write(StringStream* stream, const char* data, size_t size) {
-    // TODO: can be optimized for edge cases
+    // TODO FL-3544: can be optimized for edge cases
     size_t i;
     for(i = 0; i < size; i++) {
         string_stream_write_char(stream, data[i]);
diff --git a/lib/update_util/dfu_file.c b/lib/update_util/dfu_file.c
index 62b139e86..eef9f0645 100644
--- a/lib/update_util/dfu_file.c
+++ b/lib/update_util/dfu_file.c
@@ -55,7 +55,7 @@ uint8_t dfu_file_validate_headers(File* dfuf, const DfuValidationParams* referen
     if((dfu_suffix.bLength != sizeof(DfuSuffix)) || (dfu_suffix.bcdDFU != DFU_SUFFIX_VERSION)) {
         return 0;
     }
-    /* TODO: check DfuSignature?.. */
+    /* TODO FL-3561: check DfuSignature?.. */
 
     if((dfu_suffix.idVendor != reference_params->vendor) ||
        (dfu_suffix.idProduct != reference_params->product) ||
@@ -137,7 +137,7 @@ bool dfu_file_process_targets(const DfuUpdateTask* task, File* dfuf, const uint8
             return UpdateBlockResult_Failed;
         }
 
-        /* TODO: look into TargetPrefix and validate/filter?.. */
+        /* TODO FL-3562: look into TargetPrefix and validate/filter?.. */
         for(uint32_t i_element = 0; i_element < target_prefix.dwNbElements; ++i_element) {
             bytes_read = storage_file_read(dfuf, &image_element, sizeof(ImageElementHeader));
             if(bytes_read != sizeof(ImageElementHeader)) {
diff --git a/lib/update_util/update_manifest.c b/lib/update_util/update_manifest.c
index 795fdd5eb..47b2cc0b9 100644
--- a/lib/update_util/update_manifest.c
+++ b/lib/update_util/update_manifest.c
@@ -54,7 +54,7 @@ static bool
 
     FuriString* filetype;
 
-    // TODO: compare filetype?
+    // TODO FL-3543: compare filetype?
     filetype = furi_string_alloc();
     update_manifest->valid =
         flipper_format_read_header(flipper_file, filetype, &update_manifest->manifest_version) &&
diff --git a/scripts/fbt_tools/compilation_db.py b/scripts/fbt_tools/compilation_db.py
index 17ff6aaa3..1f829ddb4 100644
--- a/scripts/fbt_tools/compilation_db.py
+++ b/scripts/fbt_tools/compilation_db.py
@@ -38,7 +38,7 @@ from SCons.Tool.cxx import CXXSuffixes
 from SCons.Tool.cc import CSuffixes
 from SCons.Tool.asm import ASSuffixes, ASPPSuffixes
 
-# TODO: Is there a better way to do this than this global? Right now this exists so that the
+# TODO FL-3542: Is there a better way to do this than this global? Right now this exists so that the
 # emitter we add can record all of the things it emits, so that the scanner for the top level
 # compilation database can access the complete list, and also so that the writer has easy
 # access to write all of the files. But it seems clunky. How can the emitter and the scanner
@@ -91,7 +91,7 @@ def make_emit_compilation_DB_entry(comstr):
             __COMPILATIONDB_ENV=env,
         )
 
-        # TODO: Technically, these next two lines should not be required: it should be fine to
+        # TODO FL-3541: Technically, these next two lines should not be required: it should be fine to
         # cache the entries. However, they don't seem to update properly. Since they are quick
         # to re-generate disable caching and sidestep this problem.
         env.AlwaysBuild(entry)
diff --git a/scripts/flipper/storage.py b/scripts/flipper/storage.py
index 2c9c043d5..40af5cebc 100644
--- a/scripts/flipper/storage.py
+++ b/scripts/flipper/storage.py
@@ -150,7 +150,7 @@ class FlipperStorage:
 
         for line in lines:
             try:
-                # TODO: better decoding, considering non-ascii characters
+                # TODO FL-3539: better decoding, considering non-ascii characters
                 line = line.decode("ascii")
             except Exception:
                 continue
@@ -193,7 +193,7 @@ class FlipperStorage:
 
         for line in lines:
             try:
-                # TODO: better decoding, considering non-ascii characters
+                # TODO FL-3539: better decoding, considering non-ascii characters
                 line = line.decode("ascii")
             except Exception:
                 continue
diff --git a/scripts/flipper/utils/openocd.py b/scripts/flipper/utils/openocd.py
index 1309055b8..a43568090 100644
--- a/scripts/flipper/utils/openocd.py
+++ b/scripts/flipper/utils/openocd.py
@@ -78,7 +78,7 @@ class OpenOCD:
 
     def _wait_for_openocd_tcl(self):
         """Wait for OpenOCD to start"""
-        # TODO: timeout
+        # TODO Fl-3538: timeout
         while True:
             stderr = self.process.stderr
             if not stderr:
@@ -128,7 +128,7 @@ class OpenOCD:
 
     def _recv(self):
         """Read from the stream until the token (\x1a) was received."""
-        # TODO: timeout
+        # TODO FL-3538: timeout
         data = bytes()
         while True:
             chunk = self.socket.recv(4096)
diff --git a/scripts/flipper/utils/stm32wb55.py b/scripts/flipper/utils/stm32wb55.py
index 4a47b8bea..9ea803220 100644
--- a/scripts/flipper/utils/stm32wb55.py
+++ b/scripts/flipper/utils/stm32wb55.py
@@ -247,7 +247,7 @@ class STM32WB55:
 
     def flash_wait_for_operation(self):
         # Wait for flash operation to complete
-        # TODO: timeout
+        # TODO FL-3537: timeout
         while True:
             self.FLASH_SR.load()
             if self.FLASH_SR.BSY == 0:
diff --git a/scripts/toolchain/windows-toolchain-download.ps1 b/scripts/toolchain/windows-toolchain-download.ps1
index 05ea4be2c..f30b157da 100644
--- a/scripts/toolchain/windows-toolchain-download.ps1
+++ b/scripts/toolchain/windows-toolchain-download.ps1
@@ -1,7 +1,7 @@
 Set-StrictMode -Version 2.0
 $ErrorActionPreference = "Stop"
 [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
-# TODO: fix
+# TODO FL-3536: fix path to download_dir
 $download_dir = (Get-Item "$PSScriptRoot\..\..").FullName
 $toolchain_version = $args[0]
 $toolchain_target_path = $args[1]