@@ -92,20 +92,6 @@ void seedtool_display_screen(const char* title, const char* line1, const char* l
     present();
 }
 
-void seedtool_display_screen3(
-    const char* title, const char* line1, const char* line2, const char* line3, const char* footer)
-{
-    seedtool_render_screen3(title, line1, line2, line3, footer);
-    present();
-}
-
-void seedtool_display_screen4(const char* title, const char* line1, const char* line2, const char* line3,
-    const char* line4, const char* footer)
-{
-    seedtool_render_screen4(title, line1, line2, line3, line4, footer);
-    present();
-}
-
 void seedtool_display_dice_screen(const char* title, const char* line1, const char* line2, const char* footer,
     const seedtool_progress_t* progress)
 {
@@ -133,13 +119,6 @@ void seedtool_display_splash(void)
     present();
 }
 
-void seedtool_display_list(const char* title, const char* const* items, const size_t count, const size_t selected,
-    const size_t top, const char* footer)
-{
-    seedtool_render_list(title, items, count, selected, top, footer);
-    present();
-}
-
 void seedtool_display_nav_text(
     const seedtool_nav_t* nav, const char* title, const char* line1, const char* line2, const char* line3)
 {
 
@@ -312,8 +312,19 @@ static bool wire_order_is_big_endian(void)
 {
     static uint16_t wire[SEEDTOOL_DISPLAY_WIDTH * 5];
     const char* const items[] = { "Create Seed", "Restore Seed", "Complete Checksum" };
+    /* The Origo menu as the firmware draws it: the nav chrome, no arrow (it has
+     * no level above it), the selection on the first row. What this test needs
+     * from the image is the selection orange on row 21 and black and white
+     * elsewhere, and the chrome's list puts the bar in the same place and at
+     * the same width the plain list did - 226 orange pixels on that row either
+     * way, measured before this was switched over. */
+    const seedtool_nav_t nav = { .selected = 0,
+        .confirm = NULL,
+        .confirm_enabled = false,
+        .back = false,
+        .confirm_as_tick = true };
 
-    seedtool_render_list("Origo", items, 3, 0, 0, "1/3");
+    seedtool_render_nav_list(&nav, "Origo", items, 3, 0);
     const uint16_t* const pixels = seedtool_render_pixels();
     for (size_t row = 0; row + 5 <= SEEDTOOL_DISPLAY_HEIGHT; row += 5) {
         seedtool_render_wire_rows(wire, row, 5);
@@ -331,7 +342,7 @@ static bool wire_order_is_big_endian(void)
     }
     /* The selection orange is the colour that actually came out blue. */
     seedtool_render_clear();
-    seedtool_render_list("Origo", items, 3, 0, 0, "1/3");
+    seedtool_render_nav_list(&nav, "Origo", items, 3, 0);
     seedtool_render_wire_rows(wire, 21, 1);
     bool orange_found = false;
     for (size_t i = 0; i < SEEDTOOL_DISPLAY_WIDTH; ++i) {
@@ -2213,10 +2224,23 @@ static int self_test(void)
         fputs("Origo QR self-test failed\n", stderr);
         return 1;
     }
-    /* Draw a list scrolled to its end and one scrolled to its start, so both
-     * arrows and the selection bar are exercised. */
-    seedtool_render_list("Wallet", menu_labels, 7, 6, 4, "7/7   L/R move   BOTH select");
-    seedtool_render_list("Word 3/12  aba", menu_labels, MENU_LABEL_COUNT, 0, 0, "1/24   L/R move   BOTH select");
+    /* Draw a list scrolled to its end and one scrolled to its start, so the
+     * scroll indicator and the selection bar are both exercised. On the chrome
+     * that indicator is the thumb, not the pair of arrows the plain list drew -
+     * these two used to paint the old list, which meant they were exercising a
+     * widget the firmware had stopped shipping. */
+    const seedtool_nav_t scrolled = { .selected = 6,
+        .confirm = NULL,
+        .confirm_enabled = false,
+        .back = true,
+        .confirm_as_tick = true };
+    const seedtool_nav_t at_start = { .selected = 0,
+        .confirm = NULL,
+        .confirm_enabled = false,
+        .back = true,
+        .confirm_as_tick = true };
+    seedtool_render_nav_list(&scrolled, "Wallet", menu_labels, 7, 4);
+    seedtool_render_nav_list(&at_start, "Word 3/12  aba", menu_labels, MENU_LABEL_COUNT, 0);
     /* Draw the real layouts, each opened at its centre, so one that overflows a
      * row is caught here rather than on the device. */
     const bool letters[SEEDTOOL_LETTERS + 1] = { true };
 
@@ -728,9 +728,9 @@ static void hexstr(const uint8_t* bytes, const size_t len, char* output)
 
 /* Three body lines per page, split by what actually fits on the display
  * rather than by a character count. Three rather than two costs nothing but
- * the tighter line pitch seedtool_render_screen3 uses: a third fewer pages to
- * review the same value. Returns true when the reader advanced past the last
- * page or accepted, false when they backed out. */
+ * the tighter line pitch the renderer uses for a third line: a third fewer
+ * pages to review the same value. Returns true when the reader advanced past
+ * the last page or accepted, false when they backed out. */
 static bool page_text_impl(const char* title, const char* text, const bool confirmable)
 {
     size_t start[MAX_PAGE_LINES], length[MAX_PAGE_LINES];
 
@@ -188,20 +188,6 @@ void seedtool_display_screen(const char* title, const char* line1, const char* l
     flush();
 }
 
-void seedtool_display_screen3(
-    const char* title, const char* line1, const char* line2, const char* line3, const char* footer)
-{
-    seedtool_render_screen3(title, line1, line2, line3, footer);
-    flush();
-}
-
-void seedtool_display_screen4(const char* title, const char* line1, const char* line2, const char* line3,
-    const char* line4, const char* footer)
-{
-    seedtool_render_screen4(title, line1, line2, line3, line4, footer);
-    flush();
-}
-
 void seedtool_display_digits(const char* title, const char* digits, const size_t count, const size_t active,
     const char* footer, const seedtool_progress_t* progress)
 {
@@ -229,13 +215,6 @@ void seedtool_display_splash(void)
     flush();
 }
 
-void seedtool_display_list(const char* title, const char* const* items, const size_t count, const size_t selected,
-    const size_t top, const char* footer)
-{
-    seedtool_render_list(title, items, count, selected, top, footer);
-    flush();
-}
-
 void seedtool_display_nav_text(
     const seedtool_nav_t* nav, const char* title, const char* line1, const char* line2, const char* line3)
 {
 
@@ -25,15 +25,9 @@ void seedtool_display_init(void);
 void seedtool_display_set_orientation(bool flipped);
 void seedtool_display_set_brightness(unsigned level);
 void seedtool_display_screen(const char* title, const char* line1, const char* line2, const char* footer);
-void seedtool_display_screen3(
-    const char* title, const char* line1, const char* line2, const char* line3, const char* footer);
-void seedtool_display_screen4(const char* title, const char* line1, const char* line2, const char* line3,
-    const char* line4, const char* footer);
 void seedtool_display_dice_screen(const char* title, const char* line1, const char* line2, const char* footer,
     const seedtool_progress_t* progress);
 void seedtool_display_splash(void);
-void seedtool_display_list(const char* title, const char* const* items, size_t count, size_t selected, size_t top,
-    const char* footer);
 /* One wrapper per nav screen shape, each just its renderer plus a flush. A
  * new shape needs one here and one in each backend; everything about the
  * chrome itself is already carried by seedtool_nav_t. */
 
@@ -24,9 +24,9 @@
 #define DICE_BAR_Y 90
 #define DICE_BAR_HEIGHT 14
 
-/* Left margin for seedtool_render_screen4's four body lines: a numbered list
- * reads as a table, so every row starts at the same x rather than each being
- * centred as its own block and drifting with how wide its own text is. */
+/* Left margin for the four-row body: a numbered list reads as a table, so every
+ * row starts at the same x rather than each being centred as its own block and
+ * drifting with how wide its own text is. */
 #define SCREEN4_TEXT_X 20
 
 #define KEYBOARD_COLUMNS 10
@@ -80,8 +80,11 @@
  * at 103) and the bar. The small face fits the 14px left over; the 16px one
  * would not. */
 #define NAV_COUNTER_Y 105
-/* seedtool_render_screen4's four left-aligned rows, kept at its own heights so
- * a numbered list reads the same with the chrome as without it. */
+/* Four left-aligned rows. The heights are inherited from the plain four-line
+ * screen this replaced, and kept rather than re-derived: 28 to 88 in steps of
+ * 20 fits four 16px lines between the header and the counter with a real gap
+ * under each, which is the arithmetic the pixel scan in the self-test holds
+ * them to. */
 #define NAV_ROWS_SHOWN 4
 #define NAV_ROWS_TOP 28
 #define NAV_ROWS_HEIGHT 20
@@ -425,42 +428,6 @@ void seedtool_render_screen(const char* title, const char* line1, const char* li
     draw_centered(tft_DefaultFont, footer, 111);
 }
 
-/* Same face and footer as seedtool_render_screen, but a third body line
- * pitched tighter (25px apart rather than 26, and starting closer to the
- * title) so it still clears the footer: a long value paged three lines at a
- * time needs a third of fewer pages to review, at the same 16px face. */
-void seedtool_render_screen3(
-    const char* title, const char* line1, const char* line2, const char* line3, const char* footer)
-{
-    seedtool_render_clear();
-    draw_centered(tft_Ubuntu16, title, 5);
-    draw_centered(tft_Ubuntu16, line1, 33);
-    draw_centered(tft_Ubuntu16, line2, 58);
-    draw_centered(tft_Ubuntu16, line3, 83);
-    draw_centered(tft_DefaultFont, footer, 111);
-}
-
-/* Same face and footer again, pitched tighter still (20px, against three
- * lines' 25px) to fit a fourth: a numbered word (or word-number) list reads
- * one entry per line, so 12 or 24 entries comes out to a clean 3 or 6 pages
- * this way instead of the 4 or 8 three lines would need. Still clears the
- * footer with room to spare at the same 16px face - the four lines run
- * title+23 to title+23+3*20+16, i.e. y=28 to 108, three pixels shy of the
- * footer at 111. Pixel-scanned directly (seedtool_render_pixels) to confirm
- * every line clears the next with a real gap - the zoomed Compact SeedQR
- * region label overlap bug was proof enough not to eyeball this arithmetic. */
-void seedtool_render_screen4(const char* title, const char* line1, const char* line2, const char* line3,
-    const char* line4, const char* footer)
-{
-    seedtool_render_clear();
-    draw_centered(tft_Ubuntu16, title, 5);
-    draw_left(tft_Ubuntu16, line1, SCREEN4_TEXT_X, 28);
-    draw_left(tft_Ubuntu16, line2, SCREEN4_TEXT_X, 48);
-    draw_left(tft_Ubuntu16, line3, SCREEN4_TEXT_X, 68);
-    draw_left(tft_Ubuntu16, line4, SCREEN4_TEXT_X, 88);
-    draw_centered(tft_DefaultFont, footer, 111);
-}
-
 seedtool_thumb_t seedtool_list_thumb(const size_t count, const size_t top, const int track)
 {
     seedtool_thumb_t thumb = { 0, track };
@@ -504,44 +471,6 @@ size_t seedtool_list_top(const size_t count, const size_t selected, size_t previ
     return previous_top;
 }
 
-void seedtool_render_list(const char* title, const char* const* items, const size_t count, const size_t selected,
-    const size_t top, const char* footer)
-{
-    seedtool_render_clear();
-    draw_centered(tft_Ubuntu16, title, LIST_TITLE_Y);
-    for (size_t row = 0; row < SEEDTOOL_LIST_ROWS && top + row < count; ++row) {
-        const char* const item = items[top + row];
-        const bool highlighted = top + row == selected;
-        const int y = LIST_TOP + (int)row * LIST_ROW_HEIGHT;
-        /* A rule between rows, matching the nav lists and Jade's own menus:
-         * the rows read as cells rather than as stacked lines of text, and it
-         * sits in the gap between them so the selection bar never paints over
-         * it. Between them and not above the first, so this list and a nav one
-         * carry the same line in the same places - a screen that gained the
-         * chrome should not also change how its rows are drawn.
-         *
-         * It used to be drawn above the last row alone, to set the way out
-         * apart from the choices. That distinction now rests on position,
-         * which the last row has always had and which every list here keeps. */
-        if (row) {
-            fill_rect(LIST_BAR_X, y - 1, LIST_BAR_WIDTH, 1, COLOR_DIM);
-        }
-        if (highlighted) {
-            fill_rect(LIST_BAR_X, y, LIST_BAR_WIDTH, LIST_ROW_HEIGHT - 2, COLOR_HIGHLIGHT);
-        }
-        draw_line_at(tft_Ubuntu16, item, seedtool_render_fit_row(item), LIST_TEXT_X,
-            y + (LIST_ROW_HEIGHT - tft_Ubuntu16[1]) / 2, highlighted ? COLOR_BLACK : COLOR_WHITE);
-    }
-    if (count > SEEDTOOL_LIST_ROWS) {
-        /* With three rows visible, "there is more" is not enough on its own: the
-         * thumb's size says how much more and its place says where in it. */
-        const seedtool_thumb_t thumb = seedtool_list_thumb(count, top, LIST_SCROLL_HEIGHT);
-        fill_rect(LIST_SCROLL_X, LIST_TOP, LIST_SCROLL_WIDTH, LIST_SCROLL_HEIGHT, COLOR_DIM);
-        fill_rect(LIST_SCROLL_X, LIST_TOP + thumb.offset, LIST_SCROLL_WIDTH, thumb.height, COLOR_WHITE);
-    }
-    draw_centered(tft_DefaultFont, footer, LIST_FOOTER_Y);
-}
-
 /* A solid left-pointing triangle with its apex at (x, y + height / 2): the
  * back arrow, drawn rather than set, since the 16px face carries no glyph for
  * one and Jade's own symbols font is not linked here. */
@@ -702,10 +631,11 @@ void seedtool_render_nav_text(
     const seedtool_nav_t* nav, const char* title, const char* line1, const char* line2, const char* line3)
 {
     nav_begin(nav, title);
-    /* The same heights the plain screens use, so a screen gaining the chrome
-     * does not also move its own text - and the same choice between them that
-     * seedtool_render_screen and seedtool_render_screen3 make by being two
-     * functions: a third line means the three-line layout. */
+    /* Two layouts in one function, chosen by whether there is a third line:
+     * two lines sit at 39 and 65, three at 33, 58 and 83, pitched tighter to
+     * clear the counter. These were two separate screens before the chrome,
+     * and the heights are theirs unchanged - a screen gaining the chrome
+     * should not also move its own text. */
     if (line3) {
         draw_centered(tft_Ubuntu16, line1, 33);
         draw_centered(tft_Ubuntu16, line2, 58);
 
@@ -23,16 +23,6 @@
 void seedtool_render_clear(void);
 void seedtool_render_screen(const char* title, const char* line1, const char* line2, const char* footer);
 
-/* Same as seedtool_render_screen, but with a third body line: for a long
- * value paged three lines at a time instead of two. */
-void seedtool_render_screen3(
-    const char* title, const char* line1, const char* line2, const char* line3, const char* footer);
-
-/* Same again, with a fourth body line: for a numbered word or word-number
- * list, one entry per line, four entries per page. */
-void seedtool_render_screen4(const char* title, const char* line1, const char* line2, const char* line3,
-    const char* line4, const char* footer);
-
 /* The dice-roll quality bar drawn under a D6/D20 entry screen: a top segment
  * for rolls collected against the minimum, a bottom segment for Shannon's
  * entropy of those rolls against the minimum bits needed. `warn` colors the
@@ -95,9 +85,6 @@ typedef struct {
 
 seedtool_thumb_t seedtool_list_thumb(size_t count, size_t top, int track);
 
-void seedtool_render_list(const char* title, const char* const* items, size_t count, size_t selected, size_t top,
-    const char* footer);
-
 /* The two fixed controls a nav screen always carries, addressed as selections
  * alongside an ordinary item index. Sentinels rather than positions past the
  * end of the list, so a caller never has to know how many rows the chrome
@@ -152,20 +139,20 @@ typedef struct {
     bool confirm_as_tick;
 } seedtool_nav_t;
 
-/* Two or three centred body lines - three when `line3` is given, the same
- * choice seedtool_render_screen and seedtool_render_screen3 make by being two
- * functions. Body heights match theirs, so a screen gaining the chrome does
- * not also move its own text. */
+/* Two or three centred body lines - three when `line3` is given, which picks
+ * the tighter pitch. Both layouts keep the heights the plain screens used
+ * before the chrome replaced them, so a screen gaining the chrome does not
+ * also move its own text. */
 void seedtool_render_nav_text(
     const seedtool_nav_t* nav, const char* title, const char* line1, const char* line2, const char* line3);
 
-/* Four left-aligned rows, at seedtool_render_screen4's own heights: a numbered
- * word list, which reads as a table rather than as centred blocks. */
+/* Four left-aligned rows: a numbered word list, which reads as a table rather
+ * than as centred blocks. */
 void seedtool_render_nav_rows(const seedtool_nav_t* nav, const char* title, const char* const* rows, size_t count);
 
-/* A scrolling list under the chrome. Shows the same SEEDTOOL_LIST_ROWS rows as
- * seedtool_render_list, one pixel shorter each to buy the bar its height, so
- * seedtool_list_top and seedtool_list_thumb apply here unchanged. */
+/* A scrolling list under the chrome, SEEDTOOL_LIST_ROWS rows at a time, each a
+ * pixel shorter than the plain list's were to buy the bar its height - which is
+ * why seedtool_list_top and seedtool_list_thumb apply here unchanged. */
 void seedtool_render_nav_list(
     const seedtool_nav_t* nav, const char* title, const char* const* items, size_t count, size_t top);