diff --git a/resources/js/app.js b/resources/js/app.js
index 751a189a..ec6fe306 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -11,10 +11,10 @@ import Create       from './views/Create'
 import Edit         from './views/Edit'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faPlusCircle, faQrcode, faImage } from '@fortawesome/free-solid-svg-icons'
+import { faPlusCircle, faQrcode, faImage, faTrash, faEdit } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 
-library.add(faPlusCircle, faQrcode, faImage);
+library.add(faPlusCircle, faQrcode, faImage, faTrash, faEdit);
 
 Vue.component('font-awesome-icon', FontAwesomeIcon)
 
diff --git a/resources/js/components/TwofaccountShow.vue b/resources/js/components/TwofaccountShow.vue
index eb33fdcf..81847fad 100644
--- a/resources/js/components/TwofaccountShow.vue
+++ b/resources/js/components/TwofaccountShow.vue
@@ -6,9 +6,6 @@
         <p class="is-size-4 has-text-grey-light">{{ service }}</p>
         <p class="is-size-6 has-text-grey">{{ account }}</p>
         <slot></slot>
-        <div class="modal-action-links has-text-grey">
-            <router-link :to="{ name: 'edit', params: { twofaccountId: twofaccountid }}">Edit</router-link>
-        </div>
     </div>
 </template>
 
diff --git a/resources/js/views/Accounts.vue b/resources/js/views/Accounts.vue
index 71716198..3c2d376e 100644
--- a/resources/js/views/Accounts.vue
+++ b/resources/js/views/Accounts.vue
@@ -1,6 +1,10 @@
 <template>
     <div>
         <div class="container">
+            <div class="has-text-centered">
+                <a class="button is-dark" @click="editMode = true" v-if="!editMode">Manage</a>
+                <a class="button is-dark" @click="editMode = false" v-if="editMode">Done</a>
+            </div>
             <div class="buttons are-large is-centered">
                 <span v-for="account in accounts" class="button is-black twofaccount" >
                     <span @click.stop="getAccount(account.id)">
@@ -8,7 +12,13 @@
                         {{ account.service }}
                         <span class="is-family-primary is-size-7 has-text-grey">{{ account.account }}</span>
                     </span>
-                    <a v-on:click="deleteAccount(account.id)">Delete</a>
+                    <span v-if="editMode">
+                        <a v-on:click="deleteAccount(account.id)" class="is-size-6 has-text-grey-dark">
+                            <font-awesome-icon :icon="['fas', 'trash']" />
+                        </a> <router-link :to="{ name: 'edit', params: { twofaccountId: account.id }}" class="is-size-6 has-text-grey-dark">
+                            <font-awesome-icon :icon="['fas', 'edit']" />
+                        </router-link>
+                    </span>
                 </span>
             </div>
         </div>
@@ -35,7 +45,8 @@
             return {
                 accounts : [],
                 ShowTwofaccountInModal : false,
-                twofaccount: {}
+                twofaccount: {},
+                editMode : false,
             }
         },
         mounted(){