diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index d97977d6c..a1e1de2c7 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -57,7 +57,7 @@
         <h2 class="text-xl font-semibold mb-2">
           {{ givenName }}
           <router-link :to="{ name: 'new-edit-account' }">
-            <fa icon="pen" class="text-xs text-blue-500 mb-1"></fa>
+            <fa icon="pen" class="text-xs text-blue-500 ml-2 mb-1"></fa>
           </router-link>
         </h2>
       </div>
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index f2f2faa17..38fd16742 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -90,20 +90,27 @@
             <EntityIcon
               :contact="contact"
               :iconSize="24"
-              class="inline-block align-text-bottom border border-slate-300 rounded"
+              class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer"
               @click="showLargeIdenticon = contact"
             />
             {{ contact.name || AppString.NO_CONTACT_NAME }}
             <button
-              class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 rounded-md"
               @click="
                 contactEdit = contact;
                 contactNewName = contact.name || '';
               "
               title="Edit"
             >
-              <fa icon="pen" class="fa-fw" />
+              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1"></fa>
             </button>
+            <router-link
+              :to="{
+                path: '/did/' + encodeURIComponent(contact.did),
+              }"
+              title="See more about this DID"
+            >
+              <fa icon="circle-info" class="text-blue-500 ml-6" />
+            </router-link>
           </h2>
           <div class="text-sm truncate">
             {{ contact.did }}
@@ -118,14 +125,6 @@
             >
               <fa icon="copy" class="text-slate-400 fa-fw"></fa>
             </button>
-            <router-link
-              :to="{
-                path: '/did/' + encodeURIComponent(contact.did),
-              }"
-              title="See more about this DID"
-            >
-              <fa icon="circle-info" class="fa-fw ml-2 text-blue-500 rounded" />
-            </router-link>
             <span v-show="showDidCopy">Copied DID</span>
           </div>
           <div class="text-sm truncate" v-if="contact.publicKeyBase64">