diff --git a/applications/main/bad_kb/views/bad_kb_view.c b/applications/main/bad_kb/views/bad_kb_view.c
index 6630ff677..a609d6093 100644
--- a/applications/main/bad_kb/views/bad_kb_view.c
+++ b/applications/main/bad_kb/views/bad_kb_view.c
@@ -110,46 +110,58 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) {
         furi_string_reset(disp_str);
     } else if(state == BadKbStateIdle) {
         canvas_draw_icon(canvas, 4, 26, &I_Smile_18x18);
+        furi_string_printf(disp_str, "0/%zu", model->state.line_nb);
+        canvas_draw_str_aligned(
+            canvas, 124, 47, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         canvas_set_font(canvas, FontBigNumbers);
-        canvas_draw_str_aligned(canvas, 114, 40, AlignRight, AlignBottom, "0");
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
+        canvas_draw_str_aligned(canvas, 112, 37, AlignRight, AlignBottom, "0");
+        canvas_draw_icon(canvas, 115, 23, &I_Percent_10x14);
     } else if(state == BadKbStateRunning) {
         if(model->anim_frame == 0) {
             canvas_draw_icon(canvas, 4, 23, &I_EviSmile1_18x21);
         } else {
             canvas_draw_icon(canvas, 4, 23, &I_EviSmile2_18x21);
         }
+        furi_string_printf(disp_str, "%zu/%zu", model->state.line_cur, model->state.line_nb);
+        canvas_draw_str_aligned(
+            canvas, 124, 47, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         canvas_set_font(canvas, FontBigNumbers);
         furi_string_printf(
             disp_str, "%zu", ((model->state.line_cur - 1) * 100) / model->state.line_nb);
         canvas_draw_str_aligned(
-            canvas, 114, 40, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
+            canvas, 112, 37, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         furi_string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
+        canvas_draw_icon(canvas, 115, 23, &I_Percent_10x14);
     } else if(state == BadKbStateDone) {
         canvas_draw_icon(canvas, 4, 23, &I_EviSmile1_18x21);
+        furi_string_printf(disp_str, "%zu/%zu", model->state.line_nb, model->state.line_nb);
+        canvas_draw_str_aligned(
+            canvas, 124, 47, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         canvas_set_font(canvas, FontBigNumbers);
-        canvas_draw_str_aligned(canvas, 114, 40, AlignRight, AlignBottom, "100");
+        canvas_draw_str_aligned(canvas, 112, 37, AlignRight, AlignBottom, "100");
         furi_string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
+        canvas_draw_icon(canvas, 115, 23, &I_Percent_10x14);
     } else if(state == BadKbStateDelay) {
         if(model->anim_frame == 0) {
             canvas_draw_icon(canvas, 4, 23, &I_EviWaiting1_18x21);
         } else {
             canvas_draw_icon(canvas, 4, 23, &I_EviWaiting2_18x21);
         }
+        furi_string_printf(disp_str, "%zu/%zu", model->state.line_cur, model->state.line_nb);
+        canvas_draw_str_aligned(
+            canvas, 124, 47, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         canvas_set_font(canvas, FontBigNumbers);
         furi_string_printf(
             disp_str, "%zu", ((model->state.line_cur - 1) * 100) / model->state.line_nb);
         canvas_draw_str_aligned(
-            canvas, 114, 40, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
+            canvas, 112, 37, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         furi_string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
+        canvas_draw_icon(canvas, 115, 23, &I_Percent_10x14);
         canvas_set_font(canvas, FontSecondary);
         uint32_t delay = model->state.delay_remain / 10;
-        if(delay) furi_string_printf(disp_str, "delay %lus", delay);
+        if(delay) furi_string_printf(disp_str, "Delay %lus", delay);
         canvas_draw_str_aligned(
-            canvas, 127, 50, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
+            canvas, 4, 61, AlignLeft, AlignBottom, furi_string_get_cstr(disp_str));
         furi_string_reset(disp_str);
     } else if((state == BadKbStatePaused) || (state == BadKbStateWaitForBtn)) {
         if(model->anim_frame == 0) {
@@ -157,15 +169,20 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) {
         } else {
             canvas_draw_icon(canvas, 4, 23, &I_EviWaiting2_18x21);
         }
+        furi_string_printf(disp_str, "%zu/%zu", model->state.line_cur, model->state.line_nb);
+        canvas_draw_str_aligned(
+            canvas, 124, 47, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         canvas_set_font(canvas, FontBigNumbers);
         furi_string_printf(
             disp_str, "%zu", ((model->state.line_cur - 1) * 100) / model->state.line_nb);
         canvas_draw_str_aligned(
-            canvas, 114, 40, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
+            canvas, 112, 37, AlignRight, AlignBottom, furi_string_get_cstr(disp_str));
         furi_string_reset(disp_str);
-        canvas_draw_icon(canvas, 117, 26, &I_Percent_10x14);
-        canvas_set_font(canvas, FontSecondary);
-        canvas_draw_str_aligned(canvas, 127, 50, AlignRight, AlignBottom, "Paused");
+        canvas_draw_icon(canvas, 115, 23, &I_Percent_10x14);
+        if(state != BadKbStateWaitForBtn) {
+            canvas_set_font(canvas, FontSecondary);
+            canvas_draw_str_aligned(canvas, 4, 61, AlignLeft, AlignBottom, "Paused");
+        }
         furi_string_reset(disp_str);
     } else {
         canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);