diff --git a/src/views/mobile/SignupPage.vue b/src/views/mobile/SignupPage.vue
index 5c3b883b..c569a384 100644
--- a/src/views/mobile/SignupPage.vue
+++ b/src/views/mobile/SignupPage.vue
@@ -4,7 +4,7 @@
             <f7-nav-left :back-link="tt('Back')"></f7-nav-left>
             <f7-nav-title :title="tt('Sign Up')"></f7-nav-title>
             <f7-nav-right>
-                <f7-link :class="{ 'disabled': inputIsEmpty || submitting }" :text="tt('Submit')" @click="submit"></f7-link>
+                <f7-link icon-f7="checkmark_alt" :class="{ 'disabled': inputIsEmpty || submitting }" @click="submit"></f7-link>
             </f7-nav-right>
         </f7-navbar>
 
@@ -135,10 +135,10 @@
             <f7-page>
                 <f7-navbar>
                     <f7-nav-left>
-                        <f7-link popup-close :text="tt('Back')"></f7-link>
+                        <f7-link popup-close icon-f7="xmark"></f7-link>
                     </f7-nav-left>
                     <f7-nav-title :title="tt('Preset Categories')"></f7-nav-title>
-                    <f7-nav-right>
+                    <f7-nav-right class="navbar-compact-icons">
                         <f7-link icon-f7="ellipsis" @click="showPresetCategoriesMoreActionSheet = true"></f7-link>
                         <f7-link close @click="usePresetCategories = true; showPresetCategories = false" v-if="!usePresetCategories">{{ tt('Enable') }}</f7-link>
                         <f7-link close @click="usePresetCategories = false; showPresetCategories = false" v-if="usePresetCategories">{{ tt('Disable') }}</f7-link>
diff --git a/src/views/mobile/categories/PresetPage.vue b/src/views/mobile/categories/PresetPage.vue
index e1dce152..1c79e19d 100644
--- a/src/views/mobile/categories/PresetPage.vue
+++ b/src/views/mobile/categories/PresetPage.vue
@@ -3,9 +3,9 @@
         <f7-navbar>
             <f7-nav-left :back-link="tt('Back')"></f7-nav-left>
             <f7-nav-title :title="tt('Default Categories')"></f7-nav-title>
-            <f7-nav-right>
-                <f7-link icon-f7="ellipsis" v-if="isPresetHasCategories" @click="showMoreActionSheet = true"></f7-link>
-                <f7-link :text="tt('Save')" :class="{ 'disabled': submitting }" v-if="isPresetHasCategories" @click="save"></f7-link>
+            <f7-nav-right class="navbar-compact-icons" v-if="isPresetHasCategories">
+                <f7-link icon-f7="ellipsis" @click="showMoreActionSheet = true"></f7-link>
+                <f7-link icon-f7="checkmark_alt" :class="{ 'disabled': submitting }" @click="save"></f7-link>
             </f7-nav-right>
         </f7-navbar>
 
diff --git a/src/views/mobile/exchangerates/UpdatePage.vue b/src/views/mobile/exchangerates/UpdatePage.vue
index dd417dc4..132afe75 100644
--- a/src/views/mobile/exchangerates/UpdatePage.vue
+++ b/src/views/mobile/exchangerates/UpdatePage.vue
@@ -4,8 +4,9 @@
             <f7-nav-left :back-link="tt('Back')"></f7-nav-left>
             <f7-nav-title :title="tt('Update User Custom Exchange Rate')"></f7-nav-title>
             <f7-nav-right>
-                <f7-link :class="{ 'disabled': submitting || !defaultCurrencyAmount || !currency || !targetCurrencyAmount }"
-                         :text="tt('Update')" @click="confirm"></f7-link>
+                <f7-link icon-f7="checkmark_alt"
+                         :class="{ 'disabled': submitting || !defaultCurrencyAmount || !currency || !targetCurrencyAmount }"
+                         @click="confirm"></f7-link>
             </f7-nav-right>
         </f7-navbar>