diff --git a/src/styles/mobile/global.scss b/src/styles/mobile/global.scss
index b8874fed..f847bb4e 100644
--- a/src/styles/mobile/global.scss
+++ b/src/styles/mobile/global.scss
@@ -126,10 +126,20 @@ i.icon.la, i.icon.las, i.icon.lab {
     font-size: var(--ebk-searchbar-disable-button-font-size);
 }
 
+.ios .toolbar .link {
+    padding: 0 6px;
+}
+
 .chip.chip-placeholder {
     border: 0;
 }
 
+.ios .popover-inner {
+    > :not(.list) {
+        display: none;
+    }
+}
+
 .actions-button.disabled {
     --f7-actions-bg-color: rgba(208, 208, 208, 0.95);
     opacity: inherit !important;
@@ -258,6 +268,14 @@ i.icon.la, i.icon.las, i.icon.lab {
 .login-page-fixed-bottom {
     height: calc(80px + var(--f7-safe-area-bottom));
     background-color: inherit !important;
+
+    &::before {
+        display: none !important;
+    }
+
+    &::after {
+        display: none !important;
+    }
 }
 
 .login-page-fixed-bottom > .toolbar-inner {
diff --git a/src/views/mobile/transactions/EditPage.vue b/src/views/mobile/transactions/EditPage.vue
index 54a39917..216a609b 100644
--- a/src/views/mobile/transactions/EditPage.vue
+++ b/src/views/mobile/transactions/EditPage.vue
@@ -1,5 +1,5 @@
 <template>
-    <f7-page with-subnavbar @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
+    <f7-page @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
         <f7-navbar>
             <f7-nav-left :back-link="tt('Back')"></f7-nav-left>
             <f7-nav-title :title="tt(title)"></f7-nav-title>
@@ -7,27 +7,27 @@
                 <f7-link icon-f7="ellipsis" @click="showMoreActionSheet = true"></f7-link>
                 <f7-link icon-f7="checkmark_alt" :class="{ 'disabled': inputIsEmpty || submitting }" @click="save" v-if="mode !== TransactionEditPageMode.View"></f7-link>
             </f7-nav-right>
-
-            <f7-subnavbar>
-                <f7-segmented strong round :class="{ 'readonly': pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add }">
-                    <f7-button round :text="tt('Expense')" :active="transaction.type === TransactionType.Expense"
-                               :disabled="pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add && transaction.type !== TransactionType.Expense"
-                               v-if="transaction.type !== TransactionType.ModifyBalance"
-                               @click="transaction.type = TransactionType.Expense"></f7-button>
-                    <f7-button round :text="tt('Income')" :active="transaction.type === TransactionType.Income"
-                               :disabled="pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add && transaction.type !== TransactionType.Income"
-                               v-if="transaction.type !== TransactionType.ModifyBalance"
-                               @click="transaction.type = TransactionType.Income"></f7-button>
-                    <f7-button round :text="tt('Transfer')" :active="transaction.type === TransactionType.Transfer"
-                               :disabled="pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add && transaction.type !== TransactionType.Transfer"
-                               v-if="transaction.type !== TransactionType.ModifyBalance"
-                               @click="transaction.type = TransactionType.Transfer"></f7-button>
-                    <f7-button round :text="tt('Modify Balance')" :active="transaction.type === TransactionType.ModifyBalance"
-                               v-if="pageTypeAndMode?.type === TransactionEditPageType.Transaction && transaction.type === TransactionType.ModifyBalance"></f7-button>
-                </f7-segmented>
-            </f7-subnavbar>
         </f7-navbar>
 
+        <f7-block class="no-margin-top margin-bottom">
+            <f7-segmented strong round :class="{ 'readonly': pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add }">
+                <f7-button round :text="tt('Expense')" :active="transaction.type === TransactionType.Expense"
+                           :disabled="pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add && transaction.type !== TransactionType.Expense"
+                           v-if="transaction.type !== TransactionType.ModifyBalance"
+                           @click="transaction.type = TransactionType.Expense"></f7-button>
+                <f7-button round :text="tt('Income')" :active="transaction.type === TransactionType.Income"
+                           :disabled="pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add && transaction.type !== TransactionType.Income"
+                           v-if="transaction.type !== TransactionType.ModifyBalance"
+                           @click="transaction.type = TransactionType.Income"></f7-button>
+                <f7-button round :text="tt('Transfer')" :active="transaction.type === TransactionType.Transfer"
+                           :disabled="pageTypeAndMode?.type === TransactionEditPageType.Transaction && mode !== TransactionEditPageMode.Add && transaction.type !== TransactionType.Transfer"
+                           v-if="transaction.type !== TransactionType.ModifyBalance"
+                           @click="transaction.type = TransactionType.Transfer"></f7-button>
+                <f7-button round :text="tt('Modify Balance')" :active="transaction.type === TransactionType.ModifyBalance"
+                           v-if="pageTypeAndMode?.type === TransactionEditPageType.Transaction && transaction.type === TransactionType.ModifyBalance"></f7-button>
+            </f7-segmented>
+        </f7-block>
+
         <f7-list strong inset dividers class="margin-vertical skeleton-text" v-if="loading">
             <f7-list-input label="Template Name" placeholder="Template Name" v-if="pageTypeAndMode?.type === TransactionEditPageType.Template"></f7-list-input>
             <f7-list-item