diff --git a/applications/external/hex_editor/application.fam b/applications/external/hex_editor/application.fam
new file mode 100644
index 000000000..cb7f878f1
--- /dev/null
+++ b/applications/external/hex_editor/application.fam
@@ -0,0 +1,16 @@
+App(
+    appid="hex_editor",
+    name="HEX Editor",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="hex_editor_app",
+    cdefines=["APP_HEX_EDITOR"],
+    requires=[
+        "gui",
+        "dialogs",
+    ],
+    stack_size=2 * 1024,
+    order=20,
+    fap_icon="icons/edit_10px.png",
+    fap_category="Tools",
+    fap_icon_assets="icons",
+)
diff --git a/applications/external/hex_editor/hex_editor.c b/applications/external/hex_editor/hex_editor.c
new file mode 100644
index 000000000..5e5dc807c
--- /dev/null
+++ b/applications/external/hex_editor/hex_editor.c
@@ -0,0 +1,357 @@
+#include <stdio.h>
+#include <furi.h>
+#include <gui/gui.h>
+#include <gui/elements.h>
+#include <dialogs/dialogs.h>
+#include <input/input.h>
+#include <notification/notification_messages.h>
+
+#include <storage/storage.h>
+#include <stream/stream.h>
+#include <stream/buffered_file_stream.h>
+#include <toolbox/stream/file_stream.h>
+
+#include <hex_editor_icons.h>
+// #include <assets_icons.h>
+
+#define TAG "HexEditor"
+
+typedef struct {
+    // uint8_t file_bytes[HEX_editor_LINES_ON_SCREEN][HEX_editor_BYTES_PER_LINE];
+    uint32_t file_offset;
+    uint32_t file_read_bytes;
+    uint32_t file_size;
+    uint8_t string_offset;
+    char editable_char;
+    Stream* stream;
+    bool mode; // Print address or content
+} HexEditorModel;
+
+typedef struct {
+    HexEditorModel* model;
+    FuriMutex** mutex;
+
+    FuriMessageQueue* input_queue;
+
+    ViewPort* view_port;
+    Gui* gui;
+    Storage* storage;
+
+    FuriString* buffer;
+} HexEditor;
+
+static void draw_callback(Canvas* canvas, void* ctx) {
+    // UNUSED(ctx);
+    HexEditor* hex_editor = ctx;
+
+    canvas_clear(canvas);
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str(canvas, 0, 10, "Line and mode:");
+    // elements_button_right(canvas, "Info");
+
+    // // elements_string_fit_width(canvas, buffer, 100);
+    canvas_set_font(canvas, FontSecondary);
+
+    canvas_draw_str_aligned(
+        canvas,
+        0,
+        20,
+        AlignLeft,
+        AlignBottom,
+        furi_string_get_cstr(hex_editor->buffer) + hex_editor->model->string_offset);
+    // elements_scrollable_text_line(
+    //     canvas, 0, 20, 128, hex_editor->buffer, hex_editor->model->string_offset, false);
+
+    // canvas_draw_line(canvas, 3, 20, 5, 30);
+
+    canvas_draw_icon(canvas, 0, 20, &I_Pin_arrow_up_7x9);
+
+    if(hex_editor->model->mode) {
+        elements_button_left(canvas, "ASCII -");
+        elements_button_right(canvas, "ASCII +");
+    } else {
+        elements_button_left(canvas, "");
+        elements_button_right(canvas, "");
+    }
+
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_glyph(canvas, 0, 45, '0' + hex_editor->model->mode);
+    canvas_draw_glyph(canvas, 30, 45, hex_editor->model->editable_char);
+}
+
+static void input_callback(InputEvent* input_event, void* ctx) {
+    // Проверяем, что контекст не нулевой
+    furi_assert(ctx);
+    HexEditor* hex_editor = ctx;
+
+    furi_message_queue_put(hex_editor->input_queue, input_event, 100);
+}
+
+static HexEditor* hex_editor_alloc() {
+    HexEditor* instance = malloc(sizeof(HexEditor));
+
+    instance->model = malloc(sizeof(HexEditorModel));
+    memset(instance->model, 0x0, sizeof(HexEditorModel));
+
+    instance->model->editable_char = ' ';
+
+    instance->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+
+    instance->input_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
+
+    instance->view_port = view_port_alloc();
+    view_port_draw_callback_set(instance->view_port, draw_callback, instance);
+    view_port_input_callback_set(instance->view_port, input_callback, instance);
+
+    instance->gui = furi_record_open(RECORD_GUI);
+    gui_add_view_port(instance->gui, instance->view_port, GuiLayerFullscreen);
+
+    instance->storage = furi_record_open(RECORD_STORAGE);
+
+    instance->buffer = furi_string_alloc();
+
+    return instance;
+}
+
+static void hex_editor_free(HexEditor* instance) {
+    furi_record_close(RECORD_STORAGE);
+
+    gui_remove_view_port(instance->gui, instance->view_port);
+    furi_record_close(RECORD_GUI);
+    view_port_free(instance->view_port);
+
+    furi_message_queue_free(instance->input_queue);
+
+    furi_mutex_free(instance->mutex);
+
+    if(instance->model->stream) buffered_file_stream_close(instance->model->stream);
+
+    furi_string_free(instance->buffer);
+
+    free(instance->model);
+    free(instance);
+}
+
+static bool hex_editor_open_file(HexEditor* hex_editor, const char* file_path) {
+    furi_assert(hex_editor);
+    furi_assert(file_path);
+
+    hex_editor->model->stream = buffered_file_stream_alloc(hex_editor->storage);
+    bool isOk = true;
+
+    do {
+        if(!buffered_file_stream_open(
+               hex_editor->model->stream, file_path, FSAM_READ_WRITE, FSOM_OPEN_EXISTING)) {
+            FURI_LOG_E(TAG, "Unable to open stream: %s", file_path);
+            isOk = false;
+            break;
+        };
+
+        hex_editor->model->file_size = stream_size(hex_editor->model->stream);
+    } while(false);
+
+    return isOk;
+}
+
+// static bool hex_editor_read_file(HexEditor* hex_editor) {
+//     furi_assert(hex_editor);
+//     furi_assert(hex_editor->model->stream);
+//     // furi_assert(hex_editor->model->file_offset % hex_editor_BYTES_PER_LINE == 0);
+
+//     memset(hex_editor->model->file_bytes, 0x0, hex_editor_BUF_SIZE);
+//     bool isOk = true;
+
+//     do {
+//         uint32_t offset = hex_editor->model->file_offset;
+//         if(!stream_seek(hex_editor->model->stream, offset, true)) {
+//             FURI_LOG_E(TAG, "Unable to seek stream");
+//             isOk = false;
+//             break;
+//         }
+
+//         hex_editor->model->file_read_bytes = stream_read(
+//             hex_editor->model->stream,
+//             (uint8_t*)hex_editor->model->file_bytes,
+//             hex_editor_BUF_SIZE);
+//     } while(false);
+
+//     return isOk;
+// }
+
+int32_t hex_editor_app(void* p) {
+    UNUSED(p);
+
+    HexEditor* hex_editor = hex_editor_alloc();
+
+    FuriString* file_path;
+    file_path = furi_string_alloc();
+
+    // furi_string_printf(
+    //     hex_editor->buffer,
+    //     "qqqqq1231231232343454565676urtfgsdfascesc\nasdqwe\new ra sssssssssssssssssssssssssqqqqqqqqqqq1231231232343454565676urtfgsdfascesc\nq2e");
+
+    do {
+        if(p && strlen(p)) {
+            furi_string_set(file_path, (const char*)p);
+        } else {
+            furi_string_set(file_path, "/any");
+
+            DialogsFileBrowserOptions browser_options;
+            dialog_file_browser_set_basic_options(&browser_options, "*", &I_edit_10px);
+            browser_options.hide_ext = false;
+
+            DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
+            bool res = dialog_file_browser_show(dialogs, file_path, file_path, &browser_options);
+
+            furi_record_close(RECORD_DIALOGS);
+            if(!res) {
+                FURI_LOG_I(TAG, "No file selected");
+                break;
+            }
+        }
+
+        FURI_LOG_I(TAG, "File selected: %s", furi_string_get_cstr(file_path));
+
+        if(!hex_editor_open_file(hex_editor, furi_string_get_cstr(file_path))) break;
+
+        if(!stream_read_line(hex_editor->model->stream, hex_editor->buffer)) {
+            FURI_LOG_T(TAG, "No keys left in dict");
+            break;
+        }
+
+        InputEvent event;
+        int8_t off;
+        while(1) {
+            // Выбираем событие из очереди в переменную event (ждем бесконечно долго, если очередь пуста)
+            // и проверяем, что у нас получилось это сделать
+            furi_check(
+                furi_message_queue_get(hex_editor->input_queue, &event, FuriWaitForever) ==
+                FuriStatusOk);
+
+            // Если нажата кнопка "назад", то выходим из цикла, а следовательно и из приложения
+            if(event.type == InputTypeShort || event.type == InputTypeRepeat) {
+                if(!hex_editor->model->mode) {
+                    off = 1;
+                    if(event.type == InputTypeRepeat) {
+                        off = 2;
+                    }
+                    if(event.key == InputKeyRight) {
+                        hex_editor->model->string_offset += off;
+                        if(hex_editor->model->string_offset >=
+                           furi_string_size(hex_editor->buffer)) {
+                            // dengeros
+                            hex_editor->model->string_offset -=
+                                furi_string_size(hex_editor->buffer);
+                        }
+                    }
+                    if(event.key == InputKeyLeft) {
+                        if(hex_editor->model->string_offset - off < 0) {
+                            // dengeros
+                            hex_editor->model->string_offset +=
+                                furi_string_size(hex_editor->buffer);
+                        }
+                        hex_editor->model->string_offset -= off;
+                    }
+                    if(event.key == InputKeyDown) {
+                        hex_editor->model->string_offset = 0;
+                        if(!stream_read_line(hex_editor->model->stream, hex_editor->buffer)) {
+                            FURI_LOG_T(TAG, "No keys left in dict");
+                        }
+                    }
+                    if(event.key == InputKeyUp) {
+                        hex_editor->model->string_offset = 0;
+                        // TODO asert
+                        if(!stream_seek(hex_editor->model->stream, -1, StreamOffsetFromCurrent)) {
+                            FURI_LOG_E(TAG, "Unable to seek stream");
+                            break;
+                        }
+                        // NOT work on first line
+                        stream_seek_to_char(
+                            hex_editor->model->stream, '\n', StreamDirectionBackward);
+
+                        // if(!stream_seek(hex_editor->model->stream, -1, StreamOffsetFromCurrent)) {
+                        //     FURI_LOG_E(TAG, "Unable to seek stream");
+                        //     break;
+                        // }
+                        if(!stream_seek_to_char(
+                               hex_editor->model->stream, '\n', StreamDirectionBackward)) {
+                            stream_rewind(hex_editor->model->stream);
+                        } else {
+                            if(!stream_seek(
+                                   hex_editor->model->stream, 1, StreamOffsetFromCurrent)) {
+                                FURI_LOG_E(TAG, "Unable to seek stream");
+                                break;
+                            }
+                        }
+
+                        if(!stream_read_line(hex_editor->model->stream, hex_editor->buffer)) {
+                            FURI_LOG_T(TAG, "No keys left in dict");
+                            break;
+                        }
+                    }
+
+                    if(event.key == InputKeyOk) {
+                        hex_editor->model->editable_char = furi_string_get_char(
+                            hex_editor->buffer, hex_editor->model->string_offset);
+
+                        hex_editor->model->mode = 1;
+                    }
+                } else {
+                    off = 1;
+                    if(event.type == InputTypeRepeat) {
+                        off = 4;
+                    }
+                    if(event.key == InputKeyRight) {
+                        hex_editor->model->editable_char += off;
+                    }
+                    if(event.key == InputKeyLeft) {
+                        hex_editor->model->editable_char -= off;
+                    }
+
+                    if(event.key == InputKeyOk) {
+                        if(!stream_seek(hex_editor->model->stream, -1, StreamOffsetFromCurrent)) {
+                            FURI_LOG_E(TAG, "Unable to seek stream");
+                            break;
+                        }
+                        stream_seek_to_char(
+                            hex_editor->model->stream, '\n', StreamDirectionBackward);
+                        stream_seek(
+                            hex_editor->model->stream,
+                            hex_editor->model->string_offset + 1,
+                            StreamOffsetFromCurrent);
+
+                        stream_write_char(
+                            hex_editor->model->stream, hex_editor->model->editable_char);
+
+                        hex_editor->model->editable_char = ' ';
+
+                        hex_editor->model->mode = 0;
+
+                        stream_seek_to_char(
+                            hex_editor->model->stream, '\n', StreamDirectionBackward);
+
+                        if(!stream_seek(hex_editor->model->stream, 1, StreamOffsetFromCurrent)) {
+                            FURI_LOG_E(TAG, "Unable to seek stream");
+                            break;
+                        }
+
+                        if(!stream_read_line(hex_editor->model->stream, hex_editor->buffer)) {
+                            FURI_LOG_T(TAG, "No keys left in dict");
+                            break;
+                        }
+                    }
+                }
+            }
+            if(event.key == InputKeyBack) {
+                break;
+            }
+            // ?
+            view_port_update(hex_editor->view_port);
+        }
+    } while(false);
+
+    furi_string_free(file_path);
+    hex_editor_free(hex_editor);
+
+    return 0;
+}
\ No newline at end of file
diff --git a/applications/external/hex_editor/icons/Pin_arrow_up_7x9.png b/applications/external/hex_editor/icons/Pin_arrow_up_7x9.png
new file mode 100644
index 000000000..a91a6fd5e
Binary files /dev/null and b/applications/external/hex_editor/icons/Pin_arrow_up_7x9.png differ
diff --git a/applications/external/hex_editor/icons/edit_10px.png b/applications/external/hex_editor/icons/edit_10px.png
new file mode 100644
index 000000000..eeebcb2b9
Binary files /dev/null and b/applications/external/hex_editor/icons/edit_10px.png differ