diff --git a/applications/system/hid_app/views/hid_mouse.c b/applications/system/hid_app/views/hid_mouse.c
index c4024f10e..4f568b26c 100644
--- a/applications/system/hid_app/views/hid_mouse.c
+++ b/applications/system/hid_app/views/hid_mouse.c
@@ -201,6 +201,15 @@ static bool hid_mouse_input_callback(InputEvent* event, void* context) {
 
     if(event->type == InputTypeLong && event->key == InputKeyBack) {
         hid_hal_mouse_release_all(hid_mouse->hid);
+
+        with_view_model(
+            hid_mouse->view,
+            HidMouseModel * model,
+            {
+                model->left_mouse_held = false;
+                model->left_mouse_pressed = false;
+            },
+            false);
     } else {
         hid_mouse_process(hid_mouse, event);
         consumed = true;
diff --git a/applications/system/hid_app/views/hid_mouse_clicker.c b/applications/system/hid_app/views/hid_mouse_clicker.c
index bc0abe56f..3a2a064cb 100644
--- a/applications/system/hid_app/views/hid_mouse_clicker.c
+++ b/applications/system/hid_app/views/hid_mouse_clicker.c
@@ -52,37 +52,37 @@ static void hid_mouse_clicker_draw_callback(Canvas* canvas, void* context) {
 #endif
 
     canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 27, 3, AlignLeft, AlignTop, "Mouse Clicker");
+    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse Clicker");
+    canvas_set_font(canvas, FontSecondary);
 
     // Ok
-    canvas_draw_icon(canvas, 63, 25, &I_Space_65x18);
+    canvas_draw_icon(canvas, 58, 25, &I_Space_65x18);
+
     if(model->running) {
-        canvas_set_font(canvas, FontPrimary);
-
-        FuriString* rate_label = furi_string_alloc();
-        furi_string_printf(rate_label, "%d clicks/s\n\nUp / Down", model->rate);
-        elements_multiline_text(canvas, AlignLeft, 35, furi_string_get_cstr(rate_label));
-        canvas_set_font(canvas, FontSecondary);
-        furi_string_free(rate_label);
-
-        elements_slightly_rounded_box(canvas, 66, 27, 60, 13);
+        elements_slightly_rounded_box(canvas, 61, 27, 60, 13);
         canvas_set_color(canvas, ColorWhite);
-    } else {
-        canvas_set_font(canvas, FontPrimary);
-        elements_multiline_text(canvas, AlignLeft, 35, "Press Start\nto start\nclicking");
-        canvas_set_font(canvas, FontSecondary);
     }
-    canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
+
+    canvas_draw_icon(canvas, 69, 29, &I_Ok_btn_9x9);
+
     if(model->running) {
-        elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Stop");
+        elements_multiline_text_aligned(canvas, 86, 37, AlignLeft, AlignBottom, "Stop");
     } else {
-        elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Start");
+        elements_multiline_text_aligned(canvas, 86, 37, AlignLeft, AlignBottom, "Start");
     }
     canvas_set_color(canvas, ColorBlack);
 
+    // Clicks/s
+    char label[20];
+    snprintf(label, sizeof(label), "%d clicks/s", model->rate);
+    elements_multiline_text_aligned(canvas, 28, 37, AlignCenter, AlignBottom, label);
+
+    canvas_draw_icon(canvas, 25, 20, &I_ButtonUp_7x4);
+    canvas_draw_icon(canvas, 25, 44, &I_ButtonDown_7x4);
+
     // Back
-    canvas_draw_icon(canvas, 74, 49, &I_Pin_back_arrow_10x8);
-    elements_multiline_text_aligned(canvas, 91, 57, AlignLeft, AlignBottom, "Quit");
+    canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
+    elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Exit");
 }
 
 static void hid_mouse_clicker_timer_callback(void* context) {
@@ -144,6 +144,9 @@ static bool hid_mouse_clicker_input_callback(InputEvent* event, void* context) {
                 rate_changed = true;
                 consumed = true;
                 break;
+            case InputKeyBack:
+                model->running = false;
+                break;
             default:
                 consumed = true;
                 break;