diff --git a/src/renderer/components/Wallet/WalletSidebar/WalletSidebar.vue b/src/renderer/components/Wallet/WalletSidebar/WalletSidebar.vue
index 88ae57e06b..a1b3fc7ce3 100644
--- a/src/renderer/components/Wallet/WalletSidebar/WalletSidebar.vue
+++ b/src/renderer/components/Wallet/WalletSidebar/WalletSidebar.vue
@@ -88,8 +88,21 @@
           }"
           class="WalletSidebar__wallet__info flex flex-col font-semibold overflow-hidden"
         >
-          <span class="block truncate">
-            {{ wallet_name(wallet.address) || wallet_truncate(wallet.address, isSlim ? 6 : 24) }}
+          <span
+            class="flex items-center"
+            :class="{ 'justify-center': isSlim }"
+          >
+            <span class="block truncate">
+              {{ wallet_name(wallet.address) || wallet_truncate(wallet.address, isSlim ? 6 : (wallet.isLedger ? 12 : 24)) }}
+            </span>
+            <span
+              v-if="wallet.isLedger"
+              v-tooltip="isSlim ? $t('COMMON.LEDGER_WALLET') : ''"
+              :class="{ 'w-5': isSlim }"
+              class="ledger-badge"
+            >
+              {{ isSlim ? $t('COMMON.LEDGER').charAt(0) : $t('COMMON.LEDGER') }}
+            </span>
           </span>
           <span
             v-if="!isSlim"
@@ -105,6 +118,7 @@
 </template>
 
 <script>
+import { uniqBy } from 'lodash'
 import Loader from '@/components/utils/Loader'
 import { MenuNavigation, MenuNavigationItem } from '@/components/Menu'
 import { sortByProp } from '@/components/utils/Sorting'
@@ -187,7 +201,10 @@ export default {
 
     refreshLedgerWallets () {
       const ledgerWallets = this.$store.getters['ledger/wallets']
-      this.selectableWallets = [...ledgerWallets, ...this.wallets]
+      this.selectableWallets = uniqBy([
+        ...ledgerWallets,
+        ...this.wallets
+      ], 'address')
     },
 
     ledgerDisconnected () {
diff --git a/src/renderer/components/Wallet/WalletTable.vue b/src/renderer/components/Wallet/WalletTable.vue
index fc47e4e11b..c6a1f4d745 100644
--- a/src/renderer/components/Wallet/WalletTable.vue
+++ b/src/renderer/components/Wallet/WalletTable.vue
@@ -32,15 +32,27 @@
 
         <div
           v-else-if="data.column.field === 'name'"
+          class="flex"
         >
-          <span class="flex items-center whitespace-no-wrap">
-            {{ walletName(data.row) | truncate(30) }}
+          <span
+            class="flex items-center whitespace-no-wrap"
+            :class="{ 'text-theme-page-text-light': !data.row.name }"
+          >
+            <span
+              v-tooltip="{
+                content: !data.row.name ? $t('COMMON.NETWORK_NAME') : '',
+                placement: 'right'
+              }"
+              :class="{ 'pr-1': walletName(data.row) }"
+            >
+              {{ walletName(data.row) | truncate(30) }}
+            </span>
             <span
               v-if="data.row.isLedger"
-              class="WalletTable__ledger-badge bg-red-light text-white p-1 text-xs font-bold rounded pointer-events-none"
-              :class="{ 'ml-3': walletName(data.row) }"
+              class="ledger-badge"
+              :class="{ 'ml-0': !walletName(data.row) }"
             >
-              {{ $t('WALLET_TABLE.LEDGER') }}
+              {{ $t('COMMON.LEDGER') }}
             </span>
           </span>
         </div>
@@ -194,8 +206,16 @@ export default {
     },
 
     sortByName (x, y, col, rowX, rowY) {
-      const one = this.wallet_name(rowX.address) || ''
-      const two = this.wallet_name(rowY.address) || ''
+      let one = this.wallet_name(rowX.address) || ''
+      let two = this.wallet_name(rowY.address) || ''
+
+      if (!isNaN(one)) {
+        one = one.padStart(10, 0)
+      }
+
+      if (!isNaN(two)) {
+        two = two.padStart(10, 0)
+      }
 
       return (one < two ? -1 : one > two ? 1 : 0)
     },
@@ -228,7 +248,4 @@ export default {
 .WalletTable .identicon {
   transition: 0.5s;
 }
-.WalletTable__ledger-badge {
-  opacity: 0.85
-}
 </style>
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index 1ab14ed617..6ff7c336bf 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -15,7 +15,10 @@ export default {
     FETCH: 'Fetch',
     FINISH: 'Finish',
     LANGUAGE: 'Application Language',
+    LEDGER: 'Ledger',
+    LEDGER_WALLET: 'This is a Ledger wallet',
     NETWORK: 'Network',
+    NETWORK_NAME: 'This name is provided by the network',
     NEXT: 'Next',
     NOT: 'not',
     OF: 'of',
@@ -540,7 +543,7 @@ export default {
       DELETE_WALLET: 'Delete this wallet',
       HEADER: 'My wallets',
       IMPORT_WALLET: 'Import wallet',
-      LOADING_LEDGER: 'Loading Ledger Wallets...',
+      LOADING_LEDGER: 'Loading Ledger wallets...',
       SHOW_WALLET: 'Show wallet',
       TOTAL_BALANCE: 'Total balance',
       CACHE_LEDGER: 'Cache ledger wallets?',
@@ -881,7 +884,6 @@ export default {
   },
 
   WALLET_TABLE: {
-    LEDGER: 'Ledger',
     NO_DELETE: 'Ledger wallets cannot be deleted',
     ACTIONS: 'Actions'
   }
diff --git a/src/renderer/pages/Contact/ContactAll.vue b/src/renderer/pages/Contact/ContactAll.vue
index 15fdd90ac1..36844056fb 100644
--- a/src/renderer/pages/Contact/ContactAll.vue
+++ b/src/renderer/pages/Contact/ContactAll.vue
@@ -43,21 +43,29 @@
         v-if="hasWalletGridLayout && !isLoading"
       >
         <div class="ContactAll__grid mt-10 justify-center">
-          <div class="ContactAll__grid__contact w-full overflow-hidden bg-theme-feature lg:bg-transparent rounded-lg border-theme-wallet-overview-border border-b border-r mb-3">
-            <div class="flex flex-row items-center">
-              <RouterLink :to="{ name: 'contact-new' }">
-                <WalletIdenticonPlaceholder
-                  :size="60"
-                  class="identicon opacity-50"
-                />
-              </RouterLink>
-              <div class="flex flex-col justify-center overflow-hidden pl-4 font-semibold">
-                <RouterLink :to="{ name: 'contact-new' }">
-                  {{ $t('PAGES.CONTACT_ALL.CREATE_CONTACT') }}
-                </RouterLink>
-                <span class="font-bold mt-2 opacity-50 text-lg">
-                  {{ formatter_networkCurrency(0, 2) }}
-                </span>
+          <div
+            class="ContactAll__grid__contact w-full overflow-hidden bg-theme-feature lg:bg-transparent rounded-lg cursor-pointer border-theme-wallet-overview-border border-b border-r mb-3"
+            @click="createContact"
+          >
+            <div class="ContactAll__grid__contact__wrapper">
+              <div class="flex flex-col">
+                <div class="flex items-center">
+                  <WalletIdenticonPlaceholder
+                    :size="60"
+                    class="identicon identicon-placeholder cursor-pointer opacity-50"
+                  />
+
+                  <div class="flex flex-col justify-center overflow-hidden pl-4 font-semibold">
+                    <div class="ContactAll__grid__contact__name font-semibold text-base block">
+                      <span>
+                        {{ $t('PAGES.CONTACT_ALL.CREATE_CONTACT') }}
+                      </span>
+                    </div>
+                    <span class="font-bold mt-2 opacity-50 text-lg">
+                      {{ formatter_networkCurrency(0, 2) }}
+                    </span>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -65,38 +73,50 @@
           <div
             v-for="contact in selectableContacts"
             :key="contact.id"
-            class="ContactAll__grid__contact w-full overflow-hidden bg-theme-feature lg:bg-transparent rounded-lg border-theme-wallet-overview-border border-b border-r mb-3"
+            class="ContactAll__grid__contact w-full overflow-hidden bg-theme-feature lg:bg-transparent rounded-lg cursor-pointer border-theme-wallet-overview-border border-b border-r mb-3"
+            @click="showContact(contact.id)"
           >
-            <div class="flex flex-row items-center">
-              <RouterLink
-                :to="{ name: 'wallet-show', params: { address: contact.id } }"
-                class="flex flex-row"
-              >
-                <WalletIdenticon
-                  :value="contact.address"
-                  :size="60"
-                  class="identicon cursor-pointer"
-                />
-              </RouterLink>
-              <div class="flex flex-col justify-center overflow-hidden pl-4">
-                <div class="ContactAll__grid__contact__name font-semibold text-base truncate block">
-                  <RouterLink :to="{ name: 'wallet-show', params: { address: contact.id } }">
-                    {{ wallet_nameOnContact(contact.address) || wallet_truncate(contact.address) }}
-                  </RouterLink>
+            <div class="ContactAll__grid__contact__wrapper">
+              <div class="flex flex-col">
+                <div class="flex items-center">
+                  <WalletIdenticon
+                    :value="contact.address"
+                    :size="60"
+                    class="identicon cursor-pointer"
+                  />
+
+                  <div class="flex flex-col justify-center overflow-hidden pl-4">
+                    <div class="ContactAll__grid__contact__name font-semibold text-base truncate block">
+                      <span
+                        v-tooltip="{
+                          content: !contact.name && wallet_name(contact.address) ? $t('COMMON.NETWORK_NAME') : '',
+                          placement: 'right'
+                        }"
+                        class="pr-1 cursor-default"
+                        @click.stop
+                      >
+                        {{ contact.name || wallet_name(contact.address) || wallet_truncate(contact.address) }}
+                      </span>
+                    </div>
+                    <span
+                      class="font-bold mt-2 text-lg cursor-default"
+                      @click.stop
+                    >
+                      {{ formatter_networkCurrency(contact.balance, 2) }}
+                    </span>
+                  </div>
+                </div>
+
+                <div class="flex flex-row w-full justify-end">
+                  <button
+                    class="ContactAll__grid__contact__select font-semibold flex text-xs cursor-pointer hover:underline hover:text-red text-theme-page-text-light mt-4"
+                    @click.stop="openRemovalConfirmation(contact)"
+                  >
+                    {{ $t('PAGES.CONTACT_ALL.DELETE_CONTACT') }}
+                  </button>
                 </div>
-                <span class="font-bold mt-2 text-lg">
-                  {{ formatter_networkCurrency(contact.balance, 2) }}
-                </span>
               </div>
             </div>
-            <div class="flex flex-row w-full justify-end">
-              <button
-                class="ContactAll__grid__contact__select font-semibold flex text-xs cursor-pointer hover:underline hover:text-red text-theme-page-text-light mt-4"
-                @click="openRemovalConfirmation(contact)"
-              >
-                {{ $t('PAGES.CONTACT_ALL.DELETE_CONTACT') }}
-              </button>
-            </div>
           </div>
         </div>
       </div>
@@ -249,6 +269,10 @@ export default {
 
     createContact () {
       this.$router.push({ name: 'contact-new' })
+    },
+
+    showContact (contactId) {
+      this.$router.push({ name: 'wallet-show', params: { address: contactId } })
     }
   }
 }
@@ -263,16 +287,22 @@ export default {
   grid-template-columns: repeat(auto-fill, calc(var(--contact-identicon-lg) * 3));
   grid-gap: 1rem;
 }
-.ContactAll__grid__contact {
-  @apply .p-6
+.ContactAll__grid__contact__wrapper {
+  @apply .m-6;
 }
 .ContactAll__grid__contact:hover .identicon {
   transition: 0.5s;
   opacity: 0.5;
 }
+.ContactAll__grid__contact:hover .identicon-placeholder {
+  opacity: 0.25;
+}
 .ContactAll__grid__contact .identicon {
   transition: 0.5s;
 }
+.ContactAll__grid__contact__name {
+  color: #037cff;
+}
 .ContactAll__CreateButton {
   transition: all .1s ease-in;
   @apply .flex .items-center .mx-auto .font-semibold .bg-theme-button .rounded .cursor-pointer .text-theme-option-button-text .mr-6;
@@ -289,8 +319,8 @@ export default {
   @apply .text-white;
 }
 @screen lg {
-  .ContactAll__grid__contact {
-    @apply .p-4
+  .ContactAll__grid__contact__wrapper {
+    @apply .m-4
   }
 }
 </style>
diff --git a/src/renderer/pages/Wallet/WalletAll.vue b/src/renderer/pages/Wallet/WalletAll.vue
index 707bf0b9c0..77e19f4036 100644
--- a/src/renderer/pages/Wallet/WalletAll.vue
+++ b/src/renderer/pages/Wallet/WalletAll.vue
@@ -108,39 +108,57 @@
           <div
             v-for="wallet in selectableWallets"
             :key="wallet.id"
-            class="WalletAll__grid__wallet w-full overflow-hidden bg-theme-feature lg:bg-transparent rounded-lg border-theme-wallet-overview-border border-b border-r mb-3"
+            class="WalletAll__grid__wallet w-full overflow-hidden bg-theme-feature lg:bg-transparent rounded-lg cursor-pointer border-theme-wallet-overview-border border-b border-r mb-3 "
+            @click="showWallet(wallet.id)"
           >
-            <div class="flex flex-row items-center">
-              <RouterLink
-                :to="{ name: 'wallet-show', params: { address: wallet.id } }"
-                class="flex flex-row"
-              >
-                <WalletIdenticon
-                  :value="wallet.address"
-                  :size="60"
-                  class="identicon cursor-pointer"
-                />
-              </RouterLink>
-              <div class="flex flex-col justify-center overflow-hidden pl-4">
-                <div class="WalletAll__grid__wallet__name font-semibold text-base truncate block">
-                  <RouterLink :to="{ name: 'wallet-show', params: { address: wallet.id } }">
-                    {{ wallet_name(wallet.address) || wallet_truncate(wallet.address) }}
-                  </RouterLink>
+            <div class="WalletAll__grid__wallet__wrapper">
+              <div class="flex flex-col">
+                <div class="flex items-center">
+                  <WalletIdenticon
+                    :value="wallet.address"
+                    :size="60"
+                    class="identicon cursor-pointer"
+                  />
+
+                  <div class="flex flex-col justify-center overflow-hidden pl-4">
+                    <div class="flex items-center">
+                      <span
+                        v-tooltip="{
+                          content: !wallet.name && wallet_name(wallet.address) ? $t('COMMON.NETWORK_NAME') : '',
+                          placement: 'right'
+                        }"
+                        class="WalletAll__grid__wallet__name font-semibold text-base truncate block pr-1 cursor-default"
+                        @click.stop
+                      >
+                        {{ wallet.name || wallet_name(wallet.address) || wallet_truncate(wallet.address) }}
+                      </span>
+                      <span
+                        v-if="wallet.isLedger"
+                        class="ledger-badge"
+                      >
+                        {{ $t('COMMON.LEDGER') }}
+                      </span>
+                    </div>
+                    <span
+                      class="font-bold mt-2 text-lg cursor-default"
+                      @click.stop
+                    >
+                      {{ formatter_networkCurrency(wallet.balance, 2) }}
+                    </span>
+                  </div>
+                </div>
+
+                <div class="flex flex-row w-full justify-end">
+                  <button
+                    v-if="!wallet.isLedger"
+                    class="WalletAll__grid__wallet__select font-semibold flex text-xs cursor-pointer hover:underline hover:text-red text-theme-page-text-light mt-4"
+                    @click.stop="openRemovalConfirmation(wallet)"
+                  >
+                    {{ $t('PAGES.WALLET_ALL.DELETE_WALLET') }}
+                  </button>
                 </div>
-                <span class="font-bold mt-2 text-lg">
-                  {{ formatter_networkCurrency(wallet.balance, 2) }}
-                </span>
               </div>
             </div>
-            <div class="flex flex-row w-full justify-end">
-              <button
-                v-if="!wallet.isLedger"
-                class="WalletAll__grid__wallet__select font-semibold flex text-xs cursor-pointer hover:underline hover:text-red text-theme-page-text-light mt-4"
-                @click="openRemovalConfirmation(wallet)"
-              >
-                {{ $t('PAGES.WALLET_ALL.DELETE_WALLET') }}
-              </button>
-            </div>
           </div>
         </div>
 
@@ -180,7 +198,7 @@
 </template>
 
 <script>
-import { clone, some, sortBy } from 'lodash'
+import { clone, some, sortBy, uniqBy } from 'lodash'
 import { ButtonLayout, ButtonLetter, ButtonSwitch } from '@/components/Button'
 import Loader from '@/components/utils/Loader'
 import { WalletIdenticon, WalletRemovalConfirmation, WalletRenameModal, WalletButtonCreate, WalletButtonImport } from '@/components/Wallet'
@@ -319,7 +337,10 @@ export default {
 
     async refreshLedgerWallets () {
       const ledgerWallets = this.$store.getters['ledger/wallets']
-      this.selectableWallets = [...ledgerWallets, ...this.wallets]
+      this.selectableWallets = uniqBy([
+        ...ledgerWallets,
+        ...this.wallets
+      ], 'address')
     },
 
     ledgerDisconnected () {
@@ -355,6 +376,10 @@ export default {
 
     onRenameWallet (wallet) {
       this.openRenameModal(wallet)
+    },
+
+    showWallet (walletId) {
+      this.$router.push({ name: 'wallet-show', params: { address: walletId } })
     }
   }
 }
@@ -372,19 +397,22 @@ export default {
   grid-template-columns: repeat(auto-fill, calc(var(--wallet-identicon-lg) * 3));
   grid-gap: 1rem;
 }
-.WalletAll__grid__wallet {
-  @apply .p-6
+.WalletAll__grid__wallet__wrapper {
+  @apply .m-6
 }
 .WalletAll__grid__wallet:hover .identicon {
   transition: 0.5s;
   opacity: 0.5;
 }
+.WalletAll__grid__wallet__name {
+  color: #037cff;
+}
 .WalletAll__grid__wallet .identicon {
   transition: 0.5s;
 }
 @screen lg {
-  .WalletAll__grid__wallet {
-    @apply .p-4
+  .WalletAll__grid__wallet__wrapper {
+    @apply .m-4
   }
 }
 </style>
diff --git a/src/renderer/styles/_badges.css b/src/renderer/styles/_badges.css
new file mode 100644
index 0000000000..f347808c54
--- /dev/null
+++ b/src/renderer/styles/_badges.css
@@ -0,0 +1,4 @@
+.ledger-badge {
+  opacity: 0.85;
+  @apply .flex .flex-no-shrink .items-center .justify-center .bg-red-light .text-white .p-1 .h-5 .text-xs .font-bold .rounded .ml-2
+}
diff --git a/src/renderer/styles/style.css b/src/renderer/styles/style.css
index 57f1dea576..4e4828b63e 100644
--- a/src/renderer/styles/style.css
+++ b/src/renderer/styles/style.css
@@ -17,6 +17,7 @@
 
 @import './_animations.css';
 @import './_avatars.css';
+@import './_badges.css';
 @import './_buttons.css';
 @import './_cursors.css';
 @import './_fonts.css';