diff --git a/src/views/desktop/accounts/ListPage.vue b/src/views/desktop/accounts/ListPage.vue
index ba1f6c08..42801c83 100644
--- a/src/views/desktop/accounts/ListPage.vue
+++ b/src/views/desktop/accounts/ListPage.vue
@@ -98,7 +98,7 @@
                                                            :key="itemIdx" v-for="itemIdx in [ 1, 2, 3 ]"></v-skeleton-loader>
                                     </div>
 
-                                    <v-row class="pl-2 pr-2 pr-md-4" v-if="!loading && !hasAccount(activeAccountCategory)">
+                                    <v-row class="pl-5 pr-2 pr-md-4" v-if="!loading && !hasAccount(activeAccountCategory)">
                                         <v-col cols="12">
                                             {{ $t('No available account') }}
                                         </v-col>
@@ -173,24 +173,18 @@
                                                                            :to="`/transaction/list?accountId=${accountOrSubAccountId(element)}`">
                                                                         {{ $t('Transaction List') }}
                                                                     </v-btn>
-                                                                    <v-btn class="hover-display px-2 ml-2" density="comfortable" color="default" variant="text"
+                                                                    <v-btn class="hover-display px-2 ml-1" density="comfortable" color="default" variant="text"
+                                                                           :disabled="loading"
+                                                                           :prepend-icon="element.hidden ? icons.show : icons.hide"
+                                                                           @click="hide(element, !element.hidden)">
+                                                                        {{ element.hidden ? $t('Show') : $t('Hide') }}
+                                                                    </v-btn>
+                                                                    <v-btn class="hover-display px-2 ml-1" density="comfortable" color="default" variant="text"
                                                                            :disabled="loading" :prepend-icon="icons.edit"
                                                                            @click="edit(element)">
                                                                         {{ $t('Edit') }}
                                                                     </v-btn>
-                                                                    <v-btn class="hover-display px-2 ml-2" density="comfortable" color="default" variant="text"
-                                                                           :disabled="loading" :prepend-icon="icons.hide"
-                                                                           v-if="!element.hidden"
-                                                                           @click="hide(element, true)">
-                                                                        {{ $t('Hide') }}
-                                                                    </v-btn>
-                                                                    <v-btn class="hover-display px-2 ml-2" density="comfortable" color="default" variant="text"
-                                                                           :disabled="loading" :prepend-icon="icons.show"
-                                                                           v-if="element.hidden"
-                                                                           @click="hide(element, false)">
-                                                                        {{ $t('Show') }}
-                                                                    </v-btn>
-                                                                    <v-btn class="hover-display px-2 ml-2" density="comfortable" color="default" variant="text"
+                                                                    <v-btn class="hover-display px-2 ml-1" density="comfortable" color="default" variant="text"
                                                                            :disabled="loading" :prepend-icon="icons.remove"
                                                                            @click="remove(element)">
                                                                         {{ $t('Delete') }}
diff --git a/src/views/desktop/categories/ListPage.vue b/src/views/desktop/categories/ListPage.vue
index 2d660863..feeb8943 100644
--- a/src/views/desktop/categories/ListPage.vue
+++ b/src/views/desktop/categories/ListPage.vue
@@ -127,13 +127,6 @@
 
                                                             <v-spacer/>
 
-                                                            <v-btn class="hover-display px-2" color="default"
-                                                                   density="comfortable" variant="text"
-                                                                   :prepend-icon="icons.edit"
-                                                                   :disabled="loading || updating"
-                                                                   @click="edit(element)">
-                                                                {{ $t('Edit') }}
-                                                            </v-btn>
                                                             <v-btn class="hover-display px-2 ml-2" color="default"
                                                                    density="comfortable" variant="text"
                                                                    :prepend-icon="element.hidden ? icons.show : icons.hide"
@@ -142,7 +135,14 @@
                                                                    @click="hide(element, !element.hidden)">
                                                                 {{ element.hidden ? $t('Show') : $t('Hide') }}
                                                             </v-btn>
-                                                            <v-btn class="hover-display px-2 ml-2" color="default"
+                                                            <v-btn class="hover-display px-2" color="default"
+                                                                   density="comfortable" variant="text"
+                                                                   :prepend-icon="icons.edit"
+                                                                   :disabled="loading || updating"
+                                                                   @click="edit(element)">
+                                                                {{ $t('Edit') }}
+                                                            </v-btn>
+                                                            <v-btn class="hover-display px-2" color="default"
                                                                    density="comfortable" variant="text"
                                                                    :prepend-icon="icons.remove"
                                                                    :loading="categoryRemoving[element.id]"
@@ -150,7 +150,7 @@
                                                                    @click="remove(element)">
                                                                 {{ $t('Delete') }}
                                                             </v-btn>
-                                                            <span>
+                                                            <span class="ml-2">
                                                                 <v-icon :class="!loading && !updating && availableCategoryCount > 1 ? 'drag-handle' : 'disabled'"
                                                                         :icon="icons.drag"/>
                                                                 <v-tooltip activator="parent" v-if="!loading && !updating && availableCategoryCount > 1">{{ $t('Drag and Drop to Change Order') }}</v-tooltip>
diff --git a/src/views/desktop/tags/ListPage.vue b/src/views/desktop/tags/ListPage.vue
index f14d7fd0..5c39c064 100644
--- a/src/views/desktop/tags/ListPage.vue
+++ b/src/views/desktop/tags/ListPage.vue
@@ -104,15 +104,6 @@
 
                                         <v-spacer/>
 
-                                        <v-btn class="hover-display px-2" color="default"
-                                               density="comfortable" variant="text"
-                                               :prepend-icon="icons.edit"
-                                               :loading="tagUpdating[element.id]"
-                                               :disabled="loading || updating"
-                                               v-if="editingTag.id !== element.id"
-                                               @click="edit(element)">
-                                            {{ $t('Edit') }}
-                                        </v-btn>
                                         <v-btn class="hover-display px-2 ml-2" color="default"
                                                density="comfortable" variant="text"
                                                :prepend-icon="element.hidden ? icons.show : icons.hide"
@@ -122,7 +113,16 @@
                                                @click="hide(element, !element.hidden)">
                                             {{ element.hidden ? $t('Show') : $t('Hide') }}
                                         </v-btn>
-                                        <v-btn class="hover-display px-2 ml-2" color="default"
+                                        <v-btn class="hover-display px-2" color="default"
+                                               density="comfortable" variant="text"
+                                               :prepend-icon="icons.edit"
+                                               :loading="tagUpdating[element.id]"
+                                               :disabled="loading || updating"
+                                               v-if="editingTag.id !== element.id"
+                                               @click="edit(element)">
+                                            {{ $t('Edit') }}
+                                        </v-btn>
+                                        <v-btn class="hover-display px-2" color="default"
                                                density="comfortable" variant="text"
                                                :prepend-icon="icons.remove"
                                                :loading="tagRemoving[element.id]"
@@ -139,14 +139,14 @@
                                                v-if="editingTag.id === element.id" @click="save(editingTag)">
                                             {{ $t('Save') }}
                                         </v-btn>
-                                        <v-btn class="px-2 ml-2" color="default"
+                                        <v-btn class="px-2" color="default"
                                                density="comfortable" variant="text"
                                                :prepend-icon="icons.cancel"
                                                :disabled="loading || updating"
                                                v-if="editingTag.id === element.id" @click="cancelSave(editingTag)">
                                             {{ $t('Cancel') }}
                                         </v-btn>
-                                        <span>
+                                        <span class="ml-2">
                                             <v-icon :class="!loading && !updating && availableTagCount > 1 ? 'drag-handle' : 'disabled'"
                                                     :icon="icons.drag"/>
                                             <v-tooltip activator="parent" v-if="!loading && !updating && availableTagCount > 1">{{ $t('Drag and Drop to Change Order') }}</v-tooltip>
@@ -179,14 +179,14 @@
                                        @click="save(newTag)">
                                     {{ $t('Save') }}
                                 </v-btn>
-                                <v-btn class="px-2 ml-2" color="default"
+                                <v-btn class="px-2" color="default"
                                        density="comfortable" variant="text"
                                        :prepend-icon="icons.cancel"
                                        :disabled="loading || updating"
                                        @click="cancelSave(newTag)">
                                     {{ $t('Cancel') }}
                                 </v-btn>
-                                <span>
+                                <span class="ml-2">
                                     <v-icon class="disabled" :icon="icons.drag"/>
                                 </span>
                             </div>