2 files changed, 12 insertions, 3 deletions

diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index cf955423..e2bec579 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -940,7 +940,7 @@ void setupMenuTransition_Mobile(iWidget *sheet, iBool isIncoming) {
     }
     const int maxOffset = isHorizPanel            ? width_Widget(sheet)
                           : isPortraitPhone_App() ? height_Widget(sheet)
-                                                  : (12 * gap_UI);
+                                                  : (6 * gap_UI);
     if (isIncoming) {
         setVisualOffset_Widget(sheet, maxOffset, 0, 0);
         setVisualOffset_Widget(sheet, 0, 330, easeOut_AnimFlag | softer_AnimFlag);
diff --git a/src/ui/root.c b/src/ui/root.c
index 0269b095..776a9a35 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1312,8 +1312,7 @@ void createUserInterface_Root(iRoot *d) {
 #if defined (iPlatformApple)
         addUnsplitButton_(navBar);
 #endif
-        iWidget *navBack;
-        setId_Widget(navBack = addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.action1");
+        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.action1");
         setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.action2");
         /* Button for toggling the left sidebar. */
         setId_Widget(addChildFlags_Widget(
@@ -1497,6 +1496,16 @@ void createUserInterface_Root(iRoot *d) {
         /* On PC platforms, the close buttons are generally on the top right. */
         addUnsplitButton_(navBar);
 #endif
+        if (deviceType_App() == tablet_AppDeviceType) {
+            /* Ensure that all navbar buttons match the height of the input field.
+               This is required because touch input fields are given extra padding,
+               making them taller than buttons by default. */
+            iForEach(ObjectList, i, children_Widget(navBar)) {
+                if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                    as_Widget(i.object)->sizeRef = as_Widget(url);
+                }
+            }
+        }
     }
     /* Tab bar. */ {
         iWidget *mainStack = new_Widget();