diff --git a/README.md b/README.md
index 7258aa88b..2ff403520 100644
--- a/README.md
+++ b/README.md
@@ -44,18 +44,6 @@ yarn run build
 yarn run lint
 ```
 
-### Run your unit tests
-
-```
-yarn run test:unit
-```
-
-### Run your end-to-end tests
-
-```
-yarn run test:e2e
-```
-
 ### Run electron version
 
 ```
diff --git a/package.json b/package.json
index 062cf1ee1..d0de44053 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "author": "ADAMANT Foundation <devs@adamant.im>",
   "license": "GPLv3",
   "description": "Decentralized Messenger",
@@ -21,79 +21,87 @@
     "@liskhq/lisk-cryptography": "2.3.0",
     "@liskhq/lisk-transactions": "2.3.1",
     "@mdi/font": "^5.9.55",
-    "@stablelib/utf8": "^1.0.0",
-    "@zxing/library": "0.18.3",
-    "abi-decoder": "^2.3.0",
+    "@stablelib/utf8": "^1.0.1",
+    "@zxing/library": "0.18.6",
+    "abi-decoder": "^2.4.0",
     "axios": "^0.21.1",
     "b64-to-blob": "^1.2.19",
     "bignumber.js": "^9.0.1",
-    "bip39": "^3.0.3",
-    "bitcoinjs-lib": "^4.0.2",
+    "bip39": "^3.0.4",
+    "bitcoinjs-lib": "^5.2.0",
     "bytebuffer": "^5.0.1",
     "coininfo": "^5.1.0",
-    "core-js": "^3.8.3",
-    "dayjs": "^1.10.3",
+    "core-js": "^3.15.2",
+    "dayjs": "^1.10.6",
     "deepmerge": "^4.2.2",
     "detect-browser": "^5.2.0",
-    "dompurify": "^2.2.6",
+    "dompurify": "^2.3.0",
     "ed2curve": "^0.3.0",
-    "ethereumjs-tx": "^2.1.2",
-    "ethereumjs-util": "^7.0.7",
     "file-saver": "^2.0.5",
     "hdkey": "^2.0.1",
-    "idb": "^3.0.2",
-    "js-base64": "^3.6.0",
+    "idb": "^6.1.2",
+    "js-base64": "^3.6.1",
     "js-md5": "^0.7.3",
-    "lodash": "^4.17.20",
-    "marked": "^1.2.7",
+    "lodash": "^4.17.21",
+    "marked": "^2.1.3",
     "notifyjs": "^3.0.0",
-    "pbkdf2": "^3.1.1",
+    "pbkdf2": "^3.1.2",
     "promise-queue": "^2.2.5",
     "qrcode": "^1.4.4",
-    "qs": "^6.9.6",
+    "qs": "^6.10.1",
     "register-service-worker": "^1.7.2",
-    "rxjs": "^6.6.3",
-    "semver": "^7.3.4",
+    "semver": "^7.3.5",
     "simple-audio": "^1.0.1",
     "socket.io-client": "^2.4.0",
     "sodium-browserify-tweetnacl": "^0.2.6",
     "throttle-promise": "^1.0.4",
     "visibilityjs": "^2.0.2",
-    "vue": "^2.5.17",
-    "vue-i18n": "^8.0.0",
-    "vue-router": "^3.0.1",
-    "vue-scrollto": "^2.11.0",
-    "vuetify": "^1.5.16",
-    "vuex": "^3.0.1",
-    "vuex-persist": "^2.0.0",
-    "web3": "^0.20.6"
+    "vue": "^2.6.14",
+    "vue-i18n": "^8.24.5",
+    "vue-router": "^3.5.2",
+    "vue-scrollto": "^2.20.0",
+    "vuetify": "^1.5.24",
+    "vuex": "^3.6.2",
+    "vuex-persist": "^2.3.0",
+    "web3-eth": "^1.4.0",
+    "web3-utils": "^1.4.0"
   },
   "devDependencies": {
-    "@kazupon/vue-i18n-loader": "^0.3.0",
-    "@vue/cli-plugin-babel": "^3.0.1",
-    "@vue/cli-plugin-e2e-cypress": "^3.0.1",
-    "@vue/cli-plugin-eslint": "^3.0.1",
-    "@vue/cli-plugin-pwa": "^3.0.1",
-    "@vue/cli-plugin-unit-jest": "^3.0.1",
-    "@vue/cli-service": "^3.0.1",
-    "@vue/eslint-config-standard": "^3.0.3",
-    "@vue/test-utils": "^1.0.0-beta.25",
+    "@intlify/vue-i18n-loader": "^1.1.0",
+    "@babel/core": "7.14.8",
+    "@babel/eslint-parser": "^7.14.7",
+    "@vue/babel-preset-app": "^4.5.13",
+    "@vue/cli-plugin-babel": "^4.5.13",
+    "@vue/cli-plugin-e2e-cypress": "^4.5.13",
+    "@vue/cli-plugin-eslint": "^4.5.13",
+    "@vue/cli-plugin-pwa": "^4.5.13",
+    "@vue/cli-plugin-unit-jest": "^4.5.13",
+    "@vue/cli-service": "^4.5.13",
+    "@vue/eslint-config-standard": "^6.0.0",
+    "@vue/test-utils": "^1.2.1",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^23.0.1",
+    "babel-jest": "^27.0.6",
     "babel-plugin-rewire": "^1.2.0",
-    "cross-env": "^5.2.0",
+    "cross-env": "^7.0.3",
     "electron": "^3.0.0",
-    "lorem-ipsum": "^1.0.6",
-    "sinon": "^7.2.2",
-    "stylus": "^0.54.5",
+    "eslint": "^7.31.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-vue": "^7.14.0",
+    "lorem-ipsum": "^2.0.3",
+    "sinon": "^11.1.2",
+    "stylus": "^0.54.8",
     "stylus-loader": "^3.0.2",
-    "uuid": "^3.3.2",
-    "vue-cli-plugin-electron-builder": "^1.4.0",
-    "vue-cli-plugin-i18n": "^0.5.0",
-    "vue-cli-plugin-vuetify": "^0.4.5",
-    "vue-cli-plugin-webpack-bundle-analyzer": "^1.2.0",
-    "vue-template-compiler": "^2.5.17",
-    "vuetify-loader": "^1.2.2"
+    "uuid": "^8.3.2",
+    "vue-cli-plugin-electron-builder": "^2.1.1",
+    "vue-cli-plugin-i18n": "^2.1.2",
+    "vue-cli-plugin-vuetify": "^2.4.1",
+    "vue-cli-plugin-webpack-bundle-analyzer": "^4.0.0",
+    "vue-jest": "^3.0.7",
+    "vue-template-compiler": "^2.6.14",
+    "vuetify-loader": "^1.7.2"
   },
   "eslintConfig": {
     "root": true,
@@ -101,12 +109,19 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
+      "plugin:vue/recommended",
       "@vue/standard"
     ],
-    "rules": {},
+    "rules": {
+      "no-useless-catch": "off",
+      "vue/require-default-prop": "off",
+      "vue/require-prop-types": "off",
+      "vue/no-unused-components": "off",
+      "vue/no-template-shadow": "off",
+      "vue/no-lone-template": "off"
+    },
     "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser"
     }
   },
   "postcss": {
@@ -142,7 +157,7 @@
       "jest-serializer-vue"
     ],
     "testMatch": [
-      "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/**/*.(test|spec).(js|jsx|ts|tsx)"
+      "**/__tests__/**/*.(test|spec).(js|jsx|ts|tsx)"
     ],
     "testURL": "http://localhost/",
     "setupFiles": [
diff --git a/src/App.vue b/src/App.vue
index daed67fa8..7ec717741 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,8 @@
 <template>
-  <v-app :dark="isDarkTheme" class="application--linear-gradient">
+  <v-app
+    :dark="isDarkTheme"
+    class="application--linear-gradient"
+  >
     <warning-on-addresses-dialog v-model="showWarningOnAddressesDialog" />
     <component :is="layout">
       <router-view />
@@ -13,23 +16,12 @@ import WarningOnAddressesDialog from '@/components/WarningOnAddressesDialog'
 import Notifications from '@/lib/notifications'
 
 export default {
-  created () {
-    this.setLocale()
-  },
-  mounted () {
-    this.notifications = new Notifications(this)
-    this.notifications.start()
-  },
-  beforeDestroy () {
-    this.notifications.stop()
-    this.$store.dispatch('stopInterval')
+  components: {
+    WarningOnAddressesDialog
   },
   data: () => ({
     showWarningOnAddressesDialog: false
   }),
-  components: {
-    WarningOnAddressesDialog
-  },
   computed: {
     layout () {
       return this.$route.meta.layout || 'default'
@@ -44,6 +36,17 @@ export default {
       return this.$store.getters['options/isLoginViaPassword']
     }
   },
+  created () {
+    this.setLocale()
+  },
+  mounted () {
+    this.notifications = new Notifications(this)
+    this.notifications.start()
+  },
+  beforeDestroy () {
+    this.notifications.stop()
+    this.$store.dispatch('stopInterval')
+  },
   methods: {
     setLocale () {
       // Set language from `localStorage`.
diff --git a/src/background.js b/src/background.js
index 863809a1a..ccdeb1250 100644
--- a/src/background.js
+++ b/src/background.js
@@ -32,13 +32,14 @@ function createWindow () {
   win.on('closed', () => {
     win = null
   })
-  var template = [{
+  const template = [{
     label: 'ADAMANT Messenger',
     submenu: [
       { label: 'About', selector: 'orderFrontStandardAboutPanel:' },
       { type: 'separator' },
       { label: 'Quit', accelerator: 'Command+Q', click: function () { app.quit() } }
-    ] }, {
+    ]
+  }, {
     label: 'Edit',
     submenu: [
       { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
@@ -48,11 +49,12 @@ function createWindow () {
       { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
       { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
       { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' }
-    ] }
+    ]
+  }
   ]
   if (process.platform === 'darwin') {
     Menu.setApplicationMenu(Menu.buildFromTemplate(template))
-    var darkMode = true
+    const darkMode = true
     // if (systemPreferences.isDarkMode()) {
     //   darkMode = true;
     // }
diff --git a/src/components/AChat/AChat.vue b/src/components/AChat/AChat.vue
index 090aeb98c..b9c62b19d 100644
--- a/src/components/AChat/AChat.vue
+++ b/src/components/AChat/AChat.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="a-chat">
     <div class="a-chat__content">
+      <slot name="header" />
 
-      <slot name="header"></slot>
-
-      <v-divider/>
+      <v-divider />
 
       <div class="a-chat__body">
         <div class="text-xs-center py-2">
@@ -17,30 +16,32 @@
           />
         </div>
 
-        <div ref="messages" class="a-chat__body-messages">
-          <slot name="messages" :messages="messages">
-
-              <template v-for="message in messages">
-
-                <slot name="message"
-                  :message="message"
-                  :sender="getSenderMeta(message.senderId)"
-                  :user-id="userId"
-                  :locale="locale"
-                />
-
-              </template>
-
+        <div
+          ref="messages"
+          class="a-chat__body-messages"
+        >
+          <slot
+            name="messages"
+            :messages="messages"
+          >
+            <template v-for="message in messages">
+              <slot
+                name="message"
+                :message="message"
+                :sender="getSenderMeta(message.senderId)"
+                :user-id="userId"
+                :locale="locale"
+              />
+            </template>
           </slot>
         </div>
 
         <div class="a-chat__fab">
-          <slot name="fab"></slot>
+          <slot name="fab" />
         </div>
-
       </div>
 
-      <slot name="form"></slot>
+      <slot name="form" />
     </div>
   </div>
 </template>
@@ -50,22 +51,48 @@ import throttle from 'lodash/throttle'
 
 import AChatMessage from './AChatMessage'
 import AChatTransaction from './AChatTransaction'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 const emitScroll = throttle(function () {
   this.$emit('scroll', this.currentScrollTop, this.isScrolledToBottom())
 }, 200)
 
 export default {
-  mounted () {
-    this.attachScrollListener()
+  components: {
+    AChatMessage,
+    AChatTransaction
   },
-  beforeDestroy () {
-    this.destroyScrollListener()
+  props: {
+    messages: {
+      type: Array,
+      default: () => []
+    },
+    partners: {
+      type: Array,
+      default: () => []
+    },
+    userId: {
+      type: String
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    locale: {
+      type: String,
+      default: 'en'
+    }
   },
   data: () => ({
     currentScrollHeight: 0,
     currentScrollTop: 0
   }),
+  mounted () {
+    this.attachScrollListener()
+  },
+  beforeDestroy () {
+    this.destroyScrollListener()
+  },
   methods: {
     attachScrollListener () {
       this.$refs.messages.addEventListener('scroll', this.onScroll)
@@ -145,32 +172,7 @@ export default {
      * @returns {{ id: string, name: string }}
      */
     getSenderMeta (senderId) {
-      return this.partners.find(partner => partner.id === senderId)
-    }
-  },
-  components: {
-    AChatMessage,
-    AChatTransaction
-  },
-  props: {
-    messages: {
-      type: Array,
-      default: () => []
-    },
-    partners: {
-      type: Array,
-      default: () => []
-    },
-    userId: {
-      type: String
-    },
-    loading: {
-      type: Boolean,
-      default: false
-    },
-    locale: {
-      type: String,
-      default: 'en'
+      return this.partners.find(partner => isStringEqualCI(partner.id, senderId))
     }
   }
 }
diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue
index 9ebefb2dc..a071fbc9c 100644
--- a/src/components/AChat/AChatForm.vue
+++ b/src/components/AChat/AChatForm.vue
@@ -1,34 +1,67 @@
 <template>
   <div :class="classes">
-    <v-divider v-if="showDivider" class="a-chat__divider"/>
+    <v-divider
+      v-if="showDivider"
+      class="a-chat__divider"
+    />
     <v-textarea
+      ref="messageTextarea"
       v-model="message"
-      v-on="listeners"
       :label="label"
       hide-details
       single-line
       auto-grow
-      ref="messageTextarea"
       rows="1"
+      v-on="listeners"
     >
-      <template v-if="showSendButton" slot="append">
-        <v-icon medium>mdi-send</v-icon>
+      <template
+        v-if="showSendButton"
+        slot="append"
+      >
+        <v-icon medium>
+          mdi-send
+        </v-icon>
       </template>
       <template slot="prepend">
-        <slot name="prepend"></slot>
+        <slot name="prepend" />
       </template>
     </v-textarea>
 
     <div
       v-if="showSendButton"
-      @click="submitMessage"
       class="a-chat__form-send-area"
-    ></div>
+      @click="submitMessage"
+    />
   </div>
 </template>
 
 <script>
 export default {
+  props: {
+    messageText: {
+      default: '',
+      type: String
+    },
+    showSendButton: {
+      type: Boolean,
+      default: true
+    },
+    sendOnEnter: {
+      type: Boolean,
+      default: true
+    },
+    label: {
+      type: String,
+      default: 'Type a message'
+    },
+    showDivider: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data: () => ({
+    message: ''
+  }),
   computed: {
     className: () => 'a-chat',
     classes () {
@@ -72,9 +105,12 @@ export default {
       }
     }
   },
-  data: () => ({
-    message: ''
-  }),
+  mounted () {
+    if (this.messageText) {
+      this.message = this.messageText
+      this.focus()
+    }
+  },
   methods: {
     submitMessage () {
       this.$emit('message', this.message)
@@ -92,34 +128,6 @@ export default {
     focus () {
       this.$refs.messageTextarea.focus()
     }
-  },
-  mounted () {
-    if (this.messageText) {
-      this.message = this.messageText
-      this.focus()
-    }
-  },
-  props: {
-    messageText: {
-      default: '',
-      type: String
-    },
-    showSendButton: {
-      type: Boolean,
-      default: true
-    },
-    sendOnEnter: {
-      type: Boolean,
-      default: true
-    },
-    label: {
-      type: String,
-      default: 'Type a message'
-    },
-    showDivider: {
-      type: Boolean,
-      default: false
-    }
   }
 }
 </script>
diff --git a/src/components/AChat/AChatMessage.vue b/src/components/AChat/AChatMessage.vue
index d9c6be9a9..84f07820c 100644
--- a/src/components/AChat/AChatMessage.vue
+++ b/src/components/AChat/AChatMessage.vue
@@ -1,37 +1,71 @@
 <template>
   <div
     class="a-chat__message-container"
-    :class="{ 'a-chat__message-container--right': sender.id === userId }"
+    :class="{ 'a-chat__message-container--right': isStringEqualCI(sender.id, userId) }"
   >
     <div
       class="a-chat__message"
-      :class="{ 'a-chat__message--highlighted': sender.id === userId }"
+      :class="{ 'a-chat__message--highlighted': isStringEqualCI(sender.id, userId) }"
     >
       <div
         v-if="showAvatar"
         class="a-chat__message-avatar hidden-xs-only"
-        :class="{ 'a-chat__message-avatar--right': sender.id === userId }"
+        :class="{ 'a-chat__message-avatar--right': isStringEqualCI(sender.id, userId) }"
       >
-        <slot name="avatar"></slot>
+        <slot name="avatar" />
       </div>
       <div class="a-chat__message-card">
-        <div v-if="!hideTime" class="a-chat__message-card-header mt-1">
-          <div v-if="status === 'confirmed'" class="a-chat__blockchain-status">&#x26AD;</div>
-          <div :title="timeTitle" class="a-chat__timestamp">{{ time }}</div>
-          <div v-if="isOutgoingMessage" class="a-chat__status">
+        <div
+          v-if="!hideTime"
+          class="a-chat__message-card-header mt-1"
+        >
+          <div
+            v-if="status.status === 'CONFIRMED'"
+            class="a-chat__blockchain-status"
+          >
+            &#x26AD;
+          </div>
+          <div
+            :title="timeTitle"
+            class="a-chat__timestamp"
+          >
+            {{ time }}
+          </div>
+          <div
+            v-if="isOutgoingMessage"
+            class="a-chat__status"
+          >
             <v-icon
+              v-if="status.status === 'REJECTED'"
               :title="i18n.retry"
               size="15"
               color="red"
-              v-if="status === 'rejected'"
               @click="$emit('resend')"
-            >{{ statusIcon }}</v-icon>
-            <v-icon size="13" v-else>{{ statusIcon }}</v-icon>
+            >
+              {{ statusIcon }}
+            </v-icon>
+            <v-icon
+              v-else
+              size="13"
+            >
+              {{ statusIcon }}
+            </v-icon>
           </div>
         </div>
         <div class="a-chat__message-card-body">
-          <div v-if="html" v-html="message" class="a-chat__message-text a-text-regular-enlarged"></div>
-          <div v-else v-text="message" class="a-chat__message-text a-text-regular-enlarged"></div>
+          <!-- eslint-disable vue/no-v-html -- Safe with DOMPurify.sanitize() content -->
+          <!-- AChatMessage :message <- Chat.vue :message="formatMessage(message)" <- formatMessage <- DOMPurify.sanitize() -->
+          <div
+            v-if="html"
+            class="a-chat__message-text a-text-regular-enlarged"
+            v-html="message"
+          />
+          <!-- eslint-enable vue/no-v-html -->
+          <div
+            v-else
+            class="a-chat__message-text a-text-regular-enlarged"
+            v-text="message"
+          />
         </div>
       </div>
     </div>
@@ -39,21 +73,10 @@
 </template>
 
 <script>
+import { isStringEqualCI } from '@/lib/textHelpers'
+import { tsIcon } from '@/lib/constants'
+
 export default {
-  computed: {
-    statusIcon () {
-      if (this.status === 'confirmed' || this.status === 'delivered') {
-        return 'mdi-check'
-      } else if (this.status === 'pending') {
-        return 'mdi-clock-outline'
-      } else {
-        return 'mdi-close-circle-outline'
-      }
-    },
-    isOutgoingMessage () {
-      return this.sender.id === this.userId
-    }
-  },
   props: {
     id: {
       type: null,
@@ -72,9 +95,8 @@ export default {
       default: ''
     },
     status: {
-      type: String,
-      default: 'confirmed',
-      validator: v => ['confirmed', 'delivered', 'pending', 'rejected'].includes(v)
+      type: Object,
+      required: true
     },
     userId: {
       type: String,
@@ -99,13 +121,34 @@ export default {
     i18n: {
       type: Object,
       default: () => ({
-        'retry': 'Message did not sent, weak connection. Click to retry'
+        retry: 'Message did not sent, weak connection. Click to retry'
       })
     },
     hideTime: {
       type: Boolean,
       default: false
     }
+  },
+  computed: {
+    statusIcon () {
+      return tsIcon(this.status.virtualStatus)
+    },
+    isOutgoingMessage () {
+      return isStringEqualCI(this.sender.id, this.userId)
+    }
+  },
+  methods: {
+    // /**
+    //  * Registered ADM transactions must be shown as confirmed, as they are socket-enabled
+    //  * @returns {string}
+    //  */
+    // virtualStatus () {
+    //   if (this.status === TS.REGISTERED) return TS.CONFIRMED
+    //   return this.status
+    // },
+    isStringEqualCI (string1, string2) {
+      return isStringEqualCI(string1, string2)
+    }
   }
 }
 </script>
diff --git a/src/components/AChat/AChatTransaction.vue b/src/components/AChat/AChatTransaction.vue
index 83b16fe2b..6430aeab6 100644
--- a/src/components/AChat/AChatTransaction.vue
+++ b/src/components/AChat/AChatTransaction.vue
@@ -1,37 +1,43 @@
 <template>
   <div
     class="a-chat__message-container"
-    :class="{ 'a-chat__message-container--right': sender.id === userId }"
+    :class="{ 'a-chat__message-container--right': isStringEqualCI(sender.id, userId) }"
   >
     <div
       class="a-chat__message"
     >
       <div class="a-chat__message-card">
-
         <div class="a-chat__message-card-header">
-          <div :title="timeTitle" class="a-chat__timestamp">{{ time }}</div>
+          <div
+            :title="timeTitle"
+            class="a-chat__timestamp"
+          >
+            {{ time }}
+          </div>
           <div class="a-chat__status">
             <v-icon
-              @click="updateStatus"
               size="13"
-              :title="i18n.statuses[status]"
+              :title="statusTitle"
               :color="statusColor"
               :style="statusUpdatable ? 'cursor: pointer;': 'cursor: default;'"
-            >{{ statusIcon }}</v-icon>
+              @click="updateStatus"
+            >
+              {{ statusIcon }}
+            </v-icon>
           </div>
         </div>
 
         <div>
           <div class="a-chat__direction a-text-regular-bold">
-            {{ sender.id === userId ? i18n.sent : i18n.received }}
+            {{ isStringEqualCI(sender.id, userId) ? $t('chats.sent_label') : $t('chats.received_label') }}
           </div>
           <div
-            @click="onClickAmount"
             class="a-chat__amount"
             :class="isClickable ? 'a-chat__amount--clickable': ''"
+            @click="onClickAmount"
           >
             <v-layout align-center>
-              <slot name="crypto"></slot>
+              <slot name="crypto" />
               <span class="ml-2">{{ amount }}</span>
             </v-layout>
           </div>
@@ -42,7 +48,6 @@
             {{ message }}
           </div>
         </div>
-
       </div>
     </div>
   </div>
@@ -50,34 +55,9 @@
 
 <script>
 import { tsIcon, tsUpdatable, tsColor } from '@/lib/constants'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  mounted () {
-    this.$emit('mount')
-  },
-  computed: {
-    statusIcon () {
-      return tsIcon(this.status)
-    },
-    statusUpdatable () {
-      return tsUpdatable(this.status, this.currency)
-    },
-    statusColor () {
-      return tsColor(this.status)
-    }
-  },
-  methods: {
-    onClickAmount () {
-      if (this.isClickable) {
-        this.$emit('click:transaction', this.id)
-      }
-    },
-    updateStatus () {
-      if (this.statusUpdatable) {
-        this.$emit('click:transactionStatus', this.id)
-      }
-    }
-  },
   props: {
     id: {
       type: null,
@@ -111,34 +91,50 @@ export default {
       type: [Number, String],
       default: 0
     },
-    i18n: {
-      type: Object,
-      default: () => ({
-        sent: 'Sent',
-        received: 'Received',
-        statuses: {
-          confirmed: '',
-          delivered: '',
-          pending: '',
-          rejected: '',
-          invalid: '',
-          unknown: ''
-        }
-      })
-    },
     locale: {
       type: String,
       default: 'en'
     },
     status: {
-      type: String,
-      default: 'confirmed',
-      validator: v => ['confirmed', 'delivered', 'pending', 'rejected', 'invalid', 'unknown'].includes(v)
+      type: Object,
+      required: true
     },
     isClickable: {
       type: Boolean,
       default: false
     }
+  },
+  computed: {
+    statusTitle () {
+      return this.$t(`chats.transaction_statuses.${this.status.virtualStatus}`)
+    },
+    statusIcon () {
+      return tsIcon(this.status.virtualStatus)
+    },
+    statusUpdatable () {
+      return tsUpdatable(this.status.virtualStatus, this.currency)
+    },
+    statusColor () {
+      return tsColor(this.status.virtualStatus)
+    }
+  },
+  mounted () {
+    this.$emit('mount')
+  },
+  methods: {
+    isStringEqualCI (string1, string2) {
+      return isStringEqualCI(string1, string2)
+    },
+    onClickAmount () {
+      if (this.isClickable) {
+        this.$emit('click:transaction', this.id)
+      }
+    },
+    updateStatus () {
+      if (this.statusUpdatable) {
+        this.$emit('click:transactionStatus', this.id)
+      }
+    }
   }
 }
 </script>
diff --git a/src/components/AChat/README.md b/src/components/AChat/README.md
index e897684b2..57f2151ab 100644
--- a/src/components/AChat/README.md
+++ b/src/components/AChat/README.md
@@ -224,7 +224,7 @@ export type User = {
 |**[`id`](#)**|`{string\|number}`|`undefined`|Message ID|
 |**[`message`](#)**|`string`|`''`|Message text|
 |**[`timestamp`](#)**|`number`|`0`|Message timestamp|
-|**[`status`](#)**|`MessageStatus`|`'confirmed'`|Message status. Can be 'sent', 'confirmed', 'rejected'.|
+|**[`status`](#)**|`MessageStatus`|`'confirmed'`|Message status. Can be 'sent', 'CONFIRMED', 'REJECTED'.|
 |**[`user-id`](#)**|`string`|`''`|Chat owner|
 |**[`sender`](#)**|`User`|`undefined`|Can be accessed from `props.message.sender` of `AChat.vue`|
 |**[`show-avatar`](#)**|`boolean`|`true`|Display user avatars in chat|
diff --git a/src/components/AChat/types.ts b/src/components/AChat/types.ts
index 112dd8b53..87e7a2872 100644
--- a/src/components/AChat/types.ts
+++ b/src/components/AChat/types.ts
@@ -26,7 +26,7 @@ export enum MessageType {
 }
 
 export enum MessageStatus {
-  DELIVERED,
+  REGISTERED,
   PENDING,
   REJECTED,
   INVALID
diff --git a/src/components/AppNavigation.vue b/src/components/AppNavigation.vue
index 3affc1793..c8bba08f6 100644
--- a/src/components/AppNavigation.vue
+++ b/src/components/AppNavigation.vue
@@ -8,32 +8,51 @@
   >
     <v-layout justify-center>
       <container class="app-navigation__container">
-
         <v-layout justify-center>
           <!-- Wallet -->
-          <v-btn to="/home" flat>
+          <v-btn
+            to="/home"
+            flat
+          >
             <span>{{ $t('bottom.wallet_button') }}</span>
-            <v-icon size="20">mdi-wallet</v-icon>
+            <v-icon size="20">
+              mdi-wallet
+            </v-icon>
           </v-btn>
 
           <!-- Chat -->
-          <v-btn to="/chats" flat>
+          <v-btn
+            to="/chats"
+            flat
+          >
             <span>{{ $t('bottom.chats_button') }}</span>
-            <v-badge overlap color="primary">
-              <span v-if="numOfNewMessages > 0" slot="badge">
+            <v-badge
+              overlap
+              color="primary"
+            >
+              <span
+                v-if="numOfNewMessages > 0"
+                slot="badge"
+              >
                 {{ numOfNewMessages > 99 ? '99+' : numOfNewMessages }}
               </span>
-              <v-icon size="20">mdi-forum</v-icon>
+              <v-icon size="20">
+                mdi-forum
+              </v-icon>
             </v-badge>
           </v-btn>
 
           <!-- Settings -->
-          <v-btn to="/options" flat>
+          <v-btn
+            to="/options"
+            flat
+          >
             <span>{{ $t('bottom.settings_button') }}</span>
-            <v-icon size="20">mdi-cog</v-icon>
+            <v-icon size="20">
+              mdi-cog
+            </v-icon>
           </v-btn>
         </v-layout>
-
       </container>
     </v-layout>
   </v-bottom-nav>
@@ -41,19 +60,6 @@
 
 <script>
 export default {
-  mounted () {
-    this.currentPageIndex = this.getCurrentPageIndex()
-  },
-  watch: {
-    '$route.path' () {
-      this.currentPageIndex = this.getCurrentPageIndex()
-    }
-  },
-  computed: {
-    numOfNewMessages () {
-      return this.$store.getters['chat/totalNumOfNewMessages']
-    }
-  },
   data: () => ({
     pages: [
       {
@@ -75,6 +81,19 @@ export default {
     currentPageIndex: 0,
     showNav: true
   }),
+  computed: {
+    numOfNewMessages () {
+      return this.$store.getters['chat/totalNumOfNewMessages']
+    }
+  },
+  watch: {
+    '$route.path' () {
+      this.currentPageIndex = this.getCurrentPageIndex()
+    }
+  },
+  mounted () {
+    this.currentPageIndex = this.getCurrentPageIndex()
+  },
   methods: {
     getCurrentPageIndex () {
       const currentPage = this.pages.find(page => {
diff --git a/src/components/AppToolbar.vue b/src/components/AppToolbar.vue
index 12f614558..0de387bff 100644
--- a/src/components/AppToolbar.vue
+++ b/src/components/AppToolbar.vue
@@ -4,24 +4,28 @@
     :height="height"
     app
   >
-    <v-btn v-if="showBack" @click="goBack" icon>
+    <v-btn
+      v-if="showBack"
+      icon
+      @click="goBack"
+    >
       <v-icon>mdi-arrow-left</v-icon>
     </v-btn>
 
     <v-toolbar-title v-if="title">
       <div>{{ title }}</div>
-      <div v-if="subtitle" class="body-1">{{ subtitle }}</div>
+      <div
+        v-if="subtitle"
+        class="body-1"
+      >
+        {{ subtitle }}
+      </div>
     </v-toolbar-title>
   </v-toolbar>
 </template>
 
 <script>
 export default {
-  methods: {
-    goBack () {
-      this.$router.back()
-    }
-  },
   props: {
     title: {
       type: String,
@@ -43,6 +47,11 @@ export default {
       type: Boolean,
       default: true
     }
+  },
+  methods: {
+    goBack () {
+      this.$router.back()
+    }
   }
 }
 </script>
diff --git a/src/components/AppToolbarCentered.vue b/src/components/AppToolbarCentered.vue
index 4ed73b596..b4dd6a14d 100644
--- a/src/components/AppToolbarCentered.vue
+++ b/src/components/AppToolbarCentered.vue
@@ -3,27 +3,40 @@
     :class="[classes, className]"
     fluid
   >
-    <v-layout row wrap justify-center>
-
+    <v-layout
+      row
+      wrap
+      justify-center
+    >
       <container>
-
         <v-toolbar
+          ref="toolbar"
           :flat="flat"
           :height="height"
-          ref="toolbar"
         >
-          <v-btn v-if="showBack" @click="goBack" icon small>
+          <v-btn
+            v-if="showBack"
+            icon
+            small
+            @click="goBack"
+          >
             <v-icon>mdi-arrow-left</v-icon>
           </v-btn>
 
-          <v-toolbar-title v-if="title" class="a-text-regular-enlarged">
+          <v-toolbar-title
+            v-if="title"
+            class="a-text-regular-enlarged"
+          >
             <div>{{ title }}</div>
-            <div v-if="subtitle" class="body-1">{{ subtitle }}</div>
+            <div
+              v-if="subtitle"
+              class="body-1"
+            >
+              {{ subtitle }}
+            </div>
           </v-toolbar-title>
         </v-toolbar>
-
       </container>
-
     </v-layout>
   </v-container>
 </template>
@@ -32,28 +45,6 @@
 import Applicationable from 'vuetify/es5/mixins/applicationable'
 
 export default {
-  computed: {
-    classes () {
-      return {
-        'v-toolbar--fixed': this.app
-      }
-    },
-    className: () => 'app-toolbar-centered'
-  },
-  methods: {
-    goBack () {
-      this.$router.back()
-    },
-    updateApplication () {
-      // Forward function call from `Applicationable` mixin to `VToolbar`
-      //
-      // 1. Do not `updateApplication` when created() because VToolbar is not mounted,
-      // it will be called again when mounted().
-      if (this.$refs.toolbar) { // [1]
-        return this.$refs.toolbar.updateApplication()
-      }
-    }
-  },
   mixins: [
     Applicationable('top', [
       'clippedLeft',
@@ -84,6 +75,28 @@ export default {
       type: Boolean,
       default: true
     }
+  },
+  computed: {
+    classes () {
+      return {
+        'v-toolbar--fixed': this.app
+      }
+    },
+    className: () => 'app-toolbar-centered'
+  },
+  methods: {
+    goBack () {
+      this.$router.back()
+    },
+    updateApplication () {
+      // Forward function call from `Applicationable` mixin to `VToolbar`
+      //
+      // 1. Do not `updateApplication` when created() because VToolbar is not mounted,
+      // it will be called again when mounted().
+      if (this.$refs.toolbar) { // [1]
+        return this.$refs.toolbar.updateApplication()
+      }
+    }
   }
 }
 </script>
diff --git a/src/components/BuyTokensDialog.vue b/src/components/BuyTokensDialog.vue
index 7b351712a..f7e39198d 100644
--- a/src/components/BuyTokensDialog.vue
+++ b/src/components/BuyTokensDialog.vue
@@ -11,10 +11,9 @@
         {{ $t('home.buy_tokens_btn') }}
       </v-card-title>
 
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
 
       <v-card-text class="pa-0">
-
         <v-list>
           <v-list-tile
             v-for="action in actions"
@@ -23,35 +22,27 @@
             @click="openLink(action.link)"
           >
             <v-list-tile-avatar>
-              <crypto-icon :crypto="action.icon"/>
+              <crypto-icon :crypto="action.icon" />
             </v-list-tile-avatar>
 
             <v-list-tile-content>
-              <v-list-tile-title v-text="action.title"></v-list-tile-title>
+              <v-list-tile-title v-text="action.title" />
             </v-list-tile-content>
           </v-list-tile>
 
-          <v-list-tile avatar @click="openLink('https://coindeal.com/ref/9WZN')">
+          <v-list-tile
+            avatar
+            @click="openLink('https://coindeal.com/ref/9WZN')"
+          >
             <v-list-tile-avatar>
-              <icon><cdl-icon/></icon>
+              <icon><cdl-icon /></icon>
             </v-list-tile-avatar>
 
             <v-list-tile-content>
               <v-list-tile-title>CoinDeal</v-list-tile-title>
             </v-list-tile-content>
           </v-list-tile>
-
-          <v-list-tile avatar @click="openLink('https://atomars.com/refcode/kaba')">
-            <v-list-tile-avatar>
-              <icon><atomars-icon/></icon>
-            </v-list-tile-avatar>
-
-            <v-list-tile-content>
-              <v-list-tile-title>Atomars</v-list-tile-title>
-            </v-list-tile-content>
-          </v-list-tile>
         </v-list>
-
       </v-card-text>
     </v-card>
   </v-dialog>
@@ -62,10 +53,25 @@ import validateAddress from '@/lib/validateAddress'
 import Icon from '@/components/icons/BaseIcon'
 import CryptoIcon from '@/components/icons/CryptoIcon'
 import CdlIcon from '@/components/icons/common/Cdl'
-import AtomarsIcon from '@/components/icons/common/Atomars'
 import { websiteUriToOnion } from '@/lib/uri'
 
 export default {
+  components: {
+    Icon,
+    CryptoIcon,
+    CdlIcon
+  },
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    },
+    adamantAddress: {
+      type: String,
+      default: undefined,
+      validator: v => validateAddress('ADM', v)
+    }
+  },
   computed: {
     className: () => 'buy-tokens-dialog',
     show: {
@@ -102,23 +108,6 @@ export default {
     openLink (link) {
       window.open(link, '_blank', 'resizable,scrollbars,status,noopener')
     }
-  },
-  components: {
-    Icon,
-    CryptoIcon,
-    CdlIcon,
-    AtomarsIcon
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    },
-    adamantAddress: {
-      type: String,
-      default: undefined,
-      validator: v => validateAddress('ADM', v)
-    }
   }
 }
 </script>
diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index 83f3a50c0..d204e8530 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -2,28 +2,33 @@
   <v-card class="chat">
     <free-tokens-dialog v-model="showFreeTokensDialog" />
     <a-chat
+      ref="chat"
       :messages="messages"
       :partners="partners"
       :user-id="userId"
       :loading="loading"
-      :locale="$i18n.locale"
 
+      :locale="$i18n.locale"
       @scroll:top="onScrollTop"
       @scroll:bottom="onScrollBottom"
-      @scroll="onScroll"
 
-      ref="chat"
+      @scroll="onScroll"
     >
-      <chat-toolbar :partner-id="partnerId" slot="header">
+      <chat-toolbar
+        slot="header"
+        :partner-id="partnerId"
+      >
         <ChatAvatar
-          @click="onClickAvatar(partnerId)"
+          slot="avatar-toolbar"
           :user-id="partnerId"
           use-public-key
-          slot="avatar-toolbar"
+          @click="onClickAvatar(partnerId)"
         />
       </chat-toolbar>
-      <template slot="message" slot-scope="{ message, userId, sender, locale }">
-
+      <template
+        slot="message"
+        slot-scope="{ message, userId, sender, locale }"
+      >
         <a-chat-message
           v-if="message.type === 'message'"
           v-bind="message"
@@ -32,6 +37,7 @@
           :time="message.timestamp | date"
           :user-id="userId"
           :sender="sender"
+          :status="getTransactionStatus(message)"
           :show-avatar="!isChatReadOnly"
           :locale="locale"
           :html="true"
@@ -40,10 +46,10 @@
           @resend="resendMessage(partnerId, message.id)"
         >
           <ChatAvatar
-            @click="onClickAvatar(sender.id)"
+            slot="avatar"
             :user-id="sender.id"
             use-public-key
-            slot="avatar"
+            @click="onClickAvatar(sender.id)"
           />
         </a-chat-message>
 
@@ -56,13 +62,8 @@
           :amount="message.amount | currency(message.type)"
           :time="message.timestamp | date"
           :currency="message.type"
-          :i18n="{
-            sent: $t('chats.sent_label'),
-            received: $t('chats.received_label'),
-            statuses: $t('chats.transaction_statuses')
-          }"
           :locale="locale"
-          :status="getTransactionStatus(message, partnerId)"
+          :status="getTransactionStatus(message)"
           :is-clickable="isCryptoSupported(message.type)"
           @click:transaction="openTransaction(message)"
           @click:transactionStatus="updateTransactionStatus(message)"
@@ -73,19 +74,18 @@
             :crypto="message.type"
           />
         </a-chat-transaction>
-
       </template>
 
       <a-chat-form
         v-if="!isChatReadOnly"
         ref="chatForm"
         slot="form"
-        @message="onMessage"
         :show-send-button="true"
         :send-on-enter="sendMessageOnEnter"
         :show-divider="true"
         :label="chatFormLabel"
-        :messageText="messageText"
+        :message-text="messageText"
+        @message="onMessage"
       >
         <chat-menu
           slot="prepend"
@@ -95,15 +95,17 @@
 
       <v-btn
         v-if="!isScrolledToBottom"
-        @click="$refs.chat.scrollToBottom()"
+        slot="fab"
         class="ma-0 grey--text"
         color="grey lighten-3"
         depressed
         fab
-        slot="fab"
         small
+        @click="$refs.chat.scrollToBottom()"
       >
-        <v-icon large>mdi-chevron-down</v-icon>
+        <v-icon large>
+          mdi-chevron-down
+        </v-icon>
       </v-btn>
     </a-chat>
   </v-card>
@@ -114,7 +116,7 @@ import { detect } from 'detect-browser'
 import Visibility from 'visibilityjs'
 
 import { Cryptos } from '@/lib/constants'
-import { renderMarkdown } from '@/lib/markdown'
+import { renderMarkdown, sanitizeHTML } from '@/lib/markdown'
 
 import { AChat, AChatMessage, AChatTransaction, AChatForm } from '@/components/AChat'
 import ChatToolbar from '@/components/Chat/ChatToolbar'
@@ -126,6 +128,7 @@ import dateFilter from '@/filters/date'
 import CryptoIcon from '@/components/icons/CryptoIcon'
 import FreeTokensDialog from '@/components/FreeTokensDialog'
 import { websiteUriToOnion } from '@/lib/uri'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 /**
  * Returns user meta by userId.
@@ -133,12 +136,12 @@ import { websiteUriToOnion } from '@/lib/uri'
  * @returns {User} See `packages/chat/src/types.ts`
  */
 function getUserMeta (userId) {
-  let user = {
+  const user = {
     id: userId,
     name: ''
   }
 
-  if (userId === this.userId) {
+  if (isStringEqualCI(userId, this.userId)) {
     user.name = this.$t('chats.you')
   } else {
     user.name = this.getPartnerName(userId)
@@ -178,44 +181,38 @@ function validateMessage (message) {
 }
 
 export default {
-  created () {
-    window.addEventListener('keyup', this.onKeyPress)
-  },
-  beforeDestroy () {
-    window.removeEventListener('keyup', this.onKeyPress)
-    Visibility.unbind(this.visibilityId)
+  filters: {
+    date: dateFilter
   },
-  mounted () {
-    this.scrollBehavior()
-    this.$nextTick(() => {
-      this.isScrolledToBottom = this.$refs.chat.isScrolledToBottom()
-    })
-    this.visibilityId = Visibility.change((event, state) => {
-      if (state === 'visible' && this.isScrolledToBottom) this.markAsRead()
-    })
-    this.chatFormLabel = {
-      'Mac OS': this.$t('chats.message_mac_os'),
-      'Windows 10': this.$t('chats.message_windows_10')
-    }[detect().os] || this.$t('chats.message')
+  components: {
+    AChat,
+    AChatMessage,
+    AChatTransaction,
+    AChatForm,
+    ChatToolbar,
+    ChatAvatar,
+    ChatMenu,
+    CryptoIcon,
+    FreeTokensDialog
   },
-  watch: {
-    // Scroll to the bottom every time window focused by desktop notification
-    '$store.state.notification.desktopActivateClickCount' () {
-      this.$nextTick(() => {
-        this.$refs.chat.scrollToBottom()
-      })
+  mixins: [transaction, partnerName],
+  props: {
+    messageText: {
+      default: '',
+      type: String
     },
-    // scroll to bottom when received new message
-    messages () {
-      this.$nextTick(() => {
-        if (this.isScrolledToBottom) {
-          this.$refs.chat.scrollToBottom()
-        }
-
-        if (!Visibility.hidden()) this.markAsRead()
-      })
+    partnerId: {
+      type: String,
+      required: true
     }
   },
+  data: () => ({
+    chatFormLabel: '',
+    loading: false,
+    isScrolledToBottom: true,
+    visibilityId: null,
+    showFreeTokensDialog: false
+  }),
   computed: {
     /**
      * Returns array of transformed messages.
@@ -250,13 +247,44 @@ export default {
       return this.$store.getters['chat/numOfNewMessages'](this.partnerId)
     }
   },
-  data: () => ({
-    chatFormLabel: '',
-    loading: false,
-    isScrolledToBottom: true,
-    visibilityId: null,
-    showFreeTokensDialog: false
-  }),
+  watch: {
+    // Scroll to the bottom every time window focused by desktop notification
+    '$store.state.notification.desktopActivateClickCount' () {
+      this.$nextTick(() => {
+        this.$refs.chat.scrollToBottom()
+      })
+    },
+    // scroll to bottom when received new message
+    messages () {
+      this.$nextTick(() => {
+        if (this.isScrolledToBottom) {
+          this.$refs.chat.scrollToBottom()
+        }
+
+        if (!Visibility.hidden()) this.markAsRead()
+      })
+    }
+  },
+  created () {
+    window.addEventListener('keyup', this.onKeyPress)
+  },
+  beforeDestroy () {
+    window.removeEventListener('keyup', this.onKeyPress)
+    Visibility.unbind(this.visibilityId)
+  },
+  mounted () {
+    this.scrollBehavior()
+    this.$nextTick(() => {
+      this.isScrolledToBottom = this.$refs.chat.isScrolledToBottom()
+    })
+    this.visibilityId = Visibility.change((event, state) => {
+      if (state === 'visible' && this.isScrolledToBottom) this.markAsRead()
+    })
+    this.chatFormLabel = {
+      'Mac OS': this.$t('chats.message_mac_os'),
+      'Windows 10': this.$t('chats.message_windows_10')
+    }[detect().os] || this.$t('chats.message')
+  },
   methods: {
     onMessage (message) {
       if (validateMessage.call(this, message)) {
@@ -340,7 +368,7 @@ export default {
         return renderMarkdown(transaction.message)
       }
 
-      return transaction.message
+      return sanitizeHTML(transaction.message)
     },
     scrollBehavior () {
       this.$nextTick(() => {
@@ -358,31 +386,6 @@ export default {
     onKeyPress (e) {
       if (e.code === 'Enter' && !this.showFreeTokensDialog) this.$refs.chatForm.focus()
     }
-  },
-  filters: {
-    date: dateFilter
-  },
-  mixins: [transaction, partnerName],
-  components: {
-    AChat,
-    AChatMessage,
-    AChatTransaction,
-    AChatForm,
-    ChatToolbar,
-    ChatAvatar,
-    ChatMenu,
-    CryptoIcon,
-    FreeTokensDialog
-  },
-  props: {
-    messageText: {
-      default: '',
-      type: String
-    },
-    partnerId: {
-      type: String,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/Chat/ChatAvatar.vue b/src/components/Chat/ChatAvatar.vue
index 54e7a3f30..03a1c3e76 100644
--- a/src/components/Chat/ChatAvatar.vue
+++ b/src/components/Chat/ChatAvatar.vue
@@ -1,16 +1,21 @@
 <template>
   <div
-    @click="$emit('click')"
     :class="classes"
     :style="styles"
+    @click="$emit('click')"
   >
-    <img v-if="avatar" :src="avatar" :width="size" :height="size"/>
+    <img
+      v-if="avatar"
+      :src="avatar"
+      :width="size"
+      :height="size"
+    >
     <canvas
+      ref="avatar"
       :width="canvasSize"
       :height="canvasSize"
       :style="{ display: 'none' }"
-      ref="avatar"
-    ></canvas>
+    />
   </div>
 </template>
 
@@ -20,8 +25,20 @@ import Identicon from '@/lib/identicon'
 import clickable from '@/mixins/clickable'
 
 export default {
-  mounted () {
-    this.getAvatar()
+  mixins: [clickable],
+  props: {
+    size: {
+      type: Number,
+      default: 40
+    },
+    userId: {
+      type: String,
+      required: true
+    },
+    usePublicKey: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     className: () => 'chat-avatar',
@@ -47,6 +64,9 @@ export default {
       return this.$store.getters['identicon/isAvatarCached'](this.userId)
     }
   },
+  mounted () {
+    this.getAvatar()
+  },
   methods: {
     /**
      * Creates and saves avatar Base64 data
@@ -85,21 +105,6 @@ export default {
 
       return Promise.resolve(el.toDataURL())
     }
-  },
-  mixins: [clickable],
-  props: {
-    size: {
-      type: Number,
-      default: 40
-    },
-    userId: {
-      type: String,
-      required: true
-    },
-    usePublicKey: {
-      type: Boolean,
-      default: false
-    }
   }
 }
 </script>
diff --git a/src/components/Chat/ChatDialog.vue b/src/components/Chat/ChatDialog.vue
index 0ee2f3206..4769a9a96 100644
--- a/src/components/Chat/ChatDialog.vue
+++ b/src/components/Chat/ChatDialog.vue
@@ -4,12 +4,14 @@
     width="500"
   >
     <v-card>
-      <v-card-title class="headline">{{ title }}</v-card-title>
+      <v-card-title class="headline">
+        {{ title }}
+      </v-card-title>
 
       <v-card-text>{{ text }}</v-card-text>
 
       <v-card-actions>
-        <v-spacer></v-spacer>
+        <v-spacer />
 
         <v-btn
           flat="flat"
@@ -24,16 +26,6 @@
 
 <script>
 export default {
-  computed: {
-    show: {
-      get () {
-        return this.value
-      },
-      set (value) {
-        this.$emit('input', value)
-      }
-    }
-  },
   props: {
     value: {
       type: Boolean,
@@ -47,6 +39,16 @@ export default {
       type: String,
       default: ''
     }
+  },
+  computed: {
+    show: {
+      get () {
+        return this.value
+      },
+      set (value) {
+        this.$emit('input', value)
+      }
+    }
   }
 }
 </script>
diff --git a/src/components/Chat/ChatMenu.vue b/src/components/Chat/ChatMenu.vue
index d0eadde48..e5399ea6c 100644
--- a/src/components/Chat/ChatMenu.vue
+++ b/src/components/Chat/ChatMenu.vue
@@ -1,7 +1,13 @@
 <template>
   <div>
     <v-menu>
-      <v-icon medium class="chat-menu__icon" slot="activator">mdi-plus-circle-outline</v-icon>
+      <v-icon
+        slot="activator"
+        medium
+        class="chat-menu__icon"
+      >
+        mdi-plus-circle-outline
+      </v-icon>
 
       <v-list>
         <!-- Cryptos -->
@@ -29,7 +35,6 @@
 
           <v-list-tile-title>{{ $t(item.title) }}</v-list-tile-title>
         </v-list-tile>
-
       </v-list>
     </v-menu>
 
@@ -48,6 +53,17 @@ import Icon from '@/components/icons/BaseIcon'
 import CryptoIcon from '@/components/icons/CryptoIcon'
 
 export default {
+  components: {
+    ChatDialog,
+    Icon,
+    CryptoIcon
+  },
+  props: {
+    partnerId: {
+      type: String,
+      default: ''
+    }
+  },
   data: () => ({
     cryptos: Object.keys(Cryptos),
     menuItems: [
@@ -103,17 +119,6 @@ export default {
         return address
       })
     }
-  },
-  components: {
-    ChatDialog,
-    Icon,
-    CryptoIcon
-  },
-  props: {
-    partnerId: {
-      type: String,
-      default: ''
-    }
   }
 }
 </script>
diff --git a/src/components/Chat/ChatToolbar.vue b/src/components/Chat/ChatToolbar.vue
index d74e34e00..bba8a913d 100644
--- a/src/components/Chat/ChatToolbar.vue
+++ b/src/components/Chat/ChatToolbar.vue
@@ -1,25 +1,38 @@
 <template>
-  <v-toolbar flat height="56" :class="`${className}`">
-    <v-btn @click="goBack" icon>
+  <v-toolbar
+    flat
+    height="56"
+    :class="`${className}`"
+  >
+    <v-btn
+      icon
+      @click="goBack"
+    >
       <v-icon>mdi-arrow-left</v-icon>
     </v-btn>
     <div v-if="!isChatReadOnly">
-      <slot name="avatar-toolbar"></slot>
+      <slot name="avatar-toolbar" />
     </div>
     <div :class="`${className}__textfield-container`">
-      <div v-if="isChatReadOnly" class="title" :style="{ paddingLeft: '12px' }">{{ $t(partnerId) }}</div>
+      <div
+        v-if="isChatReadOnly"
+        class="title"
+        :style="{ paddingLeft: '12px' }"
+      >
+        {{ $t(partnerId) }}
+      </div>
       <div v-else>
         <v-text-field
+          v-model="partnerName"
           box
           full-width
           background-color="transparent"
-          v-model="partnerName"
           :label="partnerId"
-        ></v-text-field>
+        />
       </div>
     </div>
 
-    <v-spacer></v-spacer>
+    <v-spacer />
   </v-toolbar>
 </template>
 
@@ -28,7 +41,16 @@ import ChatAvatar from '@/components/Chat/ChatAvatar'
 import partnerName from '@/mixins/partnerName'
 
 export default {
+  components: {
+    ChatAvatar
+  },
   mixins: [partnerName],
+  props: {
+    partnerId: {
+      type: String,
+      required: true
+    }
+  },
   computed: {
     className: () => 'chat-toolbar',
     partnerName: {
@@ -53,15 +75,6 @@ export default {
     showPartnerInfo () {
       this.$emit('partner-info', true)
     }
-  },
-  components: {
-    ChatAvatar
-  },
-  props: {
-    partnerId: {
-      type: String,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue
index badf99256..4dc9d1efe 100644
--- a/src/components/ChatPreview.vue
+++ b/src/components/ChatPreview.vue
@@ -4,11 +4,27 @@
     @click="$emit('click')"
   >
     <v-list-tile-avatar>
-      <icon v-if="readOnly" :class="`${className}__icon`"><adm-fill-icon/></icon>
-      <chat-avatar v-else :size="40" :user-id="contactId" use-public-key/>
-
-      <v-badge overlap color="primary">
-        <span v-if="numOfNewMessages > 0" slot="badge">
+      <icon
+        v-if="readOnly"
+        :class="`${className}__icon`"
+      >
+        <adm-fill-icon />
+      </icon>
+      <chat-avatar
+        v-else
+        :size="40"
+        :user-id="contactId"
+        use-public-key
+      />
+
+      <v-badge
+        overlap
+        color="primary"
+      >
+        <span
+          v-if="numOfNewMessages > 0"
+          slot="badge"
+        >
           {{ numOfNewMessages > 99 ? '99+' : numOfNewMessages }}
         </span>
       </v-badge>
@@ -16,9 +32,9 @@
 
     <v-list-tile-content>
       <v-list-tile-title
-        v-text="isAdamantChat ? $t(contactName) : contactName"
         class="a-text-regular-enlarged-bold"
-      ></v-list-tile-title>
+        v-text="isAdamantChat ? $t(contactName) : contactName"
+      />
 
       <!-- New chat (no messages yet) -->
       <template v-if="isNewChat">
@@ -28,22 +44,40 @@
       <!-- Transaction -->
       <template v-else-if="isTransferType">
         <v-list-tile-sub-title>
-          <v-icon size="15" v-if="!isIncomingTransaction">{{ statusIcon }}</v-icon>
+          <v-icon
+            v-if="!isIncomingTransaction"
+            size="15"
+          >
+            {{ statusIcon }}
+          </v-icon>
           {{ transactionDirection }} {{ transaction.amount | currency(transaction.type) }}
-          <v-icon size="15" v-if="isIncomingTransaction">{{ statusIcon }}</v-icon>
+          <v-icon
+            v-if="isIncomingTransaction"
+            size="15"
+          >
+            {{ statusIcon }}
+          </v-icon>
         </v-list-tile-sub-title>
       </template>
 
       <!-- Message -->
       <template v-else>
         <v-list-tile-sub-title class="a-text-explanation-enlarged-bold">
-          <v-icon size="15" v-if="!isIncomingTransaction">{{ statusIcon }}</v-icon>
+          <v-icon
+            v-if="!isIncomingTransaction"
+            size="15"
+          >
+            {{ statusIcon }}
+          </v-icon>
           {{ lastMessageTextNoFormats }}
         </v-list-tile-sub-title>
       </template>
     </v-list-tile-content>
 
-    <div v-if="!isMessageReadonly" :class="`${className}__date`">
+    <div
+      v-if="!isMessageReadonly"
+      :class="`${className}__date`"
+    >
       {{ createdAt | date }}
     </div>
   </v-list-tile>
@@ -59,20 +93,46 @@ import Icon from '@/components/icons/BaseIcon'
 import AdmFillIcon from '@/components/icons/AdmFill'
 import partnerName from '@/mixins/partnerName'
 import { tsIcon } from '@/lib/constants'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  mounted () {
-    // fetch status if transaction is transfer
-    if (this.isTransferType) {
-      this.fetchTransactionStatus(this.transaction, this.contactId)
-    }
+  filters: {
+    date: dateFilter
   },
-  watch: {
-    // fetch status when new message received
-    transaction () {
-      this.fetchTransactionStatus(this.transaction, this.contactId)
+  components: {
+    ChatAvatar,
+    Icon,
+    AdmFillIcon
+  },
+  mixins: [transaction, partnerName],
+  props: {
+    userId: {
+      type: String,
+      required: true
+    },
+    contactId: {
+      type: String,
+      required: true
+    },
+    transaction: {
+      type: Object,
+      required: true
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    },
+    isMessageReadonly: {
+      type: Boolean,
+      default: false
+    },
+    isAdamantChat: {
+      type: Boolean,
+      default: false
     }
   },
+  data: () => ({
+  }),
   computed: {
     className: () => 'chat-brief',
     contactName () {
@@ -111,14 +171,14 @@ export default {
       return this.lastMessageTextLocalized
     },
     transactionDirection () {
-      const direction = this.userId === this.transaction.senderId
+      const direction = isStringEqualCI(this.userId, this.transaction.senderId)
         ? this.$t('chats.sent_label')
         : this.$t('chats.received_label')
 
       return direction
     },
     isIncomingTransaction () {
-      return this.userId !== this.transaction.senderId
+      return !isStringEqualCI(this.userId, this.transaction.senderId)
     },
     numOfNewMessages () {
       return this.$store.getters['chat/numOfNewMessages'](this.contactId)
@@ -130,47 +190,19 @@ export default {
       return this.getTransactionStatus(this.transaction)
     },
     statusIcon () {
-      // There were a bit change
-      // if (this.status === 'confirmed' || this.status === 'delivered') {
-      //   return 'mdi-check'
-      return tsIcon(this.status)
+      return tsIcon(this.status.virtualStatus)
     }
   },
-  data: () => ({
-  }),
-  filters: {
-    date: dateFilter
-  },
-  mixins: [transaction, partnerName],
-  components: {
-    ChatAvatar,
-    Icon,
-    AdmFillIcon
+  watch: {
+    // fetch status when new message received
+    transaction () {
+      this.fetchTransactionStatus(this.transaction, this.contactId)
+    }
   },
-  props: {
-    userId: {
-      type: String,
-      required: true
-    },
-    contactId: {
-      type: String,
-      required: true
-    },
-    transaction: {
-      type: Object,
-      required: true
-    },
-    readOnly: {
-      type: Boolean,
-      default: false
-    },
-    isMessageReadonly: {
-      type: Boolean,
-      default: false
-    },
-    isAdamantChat: {
-      type: Boolean,
-      default: false
+  mounted () {
+    // fetch status if transaction is transfer
+    if (this.isTransferType) {
+      this.fetchTransactionStatus(this.transaction, this.contactId)
     }
   }
 }
diff --git a/src/components/ChatSpinner.vue b/src/components/ChatSpinner.vue
index 22d1a21dc..f21e5f8f5 100644
--- a/src/components/ChatSpinner.vue
+++ b/src/components/ChatSpinner.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="value">
-    <div :class="`${className}__overlay`"></div>
+    <div :class="`${className}__overlay`" />
 
     <v-progress-circular
       v-if="value"
@@ -15,16 +15,16 @@
 
 <script>
 export default {
-  computed: {
-    className () {
-      return 'chat-spinner'
-    }
-  },
   props: {
     value: {
       type: Boolean,
       required: true
     }
+  },
+  computed: {
+    className () {
+      return 'chat-spinner'
+    }
   }
 }
 </script>
diff --git a/src/components/ChatStartDialog.vue b/src/components/ChatStartDialog.vue
index 8d828cacc..57b9971f6 100644
--- a/src/components/ChatStartDialog.vue
+++ b/src/components/ChatStartDialog.vue
@@ -12,28 +12,42 @@
         {{ $t('chats.new_chat') }}
       </v-card-title>
 
-      <v-divider class="a-divider"></v-divider>
-
-      <v-layout row wrap justify-center align-center class="pa-3">
+      <v-divider class="a-divider" />
 
+      <v-layout
+        row
+        wrap
+        justify-center
+        align-center
+        class="pa-3"
+      >
         <v-text-field
-          class="a-input"
           ref="partnerField"
           v-model="recipientAddress"
+          class="a-input"
           :label="$t('chats.recipient')"
           :title="$t('chats.recipient_tooltip')"
           @paste="onPasteURI"
         >
           <template slot="append">
-            <v-menu :offset-overflow="true" :offset-y="false" left>
-              <v-icon slot="activator">mdi-dots-vertical</v-icon>
+            <v-menu
+              :offset-overflow="true"
+              :offset-y="false"
+              left
+            >
+              <v-icon slot="activator">
+                mdi-dots-vertical
+              </v-icon>
               <v-list>
                 <v-list-tile @click="showQrcodeScanner = true">
                   <v-list-tile-title>{{ $t('transfer.decode_from_camera') }}</v-list-tile-title>
                 </v-list-tile>
                 <v-list-tile class="v-list__tile--link">
                   <v-list-tile-title>
-                    <qrcode-capture @detect="onDetectQrcode" @error="onDetectQrcodeError">
+                    <qrcode-capture
+                      @detect="onDetectQrcode"
+                      @error="onDetectQrcodeError"
+                    >
                       <span>{{ $t('transfer.decode_from_image') }}</span>
                     </qrcode-capture>
                   </v-list-tile-title>
@@ -43,18 +57,29 @@
           </template>
         </v-text-field>
 
-        <v-flex xs12 class="text-xs-center">
-          <v-btn @click="startChat" :class="[`${className}__btn-start-chat`, 'a-btn-primary']">
+        <v-flex
+          xs12
+          class="text-xs-center"
+        >
+          <v-btn
+            :class="[`${className}__btn-start-chat`, 'a-btn-primary']"
+            @click="startChat"
+          >
             {{ $t('chats.start_chat') }}
           </v-btn>
         </v-flex>
 
-        <v-flex xs12 :class="`${className}__btn-show-qrcode`">
-          <a @click="showQrcodeRendererDialog = true" class="a-text-active">
+        <v-flex
+          xs12
+          :class="`${className}__btn-show-qrcode`"
+        >
+          <a
+            class="a-text-active"
+            @click="showQrcodeRendererDialog = true"
+          >
             {{ $t('chats.show_my_qr_code') }}
           </a>
         </v-flex>
-
       </v-layout>
     </v-card>
 
@@ -84,7 +109,30 @@ import QrCodeScanIcon from '@/components/icons/common/QrCodeScan'
 import partnerName from '@/mixins/partnerName'
 
 export default {
+  components: {
+    QrcodeCapture,
+    QrcodeScannerDialog,
+    QrcodeRendererDialog,
+    Icon,
+    QrCodeScanIcon
+  },
   mixins: [partnerName],
+  props: {
+    partnerId: {
+      type: String
+    },
+    value: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data: () => ({
+    recipientAddress: '',
+    recipientName: '',
+    showQrcodeScanner: false,
+    showQrcodeRendererDialog: false,
+    uriMessage: ''
+  }),
   computed: {
     className: () => 'chat-start-dialog',
     show: {
@@ -99,13 +147,21 @@ export default {
       return generateURI(Cryptos.ADM, this.$store.state.address)
     }
   },
-  data: () => ({
-    recipientAddress: '',
-    recipientName: '',
-    showQrcodeScanner: false,
-    showQrcodeRendererDialog: false,
-    uriMessage: ''
-  }),
+  watch: {
+    // Retain focus from `v-dialog__content`
+    show (v) {
+      if (v) {
+        this.$nextTick(() => {
+          this.$refs.partnerField.focus()
+        })
+      }
+    }
+  },
+  mounted () {
+    if (this.partnerId) {
+      this.recipientAddress = this.partnerId
+    }
+  },
   methods: {
     startChat () {
       this.recipientAddress = this.recipientAddress
@@ -207,33 +263,6 @@ export default {
     onEnter () {
       this.startChat()
     }
-  },
-  mounted () {
-    if (this.partnerId) {
-      this.recipientAddress = this.partnerId
-    }
-  },
-  components: {
-    QrcodeCapture,
-    QrcodeScannerDialog,
-    QrcodeRendererDialog,
-    Icon,
-    QrCodeScanIcon
-  },
-  props: {
-    partnerId: {
-      type: String
-    },
-    value: {
-      type: Boolean,
-      required: true
-    }
-  },
-  watch: {
-    // Retain focus from `v-dialog__content`
-    show (v) {
-      if (v) this.$nextTick(() => void this.$refs.partnerField.focus())
-    }
   }
 }
 </script>
diff --git a/src/components/Container.vue b/src/components/Container.vue
index cbe70fcfc..e6c16328d 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -1,11 +1,17 @@
 <template>
   <div :class="classes">
-    <slot></slot>
+    <slot />
   </div>
 </template>
 
 <script>
 export default {
+  props: {
+    padding: {
+      type: Boolean,
+      default: false
+    }
+  },
   computed: {
     classes () {
       return {
@@ -13,12 +19,6 @@ export default {
         'a-container--padding': this.padding
       }
     }
-  },
-  props: {
-    padding: {
-      type: Boolean,
-      default: false
-    }
   }
 }
 </script>
diff --git a/src/components/ExportKeysForm.vue b/src/components/ExportKeysForm.vue
index d1f4ceb17..e9f38a2bb 100644
--- a/src/components/ExportKeysForm.vue
+++ b/src/components/ExportKeysForm.vue
@@ -1,6 +1,9 @@
 <template>
   <v-form @submit.prevent="revealKeys">
-    <div v-if="keys.length" :class="`${className}__keys`">
+    <div
+      v-if="keys.length"
+      :class="`${className}__keys`"
+    >
       <div
         v-for="key in keys"
         :key="key.crypto"
@@ -17,8 +20,18 @@
             </span>
           </template>
           <template slot="append">
-            <v-btn icon ripple :class="`${className}__btn-copy`" @click="copyKey(key.key)">
-              <v-icon :class="`${className}__icon`" size="20">mdi-content-copy</v-icon>
+            <v-btn
+              icon
+              ripple
+              :class="`${className}__btn-copy`"
+              @click="copyKey(key.key)"
+            >
+              <v-icon
+                :class="`${className}__icon`"
+                size="20"
+              >
+                mdi-content-copy
+              </v-icon>
             </v-btn>
           </template>
         </v-text-field>
@@ -27,13 +40,14 @@
       <div class="text-xs-right">
         <v-btn
           :class="`${className}__copy_all_button`"
+          class="a-btn-link"
+          flat
+          small
           @click="copyAll"
-          class="a-btn-link" flat small
         >
           {{ $t('options.export_keys.copy_all') }}
         </v-btn>
       </div>
-
     </div>
 
     <div :class="`${className}__disclaimer a-text-regular-enlarged`">
@@ -51,15 +65,24 @@
         </span>
       </template>
       <template slot="append">
-        <v-menu :offset-overflow="true" :offset-y="false" left>
-          <v-icon slot="activator">mdi-dots-vertical</v-icon>
+        <v-menu
+          :offset-overflow="true"
+          :offset-y="false"
+          left
+        >
+          <v-icon slot="activator">
+            mdi-dots-vertical
+          </v-icon>
           <v-list>
             <v-list-tile @click="showQrcodeScanner = true">
               <v-list-tile-title>{{ $t('transfer.decode_from_camera') }}</v-list-tile-title>
             </v-list-tile>
             <v-list-tile class="v-list__tile--link">
               <v-list-tile-title>
-                <qrcode-capture @detect="onDetectQrcode" @error="onDetectQrcodeError">
+                <qrcode-capture
+                  @detect="onDetectQrcode"
+                  @error="onDetectQrcodeError"
+                >
                   <span>{{ $t('transfer.decode_from_image') }}</span>
                 </qrcode-capture>
               </v-list-tile-title>
@@ -72,17 +95,17 @@
     <div class="text-xs-center">
       <v-btn
         :class="`${className}__export_keys_button`"
-        @click="revealKeys"
         class="a-btn-primary"
+        @click="revealKeys"
       >
         {{ $t('options.export_keys.button') }}
       </v-btn>
     </div>
 
     <qrcode-scanner-dialog
-      @scan="onScanQrcode"
       v-if="showQrcodeScanner"
       v-model="showQrcodeScanner"
+      @scan="onScanQrcode"
     />
   </v-form>
 </template>
diff --git a/src/components/FreeTokensDialog.vue b/src/components/FreeTokensDialog.vue
index 13dec233d..2636b20d5 100644
--- a/src/components/FreeTokensDialog.vue
+++ b/src/components/FreeTokensDialog.vue
@@ -10,7 +10,7 @@
         {{ $t("chats.free_adm_title") }}
       </v-card-title>
 
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
 
       <v-card-text>
         <div :class="`${className}__disclaimer a-text-regular-enlarged`">
@@ -18,21 +18,34 @@
         </div>
       </v-card-text>
 
-      <v-flex xs12 class="text-xs-center">
-        <v-btn :class="[`${className}__btn-free-tokens`, 'a-btn-primary']"
+      <v-flex
+        xs12
+        class="text-xs-center"
+      >
+        <v-btn
+          :class="[`${className}__btn-free-tokens`, 'a-btn-primary']"
           @click="getFreeTokens()"
         >
-          <v-icon :class="`${className}__btn-icon`">mdi-gift</v-icon>
-          <div :class="`${className}__btn-text`">{{ $t('home.free_adm_btn') }}</div>
+          <v-icon :class="`${className}__btn-icon`">
+            mdi-gift
+          </v-icon>
+          <div :class="`${className}__btn-text`">
+            {{ $t('home.free_adm_btn') }}
+          </div>
         </v-btn>
       </v-flex>
 
-      <v-flex xs12 :class="`${className}__btn-show-article`">
-        <a @click="showArticle()" class="a-text-active">
+      <v-flex
+        xs12
+        :class="`${className}__btn-show-article`"
+      >
+        <a
+          class="a-text-active"
+          @click="showArticle()"
+        >
           {{ $t('chats.how_to_use_messenger') }}
         </a>
       </v-flex>
-
     </v-card>
   </v-dialog>
 </template>
@@ -41,6 +54,12 @@
 import { websiteUriToOnion } from '@/lib/uri'
 
 export default {
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    }
+  },
   computed: {
     className: () => 'free-tokens-dialog',
     show: {
@@ -67,12 +86,6 @@ export default {
         this.getFreeTokens()
       }
     }
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/InlineSpinner.vue b/src/components/InlineSpinner.vue
index 3d0976ab7..5dd74169d 100644
--- a/src/components/InlineSpinner.vue
+++ b/src/components/InlineSpinner.vue
@@ -1,23 +1,28 @@
 <template>
   <v-layout justify-center>
-    <v-progress-circular :size="spinnerSize" :stroke="1" class="progress-circular" color="#4A4A4A"
-      indeterminate />
+    <v-progress-circular
+      :size="spinnerSize"
+      :stroke="1"
+      class="progress-circular"
+      color="#4A4A4A"
+      indeterminate
+    />
   </v-layout>
 </template>
 
 <script>
 export default {
-  data () {
-    return {
-      spinnerSize: this.size
-    }
-  },
-  name: 'inline-spinner',
+  name: 'InlineSpinner',
   props: {
     size: {
       default: 32,
       type: Number
     }
+  },
+  data () {
+    return {
+      spinnerSize: this.size
+    }
   }
 }
 </script>
diff --git a/src/components/LanguageSwitcher.vue b/src/components/LanguageSwitcher.vue
index 227878fc5..4a3ac8eb6 100644
--- a/src/components/LanguageSwitcher.vue
+++ b/src/components/LanguageSwitcher.vue
@@ -1,16 +1,29 @@
 <template>
-  <v-menu offset-y class="language-switcher">
+  <v-menu
+    offset-y
+    class="language-switcher"
+  >
     <v-btn
-      class="ma-0"
       slot="activator"
+      class="ma-0"
       flat
     >
       <slot name="prepend">
-        <v-icon v-if="prependIcon" left>{{ prependIcon }}</v-icon>
+        <v-icon
+          v-if="prependIcon"
+          left
+        >
+          {{ prependIcon }}
+        </v-icon>
       </slot>
       {{ currentLanguageName }}
       <slot name="append">
-        <v-icon v-if="appendIcon" right>{{ appendIcon }}</v-icon>
+        <v-icon
+          v-if="appendIcon"
+          right
+        >
+          {{ appendIcon }}
+        </v-icon>
       </slot>
     </v-btn>
     <v-list>
@@ -27,6 +40,16 @@
 
 <script>
 export default {
+  props: {
+    prependIcon: {
+      type: String,
+      default: ''
+    },
+    appendIcon: {
+      type: String,
+      default: ''
+    }
+  },
   computed: {
     languages () {
       return this.$i18n.messages
@@ -50,16 +73,6 @@ export default {
     onSelect (locale) {
       this.currentLocale = locale
     }
-  },
-  props: {
-    prependIcon: {
-      type: String,
-      default: ''
-    },
-    appendIcon: {
-      type: String,
-      default: ''
-    }
   }
 }
 </script>
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 91a79faea..fd362dd5a 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -1,6 +1,10 @@
 <template>
-  <v-form v-model="validForm" @submit.prevent="submit" ref="form" class="login-form">
-
+  <v-form
+    ref="form"
+    v-model="validForm"
+    class="login-form"
+    @submit.prevent="submit"
+  >
     <v-layout>
       <slot>
         <v-text-field
@@ -13,10 +17,15 @@
         />
       </slot>
 
-      <slot name="append-outer"></slot>
+      <slot name="append-outer" />
     </v-layout>
 
-    <v-layout row wrap align-center justify-center>
+    <v-layout
+      row
+      wrap
+      align-center
+      justify-center
+    >
       <slot name="button">
         <v-btn
           :disabled="!validForm || disabledButton"
@@ -37,7 +46,7 @@
 
     <transition name="slide-fade">
       <v-layout justify-center>
-        <slot name="qrcode-renderer"/>
+        <slot name="qrcode-renderer" />
       </v-layout>
     </transition>
   </v-form>
@@ -47,6 +56,17 @@
 import { validateMnemonic } from 'bip39'
 
 export default {
+  props: {
+    value: {
+      type: String,
+      default: ''
+    }
+  },
+  data: () => ({
+    validForm: true,
+    disabledButton: false,
+    showSpinner: false
+  }),
   computed: {
     passphrase: {
       get () {
@@ -57,11 +77,6 @@ export default {
       }
     }
   },
-  data: () => ({
-    validForm: true,
-    disabledButton: false,
-    showSpinner: false
-  }),
   methods: {
     submit () {
       if (!validateMnemonic(this.passphrase)) {
@@ -95,12 +110,6 @@ export default {
       this.disabledButton = false
       this.showSpinner = false
     }
-  },
-  props: {
-    value: {
-      type: String,
-      default: ''
-    }
   }
 }
 </script>
diff --git a/src/components/LoginPasswordForm.vue b/src/components/LoginPasswordForm.vue
index d74f75505..83227db60 100644
--- a/src/components/LoginPasswordForm.vue
+++ b/src/components/LoginPasswordForm.vue
@@ -1,25 +1,35 @@
 <template>
-  <v-form v-model="validForm" @submit.prevent="submit" ref="form" class="login-form">
-
+  <v-form
+    ref="form"
+    v-model="validForm"
+    class="login-form"
+    @submit.prevent="submit"
+  >
     <v-layout>
       <v-text-field
-        autocomplete="new-password"
+        ref="passwordField"
         v-model="password"
+        autocomplete="new-password"
         :label="$t('login_via_password.user_password_title')"
         :name="Date.now()"
         type="password"
         class="text-xs-center"
-        ref="passwordField"
       />
     </v-layout>
 
-    <v-layout row wrap align-center justify-center class="mt-2">
+    <v-layout
+      row
+      wrap
+      align-center
+      justify-center
+      class="mt-2"
+    >
       <v-flex xs12>
         <slot name="button">
           <v-btn
             :disabled="!validForm || disabledButton"
-            @click="submit"
             class="login-form__button a-btn-primary"
+            @click="submit"
           >
             <v-progress-circular
               v-show="showSpinner"
@@ -32,16 +42,23 @@
           </v-btn>
         </slot>
       </v-flex>
-      <v-flex xs12 class="a-text-regular mt-5">
+      <v-flex
+        xs12
+        class="a-text-regular mt-5"
+      >
         {{ $t('login_via_password.remove_password_hint') }}
       </v-flex>
       <v-flex xs12>
-        <v-btn class="a-btn-link" flat small @click="removePassword">
+        <v-btn
+          class="a-btn-link"
+          flat
+          small
+          @click="removePassword"
+        >
           {{ $t('login_via_password.remove_password') }}
         </v-btn>
       </v-flex>
     </v-layout>
-
   </v-form>
 </template>
 
@@ -49,6 +66,17 @@
 import { clearDb } from '@/lib/idb'
 
 export default {
+  props: {
+    value: {
+      type: String,
+      default: ''
+    }
+  },
+  data: () => ({
+    validForm: true,
+    disabledButton: false,
+    showSpinner: false
+  }),
   computed: {
     password: {
       get () {
@@ -62,11 +90,6 @@ export default {
   updated () {
     this.$refs.passwordField.focus()
   },
-  data: () => ({
-    validForm: true,
-    disabledButton: false,
-    showSpinner: false
-  }),
   methods: {
     submit () {
       this.showSpinner = true
@@ -89,12 +112,6 @@ export default {
         this.$store.dispatch('removePassword')
       })
     }
-  },
-  props: {
-    value: {
-      type: String,
-      default: ''
-    }
   }
 }
 </script>
diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index ffe7291c9..ab92bc4c9 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -1,9 +1,17 @@
 <template>
   <div>
-    <v-btn icon @click="page--" :disabled="page <= 1">
+    <v-btn
+      icon
+      :disabled="page <= 1"
+      @click="page--"
+    >
       <v-icon>mdi-chevron-left</v-icon>
     </v-btn>
-    <v-btn icon @click="page++" :disabled="page >= pages">
+    <v-btn
+      icon
+      :disabled="page >= pages"
+      @click="page++"
+    >
       <v-icon>mdi-chevron-right</v-icon>
     </v-btn>
   </div>
@@ -11,6 +19,16 @@
 
 <script>
 export default {
+  props: {
+    value: {
+      type: Number,
+      required: true
+    },
+    pages: {
+      type: Number,
+      required: true
+    }
+  },
   computed: {
     page: {
       get () {
@@ -24,16 +42,6 @@ export default {
         this.$emit('input', value)
       }
     }
-  },
-  props: {
-    value: {
-      type: Number,
-      required: true
-    },
-    pages: {
-      type: Number,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/PartnerInfo.vue b/src/components/PartnerInfo.vue
index fc778a055..e17f18f79 100644
--- a/src/components/PartnerInfo.vue
+++ b/src/components/PartnerInfo.vue
@@ -1,30 +1,52 @@
 <template>
-  <v-layout justify-center row>
-    <v-dialog max-width="360" v-model="show">
+  <v-layout
+    justify-center
+    row
+  >
+    <v-dialog
+      v-model="show"
+      max-width="360"
+    >
       <v-card>
         <v-card-title class="a-text-header">
           {{ isMe ? $t('chats.my_qr_code') : $t('chats.partner_info') }}
-          <v-spacer></v-spacer>
-          <v-btn @click="show = false" flat icon class="close-icon">
+          <v-spacer />
+          <v-btn
+            flat
+            icon
+            class="close-icon"
+            @click="show = false"
+          >
             <v-icon>mdi-close</v-icon>
           </v-btn>
         </v-card-title>
-        <v-divider class="a-divider"></v-divider>
+        <v-divider class="a-divider" />
         <v-list two-line>
           <template>
             <v-list-tile>
               <v-list-tile-avatar>
-                <ChatAvatar :user-id="address" use-public-key />
+                <ChatAvatar
+                  :user-id="address"
+                  use-public-key
+                />
               </v-list-tile-avatar>
               <v-list-tile-content>
-                <v-list-tile-title v-text="address"></v-list-tile-title>
-                <v-list-tile-sub-title v-text="isMe ? $t('chats.me') : name"></v-list-tile-sub-title>
+                <v-list-tile-title v-text="address" />
+                <v-list-tile-sub-title v-text="isMe ? $t('chats.me') : name" />
               </v-list-tile-content>
             </v-list-tile>
           </template>
         </v-list>
-        <v-layout align-center justify-center class="pb-4">
-          <QrcodeRenderer :logo="logo" :opts="opts" :text="text" />
+        <v-layout
+          align-center
+          justify-center
+          class="pb-4"
+        >
+          <QrcodeRenderer
+            :logo="logo"
+            :opts="opts"
+            :text="text"
+          />
         </v-layout>
       </v-card>
     </v-dialog>
@@ -37,34 +59,9 @@ import QrcodeRenderer from '@/components/QrcodeRenderer'
 import { Cryptos } from '@/lib/constants'
 import { generateURI } from '@/lib/uri'
 import validateAddress from '@/lib/validateAddress'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  computed: {
-    show: {
-      get () {
-        return this.value
-      },
-      set (value) {
-        this.$emit('input', value)
-      }
-    },
-    text () {
-      return this.isMe
-        ? generateURI(Cryptos.ADM, this.ownerAddress)
-        : generateURI(Cryptos.ADM, this.address, this.name)
-    },
-    isMe () {
-      return this.address === this.ownerAddress
-    }
-  },
-  data () {
-    return {
-      logo: '/img/adm-qr-invert.png',
-      opts: {
-        scale: 8.8
-      }
-    }
-  },
   components: {
     ChatAvatar, QrcodeRenderer
   },
@@ -87,6 +84,32 @@ export default {
       required: true,
       validator: v => validateAddress('ADM', v)
     }
+  },
+  data () {
+    return {
+      logo: '/img/adm-qr-invert.png',
+      opts: {
+        scale: 8.8
+      }
+    }
+  },
+  computed: {
+    show: {
+      get () {
+        return this.value
+      },
+      set (value) {
+        this.$emit('input', value)
+      }
+    },
+    text () {
+      return this.isMe
+        ? generateURI(Cryptos.ADM, this.ownerAddress)
+        : generateURI(Cryptos.ADM, this.address, this.name)
+    },
+    isMe () {
+      return isStringEqualCI(this.address, this.ownerAddress)
+    }
   }
 }
 </script>
diff --git a/src/components/PassphraseGenerator.vue b/src/components/PassphraseGenerator.vue
index 0de892d05..cf4387680 100644
--- a/src/components/PassphraseGenerator.vue
+++ b/src/components/PassphraseGenerator.vue
@@ -1,22 +1,35 @@
 <template>
   <div :class="className">
     <div class="text-xs-center">
-      <h3 class="a-text-regular">{{ $t('login.create_address_label') }}</h3>
-      <v-btn @click="generatePassphrase" class="a-btn-link" flat small>
+      <h3 class="a-text-regular">
+        {{ $t('login.create_address_label') }}
+      </h3>
+      <v-btn
+        class="a-btn-link"
+        flat
+        small
+        @click="generatePassphrase"
+      >
         {{ $t('login.new_button') }}
       </v-btn>
     </div>
 
     <transition name="slide-fade">
-      <div :class="`${className}__box`" v-if="showPassphrase">
+      <div
+        v-if="showPassphrase"
+        :class="`${className}__box`"
+      >
+        <!-- eslint-disable vue/no-v-html -- Safe internal content -->
         <div
-          v-html="$t('login.new_passphrase_label')"
-          class="caption grey--text mt-2"
           ref="el"
-        ></div>
+          class="caption grey--text mt-2"
+          v-html="$t('login.new_passphrase_label')"
+        />
+        <!-- eslint-enable vue/no-v-html -->
+
         <v-textarea
+          ref="textarea"
           :value="passphrase"
-          @click.prevent="selectText"
           type="text"
           multi-line
           readonly
@@ -24,36 +37,36 @@
           class="pt-0"
           color="grey"
           no-resize
-          ref="textarea"
+          @click.prevent="selectText"
         >
           <template slot="append">
             <div :class="`${className}__icons`">
               <icon
-                @click="copyToClipboard"
                 :width="24"
                 :height="24"
                 shape-rendering="crispEdges"
                 :title="$t('login.copy_button_tooltip')"
+                @click="copyToClipboard"
               >
-                <copy-icon/>
+                <copy-icon />
               </icon>
               <icon
-                @click="saveFile"
                 :width="24"
                 :height="24"
                 shape-rendering="auto"
                 :title="$t('login.save_button_tooltip')"
+                @click="saveFile"
               >
-                <save-icon/>
+                <save-icon />
               </icon>
               <icon
-                @click="showQrcodeRendererDialog = true"
                 :width="24"
                 :height="24"
                 shape-rendering="crispEdges"
                 :title="$t('login.save_qr_code_tooltip')"
+                @click="showQrcodeRendererDialog = true"
               >
-                <qr-code-icon/>
+                <qr-code-icon />
               </icon>
             </div>
           </template>
@@ -79,16 +92,23 @@ import SaveIcon from '@/components/icons/common/Save'
 import QrCodeIcon from '@/components/icons/common/QrCode'
 
 export default {
-  computed: {
-    className () {
-      return 'passphrase-generator'
-    }
+  components: {
+    Icon,
+    CopyIcon,
+    SaveIcon,
+    QrCodeIcon,
+    QrcodeRendererDialog
   },
   data: () => ({
     passphrase: '',
     showPassphrase: false,
     showQrcodeRendererDialog: false
   }),
+  computed: {
+    className () {
+      return 'passphrase-generator'
+    }
+  },
   methods: {
     copyToClipboard () {
       copyToClipboard(this.passphrase)
@@ -96,7 +116,7 @@ export default {
       this.$emit('copy')
     },
     saveFile () {
-      var iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream
+      const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream
       if (!iOS) {
         downloadFile(
           this.passphrase,
@@ -122,13 +142,6 @@ export default {
         this.$scrollTo(this.$refs.textarea.$el, { easing: 'ease-in' })
       }, 0)
     }
-  },
-  components: {
-    Icon,
-    CopyIcon,
-    SaveIcon,
-    QrCodeIcon,
-    QrcodeRendererDialog
   }
 }
 </script>
diff --git a/src/components/PasswordSetDialog.vue b/src/components/PasswordSetDialog.vue
index 211dc54f3..4eb342c75 100644
--- a/src/components/PasswordSetDialog.vue
+++ b/src/components/PasswordSetDialog.vue
@@ -4,27 +4,31 @@
     width="500"
   >
     <v-card>
-      <v-card-title class="a-text-header">{{ $t('login_via_password.popup_title') }}</v-card-title>
+      <v-card-title class="a-text-header">
+        {{ $t('login_via_password.popup_title') }}
+      </v-card-title>
 
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
 
       <v-card-text>
         <v-text-field
-          autocomplete="new-password"
+          ref="passwordField"
           v-model="password"
+          autocomplete="new-password"
           class="a-input"
           type="password"
           :label="$t('login_via_password.enter_password')"
           :name="Date.now()"
-          v-on:keyup.enter="submit"
-          ref="passwordField"
+          @keyup.enter="submit"
         />
 
-        <div class="a-text-regular-enlarged">{{ $t('login_via_password.article_hint') }} <a @click="openLink(userPasswordAgreementLink)">{{$t('login_via_password.article')}}</a>.</div>
+        <div class="a-text-regular-enlarged">
+          {{ $t('login_via_password.article_hint') }} <a @click="openLink(userPasswordAgreementLink)">{{ $t('login_via_password.article') }}</a>.
+        </div>
       </v-card-text>
 
       <v-card-actions>
-        <v-spacer></v-spacer>
+        <v-spacer />
 
         <v-btn
           flat="flat"
@@ -37,8 +41,8 @@
         <v-btn
           flat="flat"
           class="a-btn-regular"
-          @click="submit"
           :disabled="!isValidForm || disabledButton"
+          @click="submit"
         >
           <v-progress-circular
             v-show="showSpinner"
@@ -59,15 +63,18 @@ import { UserPasswordArticleLink } from '@/lib/constants'
 import { saveState } from '@/lib/idb/state'
 
 export default {
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    }
+  },
   data: () => ({
     password: '',
     showSpinner: false,
     disabledButton: false,
     userPasswordAgreementLink: UserPasswordArticleLink
   }),
-  updated: function () {
-    this.$refs.passwordField.focus()
-  },
   computed: {
     show: {
       get () {
@@ -81,6 +88,9 @@ export default {
       return this.password.length > 0
     }
   },
+  updated: function () {
+    this.$refs.passwordField.focus()
+  },
   methods: {
     openLink (link) {
       window.open(link, '_blank', 'resizable,scrollbars,status,noopener')
@@ -112,12 +122,6 @@ export default {
           this.show = false
         })
     }
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/ProgressIndicator.vue b/src/components/ProgressIndicator.vue
index d2784ff26..aefbb8695 100644
--- a/src/components/ProgressIndicator.vue
+++ b/src/components/ProgressIndicator.vue
@@ -1,7 +1,15 @@
 <template>
-  <div class="progress-fog" v-if="show">
-    <v-progress-circular :size="150" :stroke="1" class="progress-circular" color="#4A4A4A"
-      indeterminate />
+  <div
+    v-if="show"
+    class="progress-fog"
+  >
+    <v-progress-circular
+      :size="150"
+      :stroke="1"
+      class="progress-circular"
+      color="#4A4A4A"
+      indeterminate
+    />
   </div>
 </template>
 
diff --git a/src/components/QrcodeCapture.vue b/src/components/QrcodeCapture.vue
index 2848898f2..3ed77f579 100644
--- a/src/components/QrcodeCapture.vue
+++ b/src/components/QrcodeCapture.vue
@@ -1,43 +1,43 @@
 <template>
   <div :class="className">
     <div
-      @click="$refs.fileInput.click()"
       :class="`${className}__activator`"
+      @click="$refs.fileInput.click()"
     >
-      <slot></slot>
+      <slot />
     </div>
 
     <input
       id="fileInput"
+      ref="fileInput"
       type="file"
       accept="image/*"
       :class="`${className}__file-input`"
       @change="onFileSelect"
-      ref="fileInput"
     >
 
     <img
       :id="imageBase64"
+      ref="imageElement"
       :src="imageBase64"
       :class="`${className}__image`"
-      ref="imageElement"
-    />
+    >
   </div>
 </template>
 
 <script>
 export default {
-  computed: {
-    className () {
-      return 'qrcode-capture'
-    }
-  },
   data: () => ({
     selectedImage: undefined,
     imageBase64: '',
     qrCodeText: '',
     codeReader: undefined
   }),
+  computed: {
+    className () {
+      return 'qrcode-capture'
+    }
+  },
   methods: {
     async onFileSelect (event) {
       this.selectedImage = event.target.files[0]
diff --git a/src/components/QrcodeRenderer.vue b/src/components/QrcodeRenderer.vue
index 7feed18ba..4ea435217 100644
--- a/src/components/QrcodeRenderer.vue
+++ b/src/components/QrcodeRenderer.vue
@@ -1,14 +1,34 @@
 <template>
-  <img :src="dataUrl" alt="" />
+  <img
+    :src="dataUrl"
+    alt=""
+  >
 </template>
 
 <script>
 import QRCode from 'qrcode'
 
 export default {
+  props: {
+    logo: {
+      type: String
+    },
+    opts: {
+      type: Object
+    },
+    text: {
+      required: true,
+      type: String
+    }
+  },
   data: () => ({
     dataUrl: ''
   }),
+  watch: {
+    text () {
+      this.render()
+    }
+  },
   mounted () {
     this.render()
   },
@@ -36,23 +56,6 @@ export default {
         }
       }
     }
-  },
-  props: {
-    logo: {
-      type: String
-    },
-    opts: {
-      type: Object
-    },
-    text: {
-      required: true,
-      type: String
-    }
-  },
-  watch: {
-    text () {
-      this.render()
-    }
   }
 }
 </script>
diff --git a/src/components/QrcodeRendererDialog.vue b/src/components/QrcodeRendererDialog.vue
index 9f16c4855..0296dc59d 100644
--- a/src/components/QrcodeRendererDialog.vue
+++ b/src/components/QrcodeRendererDialog.vue
@@ -4,17 +4,30 @@
     width="250"
   >
     <v-card>
-      <v-layout justify-center row wrap class="py-3">
-        <div @click="saveQrcode" :style="{ cursor: 'pointer' }">
+      <v-layout
+        justify-center
+        row
+        wrap
+        class="py-3"
+      >
+        <div
+          :style="{ cursor: 'pointer' }"
+          @click="saveQrcode"
+        >
           <QrcodeRenderer
+            ref="qrcode"
             :text="text"
             :logo="logoURL"
             :opts="opts"
-            ref="qrcode"
           />
         </div>
 
-        <v-btn @click="saveQrcode" class="a-btn-primary mt-3">{{ $t('login.save_qr_code_to_images') }}</v-btn>
+        <v-btn
+          class="a-btn-primary mt-3"
+          @click="saveQrcode"
+        >
+          {{ $t('login.save_qr_code_to_images') }}
+        </v-btn>
       </v-layout>
     </v-card>
   </v-dialog>
@@ -27,6 +40,28 @@ import FileSaver from 'file-saver'
 import QrcodeRenderer from '@/components/QrcodeRenderer'
 
 export default {
+  components: {
+    QrcodeRenderer
+  },
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    },
+    text: {
+      type: String,
+      default: ''
+    },
+    logo: {
+      type: Boolean,
+      default: undefined
+    }
+  },
+  data: () => ({
+    opts: {
+      scale: 8.8
+    }
+  }),
   computed: {
     show: {
       get () {
@@ -40,11 +75,6 @@ export default {
       return this.logo ? '/img/adm-qr-invert.png' : ''
     }
   },
-  data: () => ({
-    opts: {
-      scale: 8.8
-    }
-  }),
   methods: {
     saveQrcode () {
       const imgUrl = this.$refs.qrcode.$el.src
@@ -53,23 +83,6 @@ export default {
       const blob = new Blob([byteCharacters], { type: 'image/png' })
       FileSaver.saveAs(blob, 'adamant-im.png')
     }
-  },
-  components: {
-    QrcodeRenderer
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    },
-    text: {
-      type: String,
-      default: ''
-    },
-    logo: {
-      type: Boolean,
-      default: undefined
-    }
   }
 }
 </script>
diff --git a/src/components/QrcodeScannerDialog.vue b/src/components/QrcodeScannerDialog.vue
index e768bfc40..d9e24f04d 100644
--- a/src/components/QrcodeScannerDialog.vue
+++ b/src/components/QrcodeScannerDialog.vue
@@ -5,7 +5,6 @@
     width="500"
   >
     <v-card :class="className">
-
       <!-- Camera Waiting -->
       <v-layout
         v-if="cameraStatus === 'waiting'"
@@ -13,7 +12,9 @@
         align-center
         class="pa-5"
       >
-        <div class="a-text-header">{{ $t('scan.waiting_camera') }}</div>
+        <div class="a-text-header">
+          {{ $t('scan.waiting_camera') }}
+        </div>
         <v-progress-circular
           indeterminate
           color="primary"
@@ -30,14 +31,20 @@
       >
         <v-flex xs12>
           <div :class="`${className}__camera`">
-            <video ref="camera"></video>
+            <video ref="camera" />
             <v-menu
               v-if="cameras.length > 1"
               offset-y
               :class="`${className}__camera-select`"
             >
-              <v-btn slot="activator" flat color="white">
-                <v-icon large>mdi-camera</v-icon>
+              <v-btn
+                slot="activator"
+                flat
+                color="white"
+              >
+                <v-icon large>
+                  mdi-camera
+                </v-icon>
               </v-btn>
               <v-list>
                 <v-list-tile
@@ -51,7 +58,10 @@
             </v-menu>
           </div>
         </v-flex>
-        <v-flex xs12 class="pa-4">
+        <v-flex
+          xs12
+          class="pa-4"
+        >
           <h3
             class="a-text-regular text-xs-center"
           >
@@ -70,24 +80,27 @@
         class="text-xs-center pa-5"
       >
         <v-flex xs12>
-          <h3 class="a-text-header">{{ $t('scan.no_camera_found') }}</h3>
-          <p class="a-text-regular mt-1 mb-0">{{ $t('scan.connect_camera') }}</p>
+          <h3 class="a-text-header">
+            {{ $t('scan.no_camera_found') }}
+          </h3>
+          <p class="a-text-regular mt-1 mb-0">
+            {{ $t('scan.connect_camera') }}
+          </p>
         </v-flex>
       </v-layout>
 
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
 
       <v-card-actions>
-        <v-spacer></v-spacer>
+        <v-spacer />
         <v-btn
           flat
-          @click="show = false"
           class="a-btn-regular"
+          @click="show = false"
         >
           {{ $t('scan.close_button') }}
         </v-btn>
       </v-card-actions>
-
     </v-card>
   </v-dialog>
 </template>
@@ -96,12 +109,18 @@
 import { Scanner } from '@/lib/zxing'
 
 export default {
-  mounted () {
-    this.init()
-  },
-  beforeDestroy () {
-    this.destroyScanner()
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    }
   },
+  data: () => ({
+    cameraStatus: 'waiting', // can be: waiting, active, nocamera
+    scanner: null,
+    currentCamera: null,
+    cameras: []
+  }),
   computed: {
     className: () => 'qrcode-scanner-dialog',
     show: {
@@ -129,12 +148,12 @@ export default {
         .then(content => this.onScan(content))
     }
   },
-  data: () => ({
-    cameraStatus: 'waiting', // can be: waiting, active, nocamera
-    scanner: null,
-    currentCamera: null,
-    cameras: []
-  }),
+  mounted () {
+    this.init()
+  },
+  beforeDestroy () {
+    this.destroyScanner()
+  },
   methods: {
     init () {
       return this.initScanner()
@@ -170,12 +189,6 @@ export default {
       this.destroyScanner()
       this.show = false
     }
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/SendFundsForm.vue b/src/components/SendFundsForm.vue
index ba39bc3f9..e935440a8 100644
--- a/src/components/SendFundsForm.vue
+++ b/src/components/SendFundsForm.vue
@@ -1,14 +1,15 @@
 <template>
   <div :class="className">
-    <warning-on-partner-address-dialog :info="warningOnPartnerInfo"
-      v-model="showWarningOnPartnerAddressDialog" />
+    <warning-on-partner-address-dialog
+      v-model="showWarningOnPartnerAddressDialog"
+      :info="warningOnPartnerInfo"
+    />
 
     <v-form
+      ref="form"
       v-model="validForm"
       @submit.prevent="confirm"
-      ref="form"
     >
-
       <v-select
         v-model="currency"
         class="a-input"
@@ -19,28 +20,46 @@
       <v-text-field
         v-model.trim="cryptoAddress"
         :disabled="addressReadonly"
-        @paste="onPasteURIAddress"
         class="a-input"
         type="text"
+        @paste="onPasteURIAddress"
       >
         <template slot="label">
-          <span v-if="recipientName && addressReadonly" class="font-weight-medium">
+          <span
+            v-if="recipientName && addressReadonly"
+            class="font-weight-medium"
+          >
             {{ $t('transfer.to_name_label', { name: recipientName }) }}
           </span>
-          <span v-else class="font-weight-medium">
+          <span
+            v-else
+            class="font-weight-medium"
+          >
             {{ $t('transfer.to_address_label') }}
           </span>
         </template>
-        <template slot="append" v-if="!addressReadonly">
-          <v-menu :offset-overflow="true" :offset-y="false" left>
-            <v-icon slot="activator">mdi-dots-vertical</v-icon>
+        <template
+          v-if="!addressReadonly"
+          slot="append"
+        >
+          <v-menu
+            :offset-overflow="true"
+            :offset-y="false"
+            left
+          >
+            <v-icon slot="activator">
+              mdi-dots-vertical
+            </v-icon>
             <v-list>
               <v-list-tile @click="showQrcodeScanner = true">
                 <v-list-tile-title>{{ $t('transfer.decode_from_camera') }}</v-list-tile-title>
               </v-list-tile>
               <v-list-tile class="v-list__tile--link">
                 <v-list-tile-title>
-                  <qrcode-capture @detect="onDetectQrcode" @error="onDetectQrcodeError">
+                  <qrcode-capture
+                    @detect="onDetectQrcode"
+                    @error="onDetectQrcodeError"
+                  >
                     <span>{{ $t('transfer.decode_from_image') }}</span>
                   </qrcode-capture>
                 </v-list-tile-title>
@@ -65,13 +84,19 @@
           </span>
         </template>
         <template slot="append">
-          <v-menu :offset-overflow="true" :offset-y="false" left>
-            <v-icon slot="activator">mdi-dots-vertical</v-icon>
+          <v-menu
+            :offset-overflow="true"
+            :offset-y="false"
+            left
+          >
+            <v-icon slot="activator">
+              mdi-dots-vertical
+            </v-icon>
             <v-list>
               <v-list-tile
+                v-for="item in amountMenuItems"
                 :key="item.title"
                 @click="divideAmount(item.divider)"
-                v-for="item in amountMenuItems"
               >
                 <v-list-tile-title>{{ $t(item.title) }}</v-list-tile-title>
               </v-list-tile>
@@ -81,16 +106,16 @@
       </v-text-field>
 
       <v-text-field
-        :value="`${this.transferFeeFixed} ${this.transferFeeCurrency}`"
-        :label="`${this.transferFeeLabel}`"
+        :value="`${transferFeeFixed} ${transferFeeCurrency}`"
+        :label="`${transferFeeLabel}`"
         class="a-input"
         disabled
       />
       <v-text-field
-        :value="`${this.finalAmountFixed} ${this.currency}`"
+        v-if="!hideFinalAmount"
+        :value="`${finalAmountFixed} ${currency}`"
         :label="$t('transfer.final_amount_label')"
         class="a-input"
-        v-if="!this.hideFinalAmount"
         disabled
       />
 
@@ -98,29 +123,28 @@
         v-if="addressReadonly"
         v-model="comment"
         :label="$t('transfer.comments_label')"
-        @paste="onPasteURIComment"
         class="a-input"
         counter
         maxlength="100"
+        @paste="onPasteURIComment"
       />
 
       <v-checkbox
+        v-if="allowIncreaseFee"
+        v-model="increaseFee"
         :label="$t('transfer.increase_fee')"
         color="grey darken-1"
-        v-model="increaseFee"
-        v-if="allowIncreaseFee"
       />
 
       <div class="text-xs-center">
         <v-btn
           :class="`${className}__button`"
-          @click="confirm"
           class="a-btn-primary"
+          @click="confirm"
         >
           {{ $t('transfer.send_button') }}
         </v-btn>
       </div>
-
     </v-form>
 
     <v-dialog
@@ -128,14 +152,21 @@
       width="500"
     >
       <v-card>
-        <v-card-title class="a-text-header">{{ $t('transfer.confirm_title') }}</v-card-title>
+        <v-card-title class="a-text-header">
+          {{ $t('transfer.confirm_title') }}
+        </v-card-title>
 
-        <v-divider class="a-divider"></v-divider>
+        <v-divider class="a-divider" />
 
-        <v-card-text class="a-text-regular-enlarged" v-html="confirmMessage"/>
+        <!-- eslint-disable vue/no-v-html -- Safe internal content -->
+        <v-card-text
+          class="a-text-regular-enlarged"
+          v-html="confirmMessage"
+        />
+        <!-- eslint-enable vue/no-v-html -->
 
         <v-card-actions>
-          <v-spacer></v-spacer>
+          <v-spacer />
 
           <v-btn
             class="a-btn-regular"
@@ -148,8 +179,8 @@
           <v-btn
             class="a-btn-regular"
             flat
-            @click="submit"
             :disabled="disabledButton"
+            @click="submit"
           >
             <v-progress-circular
               v-show="showSpinner"
@@ -165,9 +196,9 @@
     </v-dialog>
 
     <qrcode-scanner-dialog
-      @scan="onScanQrcode"
       v-if="showQrcodeScanner"
       v-model="showQrcodeScanner"
+      @scan="onScanQrcode"
     />
   </div>
 </template>
@@ -177,16 +208,17 @@ import QrcodeCapture from '@/components/QrcodeCapture'
 import QrcodeScannerDialog from '@/components/QrcodeScannerDialog'
 import get from 'lodash/get'
 import { BigNumber } from 'bignumber.js'
-import { INCREASE_FEE_MULTIPLIER } from '../lib/constants'
+import { INCREASE_FEE_MULTIPLIER, Cryptos, CryptoAmountPrecision, CryptoNaturalUnits, TransactionStatus as TS, isErc20, isFeeEstimate, isEthBased, getMinAmount, isSelfTxAllowed } from '../lib/constants'
 
 import { parseURI } from '@/lib/uri'
 import { sendMessage } from '@/lib/adamant-api'
-import { Cryptos, CryptoAmountPrecision, CryptoNaturalUnits, TransactionStatus as TS, isErc20, isFeeEstimate, isEthBased, getMinAmount, isSelfTxAllowed } from '@/lib/constants'
+
 import validateAddress from '@/lib/validateAddress'
 import { formatNumber, isNumeric } from '@/lib/numericHelpers'
 import partnerName from '@/mixins/partnerName'
 
 import WarningOnPartnerAddressDialog from '@/components/WarningOnPartnerAddressDialog'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 /**
  * @returns {string | boolean}
@@ -208,25 +240,72 @@ function validateForm () {
 }
 
 export default {
-  mixins: [partnerName],
   components: {
     QrcodeCapture,
     QrcodeScannerDialog,
     WarningOnPartnerAddressDialog
   },
-  created () {
-    this.currency = this.cryptoCurrency
-    this.address = this.recipientAddress
-    this.amount = this.amountToSend
-
-    // create watcher after setting default from props
-    this.$watch('currency', () => {
-      this.$refs.form.validate()
-    })
+  filters: {
+    /**
+     * @param {BigNumber} bigNumber
+     */
+    toFixed: bigNumber => bigNumber.toFixed()
   },
-  mounted () {
-    this.fetchUserCryptoAddress()
+  mixins: [partnerName],
+  props: {
+    cryptoCurrency: {
+      type: String,
+      default: 'ADM',
+      validator: value => value in Cryptos
+    },
+    recipientAddress: {
+      type: String,
+      default: ''
+    },
+    amountToSend: {
+      type: Number,
+      default: 0
+    },
+    addressReadonly: {
+      type: Boolean,
+      default: false
+    }
   },
+  data: () => ({
+    currency: '',
+    address: '',
+    cryptoAddress: '',
+    amountString: '',
+    amount: 0,
+    amountMenuItems: [
+      {
+        divider: 10,
+        title: 'transfer.amount_percent_10'
+      },
+      {
+        divider: 3,
+        title: 'transfer.amount_percent_33'
+      },
+      {
+        divider: 2,
+        title: 'transfer.amount_percent_50'
+      },
+      {
+        divider: 1,
+        title: 'transfer.amount_percent_100'
+      }
+    ],
+    comment: '',
+    validForm: true,
+    disabledButton: false,
+    showQrcodeScanner: false,
+    showSpinner: false,
+    dialog: false,
+    fetchAddress: null, // fn throttle
+    increaseFee: false,
+    showWarningOnPartnerAddressDialog: false,
+    warningOnPartnerInfo: { }
+  }),
   computed: {
     className: () => 'send-funds-form',
 
@@ -370,13 +449,13 @@ export default {
       return {
         cryptoAddress: [
           v => validateAddress(this.currency, v) || this.$t('transfer.error_incorrect_address', { crypto: this.currency }),
-          v => (v !== this.ownAddress || isSelfTxAllowed(this.currency)) || this.$t('transfer.error_same_recipient')
+          v => (!isStringEqualCI(v, this.ownAddress) || isSelfTxAllowed(this.currency)) || this.$t('transfer.error_same_recipient')
         ],
         amount: [
           v => v > 0 || this.$t('transfer.error_incorrect_amount'),
           v => this.finalAmount <= this.balance || this.$t('transfer.error_not_enough'),
           v => this.validateMinAmount(v, this.currency) || this.$t('transfer.error_dust_amount'),
-          v => this.validateNaturalUnits(v, this.currency) || this.$t('transfer.error_dust_amount'),
+          v => this.validateNaturalUnits(v, this.currency) || this.$t('transfer.error_precision'),
           v => isErc20(this.currency)
             ? this.ethBalance >= this.transferFee || this.$t('transfer.error_not_enough_eth_fee')
             : true
@@ -396,41 +475,19 @@ export default {
       }
     }
   },
-  data: () => ({
-    currency: '',
-    address: '',
-    cryptoAddress: '',
-    amountString: '',
-    amount: 0,
-    amountMenuItems: [
-      {
-        divider: 10,
-        title: 'transfer.amount_percent_10'
-      },
-      {
-        divider: 3,
-        title: 'transfer.amount_percent_33'
-      },
-      {
-        divider: 2,
-        title: 'transfer.amount_percent_50'
-      },
-      {
-        divider: 1,
-        title: 'transfer.amount_percent_100'
-      }
-    ],
-    comment: '',
-    validForm: true,
-    disabledButton: false,
-    showQrcodeScanner: false,
-    showSpinner: false,
-    dialog: false,
-    fetchAddress: null, // fn throttle
-    increaseFee: false,
-    showWarningOnPartnerAddressDialog: false,
-    warningOnPartnerInfo: { }
-  }),
+  created () {
+    this.currency = this.cryptoCurrency
+    this.address = this.recipientAddress
+    this.amount = this.amountToSend
+
+    // create watcher after setting default from props
+    this.$watch('currency', () => {
+      this.$refs.form.validate()
+    })
+  },
+  mounted () {
+    this.fetchUserCryptoAddress()
+  },
   methods: {
     confirm () {
       const abstract = validateForm.call(this)
@@ -440,7 +497,7 @@ export default {
       } else {
         this.$store.dispatch('snackbar/show', {
           message: abstract,
-          timeout: 5000
+          timeout: 3500
         })
       }
     },
@@ -625,7 +682,7 @@ export default {
         }).then(addresses => {
           this.cryptoAddress = addresses[0]
           if (addresses.length > 1) {
-            let addressesList = addresses.join(', ')
+            const addressesList = addresses.join(', ')
             this.warningOnPartnerInfo.coin = this.currency
             this.warningOnPartnerInfo.ADMaddress = this.address
             this.warningOnPartnerInfo.ADMname = ''
@@ -645,7 +702,7 @@ export default {
     validateNaturalUnits (amount, currency) {
       const units = CryptoNaturalUnits[currency]
 
-      const [ , right = '' ] = BigNumber(amount).toFixed().split('.')
+      const [, right = ''] = BigNumber(amount).toFixed().split('.')
 
       return right.length <= units
     },
@@ -653,31 +710,6 @@ export default {
       const coef = this.increaseFee ? INCREASE_FEE_MULTIPLIER : 1
       return coef * this.$store.getters[`${this.currency.toLowerCase()}/fee`](amount)
     }
-  },
-  filters: {
-    /**
-     * @param {BigNumber} bigNumber
-     */
-    toFixed: bigNumber => bigNumber.toFixed()
-  },
-  props: {
-    cryptoCurrency: {
-      type: String,
-      default: 'ADM',
-      validator: value => value in Cryptos
-    },
-    recipientAddress: {
-      type: String,
-      default: ''
-    },
-    amountToSend: {
-      type: Number,
-      default: 0
-    },
-    addressReadonly: {
-      type: Boolean,
-      default: false
-    }
   }
 }
 </script>
diff --git a/src/components/ShareURIDialog.vue b/src/components/ShareURIDialog.vue
index 51721ce0d..ae62c1ced 100644
--- a/src/components/ShareURIDialog.vue
+++ b/src/components/ShareURIDialog.vue
@@ -1,10 +1,13 @@
 <template>
-  <v-dialog v-model="show" width="320">
+  <v-dialog
+    v-model="show"
+    width="320"
+  >
     <v-card>
       <v-card-title class="a-text-header">
         {{ $t('home.share_uri', { crypto }) }}
       </v-card-title>
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
       <v-card-text class="pa-0">
         <v-list>
           <v-list-tile @click="copyAddress">
@@ -12,7 +15,10 @@
               <v-list-tile-title v-t="'home.copy_address'" />
             </v-list-tile-content>
           </v-list-tile>
-          <v-list-tile @click="copyURI" v-if="isADM">
+          <v-list-tile
+            v-if="isADM"
+            @click="copyURI"
+          >
             <v-list-tile-content>
               <v-list-tile-title v-t="'home.copy_uri'" />
             </v-list-tile-content>
@@ -25,7 +31,11 @@
         </v-list>
       </v-card-text>
     </v-card>
-    <QrcodeRendererDialog :logo="isADM" :text="uri" v-model="showQrcodeRendererDialog" />
+    <QrcodeRendererDialog
+      v-model="showQrcodeRendererDialog"
+      :logo="isADM"
+      :text="uri"
+    />
   </v-dialog>
 </template>
 
@@ -36,6 +46,25 @@ import { generateURI } from '@/lib/uri'
 
 export default {
   components: { QrcodeRendererDialog },
+  props: {
+    address: {
+      required: true,
+      type: String
+    },
+    crypto: {
+      required: true,
+      type: String
+    },
+    isADM: {
+      required: true,
+      type: Boolean
+    },
+    value: {
+      required: true,
+      type: Boolean
+    }
+  },
+  data: () => ({ showQrcodeRendererDialog: false }),
   computed: {
     show: {
       get () { return this.value },
@@ -45,7 +74,6 @@ export default {
       return generateURI(this.crypto, this.address)
     }
   },
-  data: () => ({ showQrcodeRendererDialog: false }),
   methods: {
     copyAddress () {
       copyToClipboard(this.address)
@@ -61,24 +89,6 @@ export default {
       this.showQrcodeRendererDialog = true
       this.show = false
     }
-  },
-  props: {
-    address: {
-      required: true,
-      type: String
-    },
-    crypto: {
-      required: true,
-      type: String
-    },
-    isADM: {
-      required: true,
-      type: Boolean
-    },
-    value: {
-      required: true,
-      type: Boolean
-    }
   }
 }
 </script>
diff --git a/src/components/TransactionListItem.vue b/src/components/TransactionListItem.vue
index f7393f159..46f9b90e1 100644
--- a/src/components/TransactionListItem.vue
+++ b/src/components/TransactionListItem.vue
@@ -1,13 +1,19 @@
 <template>
   <div :class="className">
     <v-list-tile
-      @click="onClickTransaction"
       avatar
       :class="`${className}__tile`"
+      @click="onClickTransaction"
     >
-      <v-list-tile-avatar :class="`${className}__icon-avatar`" :size="40">
-        <v-icon :class="`${className}__icon`" :size="20">
-          {{ senderId === userId ? 'mdi-airplane-takeoff' : 'mdi-airplane-landing' }}
+      <v-list-tile-avatar
+        :class="`${className}__icon-avatar`"
+        :size="40"
+      >
+        <v-icon
+          :class="`${className}__icon`"
+          :size="20"
+        >
+          {{ isStringEqualCI(senderId, userId) ? 'mdi-airplane-takeoff' : 'mdi-airplane-landing' }}
         </v-icon>
       </v-list-tile-avatar>
 
@@ -22,25 +28,49 @@
 
         <v-list-tile-title>
           <span :class="`${className}__amount ${directionClass}`">{{ amount | currency(crypto) }}</span>
-          <span v-if="comment" class="a-text-regular-enlarged-bold" style="font-style: italic;"> "</span>
-          <span v-if="comment" class="a-text-explanation" style="font-weight: 100;">{{ comment }}</span>
+          <span
+            v-if="comment"
+            class="a-text-regular-enlarged-bold"
+            style="font-style: italic;"
+          > "</span>
+          <span
+            v-if="comment"
+            class="a-text-explanation"
+            style="font-weight: 100;"
+          >{{ comment }}</span>
         </v-list-tile-title>
 
-        <v-list-tile-sub-title :class="`${className}__date`" class="a-text-explanation-small">
+        <v-list-tile-sub-title
+          :class="`${className}__date`"
+          class="a-text-explanation-small"
+        >
           {{ createdAt | date }}
         </v-list-tile-sub-title>
       </v-list-tile-content>
 
-      <v-list-tile-action :class="`${className}__action`" v-if="isClickIcon">
-        <v-btn icon ripple @click.stop="onClickIcon">
-          <v-icon :class="`${className}__icon`" :size="20">
+      <v-list-tile-action
+        v-if="isClickIcon"
+        :class="`${className}__action`"
+      >
+        <v-btn
+          icon
+          ripple
+          @click.stop="onClickIcon"
+        >
+          <v-icon
+            :class="`${className}__icon`"
+            :size="20"
+          >
             {{ isPartnerInChatList ? 'mdi-message-text' : 'mdi-message-outline' }}
           </v-icon>
         </v-btn>
       </v-list-tile-action>
     </v-list-tile>
 
-    <v-divider :inset="true" class="a-divider"></v-divider>
+    <v-divider
+      :inset="true"
+      class="a-divider"
+    />
   </div>
 </template>
 
@@ -48,9 +78,40 @@
 import dateFilter from '@/filters/date'
 import { EPOCH, Cryptos } from '@/lib/constants'
 import partnerName from '@/mixins/partnerName'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
+  filters: {
+    date: dateFilter
+  },
   mixins: [partnerName],
+  props: {
+    id: {
+      type: String,
+      required: true
+    },
+    senderId: {
+      type: String,
+      required: true
+    },
+    recipientId: {
+      type: String,
+      required: true
+    },
+    timestamp: {
+      type: Number,
+      required: true
+    },
+    amount: {
+      type: [Number, String],
+      required: true
+    },
+    crypto: {
+      type: String,
+      default: 'ADM',
+      validator: v => v in Cryptos
+    }
+  },
   computed: {
     userId () {
       if (this.crypto === Cryptos.ADM) {
@@ -62,17 +123,17 @@ export default {
       }
     },
     partnerId () {
-      return this.senderId === this.userId
+      return isStringEqualCI(this.senderId, this.userId)
         ? this.recipientId
         : this.senderId
     },
     partnerAdmId () {
-      return this.getAdmTx.senderId === this.$store.state.address
+      return isStringEqualCI(this.getAdmTx.senderId, this.$store.state.address)
         ? this.getAdmTx.recipientId
         : this.getAdmTx.senderId
     },
     partnerName () {
-      let name = this.getPartnerName(this.partnerAdmId) || ''
+      const name = this.getPartnerName(this.partnerAdmId) || ''
       if (this.isCryptoADM()) {
         return name
       } else {
@@ -92,16 +153,16 @@ export default {
       return 'transaction-item'
     },
     isClickIcon () {
-      let hasPartnerAddress = this.partnerAdmId && (this.partnerAdmId !== undefined)
+      const hasPartnerAddress = this.partnerAdmId && (this.partnerAdmId !== undefined)
       return this.isCryptoADM() || hasPartnerAddress
     },
     getAdmTx () {
       return this.admTx()
     },
     directionClass () {
-      if (this.senderId === this.userId && this.recipientId === this.userId) {
+      if (isStringEqualCI(this.senderId, this.userId) && isStringEqualCI(this.recipientId, this.userId)) {
         return `${this.className}__amount--is-itself`
-      } else if (this.senderId === this.userId) {
+      } else if (isStringEqualCI(this.senderId, this.userId)) {
         return `${this.className}__amount--is-outgoing`
       } else {
         return `${this.className}__amount--is-incoming`
@@ -112,6 +173,9 @@ export default {
     }
   },
   methods: {
+    isStringEqualCI (string1, string2) {
+      return isStringEqualCI(string1, string2)
+    },
     isCryptoADM () {
       return this.crypto === Cryptos.ADM
     },
@@ -126,7 +190,7 @@ export default {
         return this.$store.getters['chat/messageById'](this.id) || this.$store.state.adm.transactions[this.id] || { }
       }
 
-      let admTx = {}
+      const admTx = {}
       // Bad news, everyone: we'll have to scan the messages
       Object.values(this.$store.state.chat.chats).some(chat => {
         Object.values(chat.messages).some(msg => {
@@ -139,36 +203,6 @@ export default {
       })
       return admTx
     }
-  },
-  filters: {
-    date: dateFilter
-  },
-  props: {
-    id: {
-      type: String,
-      required: true
-    },
-    senderId: {
-      type: String,
-      required: true
-    },
-    recipientId: {
-      type: String,
-      required: true
-    },
-    timestamp: {
-      type: Number,
-      required: true
-    },
-    amount: {
-      type: [Number, String],
-      required: true
-    },
-    crypto: {
-      type: String,
-      default: 'ADM',
-      validator: v => v in Cryptos
-    }
   }
 }
 </script>
diff --git a/src/components/TransitionEffect.vue b/src/components/TransitionEffect.vue
index b90fe85ae..c4fe2e6a6 100644
--- a/src/components/TransitionEffect.vue
+++ b/src/components/TransitionEffect.vue
@@ -1,12 +1,15 @@
 <template>
-  <transition name="fade" mode="out-in">
+  <transition
+    name="fade"
+    mode="out-in"
+  >
     <slot />
   </transition>
 </template>
 
 <script>
 export default {
-  name: `TransitionPage`
+  name: 'TransitionPage'
 }
 </script>
 
diff --git a/src/components/WalletCard.vue b/src/components/WalletCard.vue
index dc7762e42..98f5120e0 100644
--- a/src/components/WalletCard.vue
+++ b/src/components/WalletCard.vue
@@ -1,7 +1,16 @@
 <template>
-  <v-card flat :class="className">
-    <v-list two-line :class="`${className}__list`">
-      <v-list-tile @click="showShareURIDialog = true" :class="`${className}__tile`">
+  <v-card
+    flat
+    :class="className"
+  >
+    <v-list
+      two-line
+      :class="`${className}__list`"
+    >
+      <v-list-tile
+        :class="`${className}__tile`"
+        @click="showShareURIDialog = true"
+      >
         <v-list-tile-content>
           <v-list-tile-title :class="`${className}__title`">
             {{ cryptoName }} {{ $t('home.wallet') }}
@@ -12,8 +21,17 @@
         </v-list-tile-content>
 
         <v-list-tile-action>
-          <v-btn icon ripple :class="`${className}__action`">
-            <v-icon :class="`${className}__icon`" size="20">mdi-share-variant</v-icon>
+          <v-btn
+            icon
+            ripple
+            :class="`${className}__action`"
+          >
+            <v-icon
+              :class="`${className}__icon`"
+              size="20"
+            >
+              mdi-share-variant
+            </v-icon>
           </v-btn>
         </v-list-tile-action>
       </v-list-tile>
@@ -29,8 +47,17 @@
         </v-list-tile-content>
 
         <v-list-tile-action>
-          <v-btn icon ripple :class="`${className}__action`">
-            <v-icon :class="`${className}__icon`" size="20">mdi-chevron-right</v-icon>
+          <v-btn
+            icon
+            ripple
+            :class="`${className}__action`"
+          >
+            <v-icon
+              :class="`${className}__icon`"
+              size="20"
+            >
+              mdi-chevron-right
+            </v-icon>
           </v-btn>
         </v-list-tile-action>
       </v-list-tile>
@@ -39,14 +66,14 @@
     <WalletCardListActions
       :class="`${className}__list`"
       :crypto="crypto"
-      :isADM="isADM"
+      :is-a-d-m="isADM"
     />
 
     <ShareURIDialog
+      v-model="showShareURIDialog"
       :address="address"
       :crypto="crypto"
-      :isADM="isADM"
-      v-model="showShareURIDialog"
+      :is-a-d-m="isADM"
     />
   </v-card>
 </template>
@@ -57,15 +84,6 @@ import WalletCardListActions from '@/components/WalletCardListActions'
 import { Cryptos } from '@/lib/constants'
 
 export default {
-  computed: {
-    className () {
-      return 'wallet-card'
-    },
-    isADM () {
-      return this.crypto === Cryptos.ADM
-    }
-  },
-  data: () => ({ showShareURIDialog: false }),
   components: {
     ShareURIDialog,
     WalletCardListActions
@@ -87,6 +105,15 @@ export default {
       type: String,
       default: 'ADAMANT'
     }
+  },
+  data: () => ({ showShareURIDialog: false }),
+  computed: {
+    className () {
+      return 'wallet-card'
+    },
+    isADM () {
+      return this.crypto === Cryptos.ADM
+    }
   }
 }
 </script>
diff --git a/src/components/WalletCardListActions.vue b/src/components/WalletCardListActions.vue
index ec03604f7..5af437ea2 100644
--- a/src/components/WalletCardListActions.vue
+++ b/src/components/WalletCardListActions.vue
@@ -1,32 +1,55 @@
 <template>
   <v-list :class="className">
-    <v-list-tile @click="sendFunds" avatar>
+    <v-list-tile
+      avatar
+      @click="sendFunds"
+    >
       <v-list-tile-avatar :class="`${className}__avatar`">
-        <v-icon :class="`${className}__icon`">mdi-bank-transfer-out</v-icon>
+        <v-icon :class="`${className}__icon`">
+          mdi-bank-transfer-out
+        </v-icon>
       </v-list-tile-avatar>
 
       <v-list-tile-content>
-        <v-list-tile-title :class="`${className}__title`">{{ $t('home.send_crypto', { crypto }) }}</v-list-tile-title>
+        <v-list-tile-title :class="`${className}__title`">
+          {{ $t('home.send_crypto', { crypto }) }}
+        </v-list-tile-title>
       </v-list-tile-content>
     </v-list-tile>
 
-    <v-list-tile v-if="isADM" @click="buyTokens" avatar>
+    <v-list-tile
+      v-if="isADM"
+      avatar
+      @click="buyTokens"
+    >
       <v-list-tile-avatar :class="`${className}__avatar`">
-        <v-icon :class="`${className}__icon`">mdi-finance</v-icon>
+        <v-icon :class="`${className}__icon`">
+          mdi-finance
+        </v-icon>
       </v-list-tile-avatar>
 
       <v-list-tile-content>
-        <v-list-tile-title :class="`${className}__title`">{{ $t('home.buy_tokens_btn') }}</v-list-tile-title>
+        <v-list-tile-title :class="`${className}__title`">
+          {{ $t('home.buy_tokens_btn') }}
+        </v-list-tile-title>
       </v-list-tile-content>
     </v-list-tile>
 
-    <v-list-tile v-if="isADM && !hasAdmTokens" @click="getFreeTokens" avatar>
+    <v-list-tile
+      v-if="isADM && !hasAdmTokens"
+      avatar
+      @click="getFreeTokens"
+    >
       <v-list-tile-avatar :class="`${className}__avatar`">
-        <v-icon :class="`${className}__icon`">mdi-gift</v-icon>
+        <v-icon :class="`${className}__icon`">
+          mdi-gift
+        </v-icon>
       </v-list-tile-avatar>
 
       <v-list-tile-content>
-        <v-list-tile-title :class="`${className}__title`">{{ $t('home.free_adm_btn') }}</v-list-tile-title>
+        <v-list-tile-title :class="`${className}__title`">
+          {{ $t('home.free_adm_btn') }}
+        </v-list-tile-title>
       </v-list-tile-content>
     </v-list-tile>
 
@@ -43,15 +66,29 @@ import BuyTokensDialog from '@/components/BuyTokensDialog'
 import { websiteUriToOnion } from '@/lib/uri'
 
 export default {
+  components: {
+    BuyTokensDialog
+  },
+  props: {
+    crypto: {
+      type: String,
+      default: Cryptos.ADM,
+      validator: v => v in Cryptos
+    },
+    isADM: {
+      required: true,
+      type: Boolean
+    }
+  },
+  data: () => ({
+    showBuyTokensDialog: false
+  }),
   computed: {
     className: () => 'wallet-actions',
     hasAdmTokens () {
       return this.$store.state.balance > 0
     }
   },
-  data: () => ({
-    showBuyTokensDialog: false
-  }),
   methods: {
     sendFunds () {
       this.$router.push({
@@ -68,20 +105,6 @@ export default {
       const link = websiteUriToOnion(this.$t('home.free_tokens_link') + '?wallet=' + this.$store.state.address)
       window.open(link, '_blank', 'resizable,scrollbars,status,noopener')
     }
-  },
-  components: {
-    BuyTokensDialog
-  },
-  props: {
-    crypto: {
-      type: String,
-      default: Cryptos.ADM,
-      validator: v => v in Cryptos
-    },
-    isADM: {
-      required: true,
-      type: Boolean
-    }
   }
 }
 </script>
diff --git a/src/components/WarningOnAddressesDialog.vue b/src/components/WarningOnAddressesDialog.vue
index 275ed03e0..6775ee254 100644
--- a/src/components/WarningOnAddressesDialog.vue
+++ b/src/components/WarningOnAddressesDialog.vue
@@ -10,28 +10,45 @@
         {{ header }}
       </v-card-title>
 
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
 
+      <!-- eslint-disable vue/no-v-html -- Safe with DOMPurify.sanitize() content -->
       <v-card-text>
-        <div :class="`${className}__disclaimer a-text-regular-enlarged`" v-html="content">
-        </div>
+        <div
+          :class="`${className}__disclaimer a-text-regular-enlarged`"
+          v-html="content"
+        />
       </v-card-text>
+      <!-- eslint-enable vue/no-v-html -->
 
-      <v-flex xs12 class="text-xs-center">
-        <v-btn :class="[`${className}__btn-hide`, 'a-btn-primary']"
+      <v-flex
+        xs12
+        class="text-xs-center"
+      >
+        <v-btn
+          :class="[`${className}__btn-hide`, 'a-btn-primary']"
           @click="hide()"
         >
-          <v-icon :class="`${className}__btn-icon`">mdi-alert</v-icon>
-          <div :class="`${className}__btn-text`">{{ $t('warning_on_addresses.hide_button') }}</div>
+          <v-icon :class="`${className}__btn-icon`">
+            mdi-alert
+          </v-icon>
+          <div :class="`${className}__btn-text`">
+            {{ $t('warning_on_addresses.hide_button') }}
+          </div>
         </v-btn>
       </v-flex>
 
-      <v-flex xs12 :class="`${className}__btn-forget`">
-        <a @click="forget()" class="a-text-active">
+      <v-flex
+        xs12
+        :class="`${className}__btn-forget`"
+      >
+        <a
+          class="a-text-active"
+          @click="forget()"
+        >
           {{ $t('warning_on_addresses.forget_button') }}
         </a>
       </v-flex>
-
     </v-card>
   </v-dialog>
 </template>
@@ -41,8 +58,29 @@ import { vueBus } from '@/main'
 import DOMPurify from 'dompurify'
 
 export default {
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data: () => ({
+    header: '',
+    content: ''
+  }),
+  computed: {
+    className: () => 'warning-on-addresses-dialog',
+    show: {
+      get () {
+        return this.value
+      },
+      set (value) {
+        this.$emit('input', value)
+      }
+    }
+  },
   created () {
-    var dialog = this
+    const dialog = this
     vueBus.$on('warningOnAddressDialog', function (validateSummary) {
       if (!validateSummary.isAllRight) {
         dialog.header = dialog.$t('warning_on_addresses.warning') + ': ' + dialog.$t('warning_on_addresses.headline')
@@ -51,15 +89,15 @@ export default {
         if (validateSummary.isWrongAddress) {
           contents += '<p style="background-color: darkred;">' + dialog.$t('warning_on_addresses.specifics_wrong_addresses', { crypto: validateSummary.wrongCoin, storedAddress: validateSummary.storedAddress, correctAddress: validateSummary.correctAddress })
           if (validateSummary.wrongCoins.length > 1) {
-            let wrongCoins = validateSummary.wrongCoins.join(', ')
+            const wrongCoins = validateSummary.wrongCoins.join(', ')
             contents += ' ' + dialog.$t('warning_on_addresses.full_list_wrong_addresses', { crypto_list: wrongCoins })
           }
           contents += '</p>'
         } else if (validateSummary.isManyAddresses) {
-          let manyAddresses = validateSummary.manyAddresses.join(', ')
+          const manyAddresses = validateSummary.manyAddresses.join(', ')
           contents += '<p style="background-color: darkred;">' + dialog.$t('warning_on_addresses.specifics_many_addresses', { crypto: validateSummary.manyAddressesCoin, manyAddresses: manyAddresses })
           if (validateSummary.manyAddressesCoins.length > 1) {
-            let wrongCoins = validateSummary.manyAddressesCoins.join(', ')
+            const wrongCoins = validateSummary.manyAddressesCoins.join(', ')
             contents += ' ' + dialog.$t('warning_on_addresses.full_list_many_addresses', { crypto_list: wrongCoins })
           }
           contents += '</p>'
@@ -73,21 +111,6 @@ export default {
       }
     })
   },
-  computed: {
-    className: () => 'warning-on-addresses-dialog',
-    show: {
-      get () {
-        return this.value
-      },
-      set (value) {
-        this.$emit('input', value)
-      }
-    }
-  },
-  data: () => ({
-    header: '',
-    content: ''
-  }),
   methods: {
     hide () {
       this.show = false
@@ -104,12 +127,6 @@ export default {
         this.hide()
       }
     }
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/WarningOnPartnerAddressDialog.vue b/src/components/WarningOnPartnerAddressDialog.vue
index 72ff758e2..b408c31f1 100644
--- a/src/components/WarningOnPartnerAddressDialog.vue
+++ b/src/components/WarningOnPartnerAddressDialog.vue
@@ -10,22 +10,33 @@
         {{ header() }}
       </v-card-title>
 
-      <v-divider class="a-divider"></v-divider>
+      <v-divider class="a-divider" />
 
+      <!-- eslint-disable vue/no-v-html -- Safe with DOMPurify.sanitize() content -->
       <v-card-text>
-        <div :class="`${className}__disclaimer a-text-regular-enlarged`" v-html="content()">
-        </div>
+        <div
+          :class="`${className}__disclaimer a-text-regular-enlarged`"
+          v-html="content()"
+        />
       </v-card-text>
+      <!-- eslint-enable vue/no-v-html -->
 
-      <v-flex xs12 class="text-xs-center">
-        <v-btn :class="[`${className}__btn-hide`, 'a-btn-primary']"
+      <v-flex
+        xs12
+        class="text-xs-center"
+      >
+        <v-btn
+          :class="[`${className}__btn-hide`, 'a-btn-primary']"
           @click="hide()"
         >
-          <v-icon :class="`${className}__btn-icon`">mdi-alert</v-icon>
-          <div :class="`${className}__btn-text`">{{ $t('transfer.warning_on_partner_address.hide_button') }}</div>
+          <v-icon :class="`${className}__btn-icon`">
+            mdi-alert
+          </v-icon>
+          <div :class="`${className}__btn-text`">
+            {{ $t('transfer.warning_on_partner_address.hide_button') }}
+          </div>
         </v-btn>
       </v-flex>
-
     </v-card>
   </v-dialog>
 </template>
@@ -34,6 +45,16 @@
 import DOMPurify from 'dompurify'
 
 export default {
+  props: {
+    value: {
+      type: Boolean,
+      required: true
+    },
+    info: {
+      type: Object,
+      required: true
+    }
+  },
   computed: {
     className: () => 'warning-on-partner-address-dialog',
     show: {
@@ -66,16 +87,6 @@ export default {
         this.hide()
       }
     }
-  },
-  props: {
-    value: {
-      type: Boolean,
-      required: true
-    },
-    info: {
-      type: Object,
-      required: true
-    }
   }
 }
 </script>
diff --git a/src/components/icons/AdmFill.vue b/src/components/icons/AdmFill.vue
index 9055738df..b5acd9c98 100644
--- a/src/components/icons/AdmFill.vue
+++ b/src/components/icons/AdmFill.vue
@@ -1,5 +1,5 @@
 <template>
   <g>
-    <path d="M263.6,16v184.8l40.5,72.7h-98.6l41.5-72.7V16L37.8,379.5c-1.8,3.1-0.6,7,2.6,8.7l210,107.2c1.8,0.9,3.8,0.9,5.6,0l215.5-106.8c3.2-1.6,4.4-5.6,2.6-8.7L263.6,16z M71.2,386.2h60.2l75.8,65.4L71.2,386.2z M141.8,371.3l49.9-81.7L241.5,462L141.8,371.3z M208.2,290.3L364,377.5l-103.8,92.4L208.2,290.3z M380.6,386.2h60.2l-136,65.4L380.6,386.2z"/>
+    <path d="M263.6,16v184.8l40.5,72.7h-98.6l41.5-72.7V16L37.8,379.5c-1.8,3.1-0.6,7,2.6,8.7l210,107.2c1.8,0.9,3.8,0.9,5.6,0l215.5-106.8c3.2-1.6,4.4-5.6,2.6-8.7L263.6,16z M71.2,386.2h60.2l75.8,65.4L71.2,386.2z M141.8,371.3l49.9-81.7L241.5,462L141.8,371.3z M208.2,290.3L364,377.5l-103.8,92.4L208.2,290.3z M380.6,386.2h60.2l-136,65.4L380.6,386.2z" />
   </g>
 </template>
diff --git a/src/components/icons/BaseIcon.vue b/src/components/icons/BaseIcon.vue
index 20126a907..090db18fa 100644
--- a/src/components/icons/BaseIcon.vue
+++ b/src/components/icons/BaseIcon.vue
@@ -1,5 +1,8 @@
 <template>
-  <i class="v-icon" :class="{ 'v-icon--link': isClickable }">
+  <i
+    class="v-icon"
+    :class="{ 'v-icon--link': isClickable }"
+  >
     <svg
       class="svg-icon"
       xmlns="http://www.w3.org/2000/svg"
@@ -13,7 +16,7 @@
     >
       <title v-if="title">{{ title }}</title>
       <g :fill="color">
-        <slot/>
+        <slot />
       </g>
     </svg>
   </i>
@@ -21,20 +24,6 @@
 
 <script>
 export default {
-  created () {
-    // if component has @click attr, make cursor: pointer
-    const listeners = Object.keys(this.$listeners)
-    const hasClickAttr = listeners.some(
-      listener => /^click/.test(listener)
-    )
-
-    if (hasClickAttr) {
-      this.isClickable = true
-    }
-  },
-  data: () => ({
-    isClickable: false
-  }),
   props: {
     width: {
       type: [Number, String],
@@ -59,6 +48,20 @@ export default {
       type: String,
       default: 'auto'
     }
+  },
+  data: () => ({
+    isClickable: false
+  }),
+  created () {
+    // if component has @click attr, make cursor: pointer
+    const listeners = Object.keys(this.$listeners)
+    const hasClickAttr = listeners.some(
+      listener => /^click/.test(listener)
+    )
+
+    if (hasClickAttr) {
+      this.isClickable = true
+    }
   }
 }
 </script>
diff --git a/src/components/icons/BnbFill.vue b/src/components/icons/BnbFill.vue
index b667a2ce7..5486f1069 100644
--- a/src/components/icons/BnbFill.vue
+++ b/src/components/icons/BnbFill.vue
@@ -1,6 +1,6 @@
 <template>
   <g>
-    <path d="M162.7,217.7l93.3-93.3l93.3,93.3l54.2-54.2L255.9,16.1L108.5,163.5L162.7,217.7 M15.9,256.1l54.2-54.2l54.2,54.2l-54.2,54.2L15.9,256.1z M162.7,294.4l93.3,93.3l93.3-93.3l54.2,54.2l0,0L255.9,496.1L108.5,348.6l-0.1-0.1L162.7,294.4M387.5,256.1l54.2-54.2l54.2,54.2l-54.2,54.2L387.5,256.1z"/>
-    <path d="M311.1,256L311.1,256L256,200.9l-40.7,40.7l0,0l-4.7,4.7l-9.6,9.6l-0.1,0.1l0.1,0.1l54.9,54.9L311.1,256L311.1,256L311.1,256"/>
+    <path d="M162.7,217.7l93.3-93.3l93.3,93.3l54.2-54.2L255.9,16.1L108.5,163.5L162.7,217.7 M15.9,256.1l54.2-54.2l54.2,54.2l-54.2,54.2L15.9,256.1z M162.7,294.4l93.3,93.3l93.3-93.3l54.2,54.2l0,0L255.9,496.1L108.5,348.6l-0.1-0.1L162.7,294.4M387.5,256.1l54.2-54.2l54.2,54.2l-54.2,54.2L387.5,256.1z" />
+    <path d="M311.1,256L311.1,256L256,200.9l-40.7,40.7l0,0l-4.7,4.7l-9.6,9.6l-0.1,0.1l0.1,0.1l54.9,54.9L311.1,256L311.1,256L311.1,256" />
   </g>
 </template>
diff --git a/src/components/icons/BnzFill.vue b/src/components/icons/BnzFill.vue
index 931cc6563..8cdd807ad 100644
--- a/src/components/icons/BnzFill.vue
+++ b/src/components/icons/BnzFill.vue
@@ -1,5 +1,5 @@
 <template>
   <g>
-    <path d="m394.34375,248.007736c0,0 29.62619,-22.564117 29.367828,-86.294891c0,0 3.272644,-65.797707 -69.414886,-99.385548c-21.272278,-9.473495 -44.267029,-14.29636 -67.520172,-14.037994l-211.861717,0c-3.10041,-0.172245 -5.770218,2.153069 -6.114708,5.253483l0,402.795685c0.172249,3.100403 2.928169,5.511841 6.028587,5.253479l218.837669,-1.205719c35.654785,0.344482 71.740173,-6.631439 99.730042,-26.009033c26.181305,-18.171906 41.166626,-37.721741 47.02298,-83.280609c0.086121,0 10.076355,-65.88385 -46.075623,-103.088852zm-61.405457,-50.898483l-104.036179,113.423553l104.20845,0l0,44.267029l-181.115982,0l0,-36.774384l106.792099,-114.801483l-106.792099,0l0,-41.68338l181.029831,0l-0.086121,35.568665z"/>
+    <path d="m394.34375,248.007736c0,0 29.62619,-22.564117 29.367828,-86.294891c0,0 3.272644,-65.797707 -69.414886,-99.385548c-21.272278,-9.473495 -44.267029,-14.29636 -67.520172,-14.037994l-211.861717,0c-3.10041,-0.172245 -5.770218,2.153069 -6.114708,5.253483l0,402.795685c0.172249,3.100403 2.928169,5.511841 6.028587,5.253479l218.837669,-1.205719c35.654785,0.344482 71.740173,-6.631439 99.730042,-26.009033c26.181305,-18.171906 41.166626,-37.721741 47.02298,-83.280609c0.086121,0 10.076355,-65.88385 -46.075623,-103.088852zm-61.405457,-50.898483l-104.036179,113.423553l104.20845,0l0,44.267029l-181.115982,0l0,-36.774384l106.792099,-114.801483l-106.792099,0l0,-41.68338l181.029831,0l-0.086121,35.568665z" />
   </g>
 </template>
diff --git a/src/components/icons/BtcFill.vue b/src/components/icons/BtcFill.vue
index 73252a017..2e3fcfe7d 100644
--- a/src/components/icons/BtcFill.vue
+++ b/src/components/icons/BtcFill.vue
@@ -1,7 +1,8 @@
 <template>
   <g>
     <path
+      id="path3713"
       d="M 254.01758 31.763672 C 152.48291 32.527436 60.371006 101.57736 34.681641 204.67773 C 4.2063816 326.8494 78.563911 450.60352 200.70703 481.06445 C 322.90001 511.53256 446.64651 437.17483 477.10742 314.99609 C 507.56836 192.81017 433.21912 69.042991 311.0332 38.582031 C 291.94612 33.822507 272.82029 31.622234 254.01758 31.763672 z M 246.10547 99.84375 L 273.08203 106.57031 L 262.24219 150.0332 C 269.48447 151.68616 276.77295 153.35281 283.86914 155.12109 L 294.63281 111.94531 L 321.625 118.67188 L 310.57031 163.01758 C 344.65204 174.75742 369.57706 192.35553 364.67969 225.0918 C 361.13541 249.05586 347.84961 260.65756 330.21289 264.72461 C 354.43069 277.33322 366.75549 296.66901 355.01562 330.18945 C 340.44653 371.82098 305.83383 375.33374 259.80469 366.62305 L 248.63477 411.39258 L 221.64062 404.66406 L 232.66602 360.49609 C 225.66977 358.75858 218.51956 356.91299 211.1543 354.91406 L 200.0918 399.29102 L 173.12891 392.56445 L 184.29883 347.71094 C 177.99451 346.0964 171.5916 344.38171 165.05664 342.74414 L 129.92969 333.98828 L 143.33008 303.08789 C 143.33008 303.08789 163.21831 308.37842 162.94922 307.98633 C 170.59126 309.87762 173.98257 304.89554 175.32031 301.57422 L 192.97266 230.80469 C 193.96445 231.04301 194.92471 231.28876 195.82422 231.51172 C 194.74788 231.08118 193.77101 230.80353 193.01758 230.61133 L 205.61133 180.09375 C 205.94191 174.35835 203.96579 167.12383 193.0332 164.39453 C 193.45605 164.11006 173.42773 159.51953 173.42773 159.51953 L 180.60938 130.68945 L 217.83594 139.98438 L 217.80469 140.12305 C 223.40169 141.5146 229.16725 142.83608 235.04102 144.17383 L 246.10547 99.84375 z M 254.96875 181.91602 L 241.53125 235.80859 C 256.76924 239.60657 303.74222 255.09874 311.35352 224.60742 C 319.28006 192.80141 270.20673 185.71399 254.96875 181.91602 z M 234.75 263.00977 L 219.92578 322.43164 C 238.22366 326.97534 294.66415 345.09665 303.00586 311.57617 C 311.72424 276.61801 253.04788 267.57654 234.75 263.00977 z "
-      id="path3713" />
- </g>
+    />
+  </g>
 </template>
diff --git a/src/components/icons/CdlFill.vue b/src/components/icons/CdlFill.vue
index a69614118..60f115e11 100644
--- a/src/components/icons/CdlFill.vue
+++ b/src/components/icons/CdlFill.vue
@@ -1,5 +1,9 @@
 <template>
   <g>
-    <path fill-rule="evenodd" d="M 255.55273 38.513672 C 134.91794 38.513672 37.123047 136.30857 37.123047 256.94336 C 37.123047 377.58025 134.91794 475.37305 255.55273 475.37305 C 376.18753 475.37305 473.98242 377.58025 473.98242 256.94336 C 473.98242 136.30857 376.18753 38.513672 255.55273 38.513672 z M 253.07617 123.29297 C 290.43724 123.29297 324.12338 139.39136 347.86523 165.05664 L 308.51562 204.4082 C 294.81251 189.04595 275.0645 179.32617 253.07617 179.32617 C 211.81371 179.32617 178.24805 213.36761 178.24805 255.20898 C 178.24805 297.04826 211.81372 331.08984 253.07617 331.08984 C 275.0645 331.08984 294.79703 321.35263 308.49805 305.98828 L 347.86328 345.35352 C 324.11933 371.02299 290.43724 387.12305 253.07617 387.12305 C 181.34301 387.12305 122.99023 327.94476 122.99023 255.20898 C 122.99023 182.47111 181.34301 123.29297 253.07617 123.29297 z M 378.83203 195.12305 L 438.7793 255.07227 L 378.83203 315.01953 L 318.88281 255.07227 L 378.83203 195.12305 z " id="path0"/>
+    <path
+      id="path0"
+      fill-rule="evenodd"
+      d="M 255.55273 38.513672 C 134.91794 38.513672 37.123047 136.30857 37.123047 256.94336 C 37.123047 377.58025 134.91794 475.37305 255.55273 475.37305 C 376.18753 475.37305 473.98242 377.58025 473.98242 256.94336 C 473.98242 136.30857 376.18753 38.513672 255.55273 38.513672 z M 253.07617 123.29297 C 290.43724 123.29297 324.12338 139.39136 347.86523 165.05664 L 308.51562 204.4082 C 294.81251 189.04595 275.0645 179.32617 253.07617 179.32617 C 211.81371 179.32617 178.24805 213.36761 178.24805 255.20898 C 178.24805 297.04826 211.81372 331.08984 253.07617 331.08984 C 275.0645 331.08984 294.79703 321.35263 308.49805 305.98828 L 347.86328 345.35352 C 324.11933 371.02299 290.43724 387.12305 253.07617 387.12305 C 181.34301 387.12305 122.99023 327.94476 122.99023 255.20898 C 122.99023 182.47111 181.34301 123.29297 253.07617 123.29297 z M 378.83203 195.12305 L 438.7793 255.07227 L 378.83203 315.01953 L 318.88281 255.07227 L 378.83203 195.12305 z "
+    />
   </g>
 </template>
diff --git a/src/components/icons/CryptoIcon.vue b/src/components/icons/CryptoIcon.vue
index 1b50c68dc..fd4a0fc80 100644
--- a/src/components/icons/CryptoIcon.vue
+++ b/src/components/icons/CryptoIcon.vue
@@ -1,6 +1,10 @@
 <template>
-  <icon :width="sizePx" :height="sizePx" :color="fill">
-    <component :is="componentName"/>
+  <icon
+    :width="sizePx"
+    :height="sizePx"
+    :color="fill"
+  >
+    <component :is="componentName" />
   </icon>
 </template>
 
diff --git a/src/components/icons/DashFill.vue b/src/components/icons/DashFill.vue
index a7f2882b4..07ee7f593 100644
--- a/src/components/icons/DashFill.vue
+++ b/src/components/icons/DashFill.vue
@@ -1,6 +1,6 @@
 <template>
   <g>
-    <path d="M330.4,61.2H155.6l-14.5,81l157.7,0.2c77.7,0,100.6,28.2,100,75c-0.3,24-10.7,64.5-15.2,77.7c-12,35-36.6,75-128.7,74.9l-153.3-0.1l-14.5,81h174.4c61.5,0,87.7-7.2,115.4-20c61.4-28.4,98-89,112.6-168.1C511.2,145,484.1,61.2,330.4,61.2z"/>
-    <path d="M80.2,215.3c-45.8,0-52.3,29.8-56.7,47.9c-5.7,23.6-7.5,33.2-7.5,33.2h179c45.8,0,52.3-29.8,56.7-47.9c5.7-23.6,7.5-33.2,7.5-33.2H80.2z"/>
+    <path d="M330.4,61.2H155.6l-14.5,81l157.7,0.2c77.7,0,100.6,28.2,100,75c-0.3,24-10.7,64.5-15.2,77.7c-12,35-36.6,75-128.7,74.9l-153.3-0.1l-14.5,81h174.4c61.5,0,87.7-7.2,115.4-20c61.4-28.4,98-89,112.6-168.1C511.2,145,484.1,61.2,330.4,61.2z" />
+    <path d="M80.2,215.3c-45.8,0-52.3,29.8-56.7,47.9c-5.7,23.6-7.5,33.2-7.5,33.2h179c45.8,0,52.3-29.8,56.7-47.9c5.7-23.6,7.5-33.2,7.5-33.2H80.2z" />
   </g>
 </template>
diff --git a/src/components/icons/DogeFill.vue b/src/components/icons/DogeFill.vue
index c0cf51ae4..0b6809abe 100644
--- a/src/components/icons/DogeFill.vue
+++ b/src/components/icons/DogeFill.vue
@@ -1,10 +1,15 @@
 <template>
   <g>
     <g id="path3759">
-      <path d="m245.999176,474.609467c-24.72522,0 -50.352844,-1.353577 -76.521866,-2.616882c-7.760468,-0.451202 -15.611191,-0.812164 -23.461884,-1.173126l-40.426643,-1.894989l0,-425.11145l41.238777,-1.173092c99.622803,-2.797379 202.494186,-5.684998 267.736282,58.384014c38.351166,37.629272 56.669495,91.411148 56.037842,164.413742l0,1.804749c-3.699768,73.453766 -24.003326,125.88208 -61.993561,160.082306c-42.953308,38.712128 -99.803253,47.284729 -162.608948,47.284729zm-55.586624,-86.5383c70.295456,3.519287 130.123245,4.421661 161.345596,-23.732574c20.303589,-18.318359 31.402863,-51.165009 34.019775,-100.525208c0.360931,-48.367599 -9.655457,-81.845901 -30.590698,-102.329941c-33.02713,-32.395462 -97.09613,-36.09523 -164.864929,-35.102608l0,261.690331l0.090256,0z"/>
+      <path d="m245.999176,474.609467c-24.72522,0 -50.352844,-1.353577 -76.521866,-2.616882c-7.760468,-0.451202 -15.611191,-0.812164 -23.461884,-1.173126l-40.426643,-1.894989l0,-425.11145l41.238777,-1.173092c99.622803,-2.797379 202.494186,-5.684998 267.736282,58.384014c38.351166,37.629272 56.669495,91.411148 56.037842,164.413742l0,1.804749c-3.699768,73.453766 -24.003326,125.88208 -61.993561,160.082306c-42.953308,38.712128 -99.803253,47.284729 -162.608948,47.284729zm-55.586624,-86.5383c70.295456,3.519287 130.123245,4.421661 161.345596,-23.732574c20.303589,-18.318359 31.402863,-51.165009 34.019775,-100.525208c0.360931,-48.367599 -9.655457,-81.845901 -30.590698,-102.329941c-33.02713,-32.395462 -97.09613,-36.09523 -164.864929,-35.102608l0,261.690331l0.090256,0z" />
     </g>
     <g id="rect2987">
-      <rect height="78.326625" width="224.15131" y="219.506499" x="45.4"/>
+      <rect
+        height="78.326625"
+        width="224.15131"
+        y="219.506499"
+        x="45.4"
+      />
     </g>
   </g>
 </template>
diff --git a/src/components/icons/EthFill.vue b/src/components/icons/EthFill.vue
index 945e73bc5..312dc4827 100644
--- a/src/components/icons/EthFill.vue
+++ b/src/components/icons/EthFill.vue
@@ -1,24 +1,24 @@
 <template>
   <g>
     <g>
-      <polyline points="256,16.8 399.2,243 256,172.2 256,16.8"/>
-      <path d="M399.9,243.6l-144.1-71.2V16l0.5,0.7L399.9,243.6z M256.2,172.1l142.3,70.3L256.2,17.7V172.1z"/>
+      <polyline points="256,16.8 399.2,243 256,172.2 256,16.8" />
+      <path d="M399.9,243.6l-144.1-71.2V16l0.5,0.7L399.9,243.6z M256.2,172.1l142.3,70.3L256.2,17.7V172.1z" />
     </g>
     <g>
-      <polyline points="256,16.8 256,172.2 112.8,243 256,16.8"/>
-      <path d="M112.1,243.6l0.5-0.7L256.2,16v156.4l-0.1,0.1L112.1,243.6z M255.8,17.7L113.4,242.4l142.3-70.3V17.7z"/>
+      <polyline points="256,16.8 256,172.2 112.8,243 256,16.8" />
+      <path d="M112.1,243.6l0.5-0.7L256.2,16v156.4l-0.1,0.1L112.1,243.6z M255.8,17.7L113.4,242.4l142.3-70.3V17.7z" />
     </g>
     <g>
-      <polyline points="256,495.2 256,339.8 399.2,269 256,495.2"/>
-      <path d="M255.8,496V339.6l0.1-0.1l144-71.1l-0.5,0.7L255.8,496z M256.2,339.9v154.4l142.3-224.7L256.2,339.9z"/>
+      <polyline points="256,495.2 256,339.8 399.2,269 256,495.2" />
+      <path d="M255.8,496V339.6l0.1-0.1l144-71.1l-0.5,0.7L255.8,496z M256.2,339.9v154.4l142.3-224.7L256.2,339.9z" />
     </g>
     <g>
-      <polyline points="256,495.2 112.8,269 256,339.8 256,495.2"/>
-      <path d="M256.2,496L112.1,268.4l0.8,0.4l143.4,70.8V496z M113.4,269.6l142.3,224.7V339.9L113.4,269.6z"/>
+      <polyline points="256,495.2 112.8,269 256,339.8 256,495.2" />
+      <path d="M256.2,496L112.1,268.4l0.8,0.4l143.4,70.8V496z M113.4,269.6l142.3,224.7V339.9L113.4,269.6z" />
     </g>
     <g>
-      <polygon points="399.2,243 256,313.7 112.8,243 256,172.3"/>
-      <path d="M256,313.9l-0.1-0.1L112.2,243L256,172l0.1,0.1L399.8,243l-0.4,0.2L256,313.9z M113.3,243L256,313.4L398.7,243L256,172.6L113.3,243z"/>
+      <polygon points="399.2,243 256,313.7 112.8,243 256,172.3" />
+      <path d="M256,313.9l-0.1-0.1L112.2,243L256,172l0.1,0.1L399.8,243l-0.4,0.2L256,313.9z M113.3,243L256,313.4L398.7,243L256,172.6L113.3,243z" />
     </g>
   </g>
 </template>
diff --git a/src/components/icons/KcsFill.vue b/src/components/icons/KcsFill.vue
index 041b59b7f..e1296838f 100644
--- a/src/components/icons/KcsFill.vue
+++ b/src/components/icons/KcsFill.vue
@@ -1,11 +1,13 @@
 <template>
   <g>
-    <path d="M442.1,151.4l0-0.8l-0.5-1.1c-0.3-1-0.7-1.9-1.2-2.8c-1.6-3.1-4.1-5.7-7.1-7.5L267.9,41.5l-0.7-1.6l-3.1-0.5
+    <path
+      d="M442.1,151.4l0-0.8l-0.5-1.1c-0.3-1-0.7-1.9-1.2-2.8c-1.6-3.1-4.1-5.7-7.1-7.5L267.9,41.5l-0.7-1.6l-3.1-0.5
       c-3.5-1.4-7.3-1.8-11-1c-0.9,0.2-1.8,0.5-2.7,0.8l-0.5,0.2c0,0,0,0,0,0l-5,2v0.7L78.7,139.2c-1.2,0.7-2.4,1.6-3.4,2.6h-1.9
       l-1.4,3.8l-0.2,0.3l-0.2,0.7l-0.6,0.9l-1.1,0.8v3c-0.4,1.7-0.5,3.3-0.4,5.1l0,0.5l0.1,0.4c0,0.1,0,0.2,0,0.3l0,1.6l0.4,0.8
       c0.4,1.7,1.1,3.2,1.9,4.7l170.6,299.8c1.2,2.2,2.8,4.1,4.7,5.6c1.1,0.9,2.3,1.6,3.6,2.2c2.5,1.2,5.2,1.8,8,1.8c0.2,0,0.3,0,0.5,0
       c2.1-0.1,4.2-0.5,6.1-1.2c3.8-1.5,7-4.1,9.2-7.5c0.2-0.3,0.4-0.7,0.6-1l164.8-299.8c0.7-1.2,1.2-2.4,1.6-3.7c0.3-1,0.5-2,0.7-3
       C442.6,155.6,442.5,153.5,442.1,151.4z M389.4,179.2L264.5,406.5l-56.7-200.4L389.4,179.2z M199.1,312.6l-69.5-122.1l39,14.4
-      L199.1,312.6z M234.6,136.6L264,82.6l91.6,54.1H234.6z M157,136.6l51.5-30.1l-16.4,30.1H157z"/>
+      L199.1,312.6z M234.6,136.6L264,82.6l91.6,54.1H234.6z M157,136.6l51.5-30.1l-16.4,30.1H157z"
+    />
   </g>
 </template>
diff --git a/src/components/icons/LskFill.vue b/src/components/icons/LskFill.vue
index 8444c2450..86db9331c 100644
--- a/src/components/icons/LskFill.vue
+++ b/src/components/icons/LskFill.vue
@@ -1,6 +1,6 @@
 <template>
   <g>
-    <path d="M233.9,50c-11,18.8-20,35-20,36s23.3,41.5,51.5,90.3c94,161.3,101.5,174.8,100.2,178.5c-0.8,1.8-27.7,32.8-59.7,68.8s-58.5,66.5-59,67.8c-0.5,1.3,19.3,2.3,47.5,2.3h48.3l57.5-64.7c31.8-35.8,57.5-66,57.5-67.3c0-3.5-199.7-345.3-201.7-345.5C254.9,16,245.1,31.3,233.9,50z"/>
-    <path d="M125.1,237.3c-39.5,68-71.3,124.8-70.8,126.3c0.5,1.5,26.8,31.8,58.3,67.5l57.5,65h20l20-0.3l31.3-35.2c17.2-19.5,31.7-36.3,32-37.5c0.5-1-15.3-2-35-2h-36.3l-29-32.8c-16-18-29.2-33.8-29.2-35c0-1.2,22-40,48.8-86l48.8-83.8l-20.3-35c-11.3-19.3-21.3-35-22.3-35C197.6,113.5,164.6,169.3,125.1,237.3z"/>
+    <path d="M233.9,50c-11,18.8-20,35-20,36s23.3,41.5,51.5,90.3c94,161.3,101.5,174.8,100.2,178.5c-0.8,1.8-27.7,32.8-59.7,68.8s-58.5,66.5-59,67.8c-0.5,1.3,19.3,2.3,47.5,2.3h48.3l57.5-64.7c31.8-35.8,57.5-66,57.5-67.3c0-3.5-199.7-345.3-201.7-345.5C254.9,16,245.1,31.3,233.9,50z" />
+    <path d="M125.1,237.3c-39.5,68-71.3,124.8-70.8,126.3c0.5,1.5,26.8,31.8,58.3,67.5l57.5,65h20l20-0.3l31.3-35.2c17.2-19.5,31.7-36.3,32-37.5c0.5-1-15.3-2-35-2h-36.3l-29-32.8c-16-18-29.2-33.8-29.2-35c0-1.2,22-40,48.8-86l48.8-83.8l-20.3-35c-11.3-19.3-21.3-35-22.3-35C197.6,113.5,164.6,169.3,125.1,237.3z" />
   </g>
 </template>
diff --git a/src/components/icons/ResFill.vue b/src/components/icons/ResFill.vue
index 78cd89e28..3e4f002d3 100644
--- a/src/components/icons/ResFill.vue
+++ b/src/components/icons/ResFill.vue
@@ -1,5 +1,9 @@
 <template>
   <g>
-    <path fill-rule="evenodd" d="m108.630844,32.695637c-17.101631,3.094212 -29.72084,15.170784 -35.069061,33.554272l-1.06237,3.651657l-0.118492,149.56427l-0.118484,149.564255l1.081215,2.978424c3.024193,8.332001 9.247627,16.103882 15.33506,19.149628c15.449501,7.72879 37.770103,-2.855896 41.765106,-19.805359c0.61264,-2.598724 0.694794,-18.895172 0.700165,-139.036163l0.006744,-136.092728l31.608612,19.557617c17.384399,10.755676 76.148804,47.058105 130.588318,80.671631c54.439514,33.613525 99.009369,61.279648 99.045685,61.481613c0.036377,0.200623 -60.936249,35.256226 -135.494904,77.900574c-74.558594,42.644379 -144.257767,82.514984 -154.886887,88.602417c-20.916214,11.978271 -23.295441,13.678864 -26.331757,18.826477c-5.286278,8.960815 -4.770576,18.405029 1.598274,29.218597c6.169571,10.474274 13.113365,14.827423 23.649567,14.827423c7.513359,0 -2.116669,5.275513 168.304543,-92.186707c161.722992,-92.489685 164.685272,-94.20105 170.468384,-98.509827c28.67868,-21.364563 27.874817,-55.449371 -1.825806,-77.430649c-2.134155,-1.579422 -35.100037,-22.136124 -73.257935,-45.680664c-97.810974,-60.353256 -180.861832,-111.643356 -198.722885,-122.722191c-20.527084,-12.735004 -21.376724,-13.14299 -34.020157,-16.320683c-7.84594,-1.972591 -17.885284,-2.734699 -23.242935,-1.763885" id="path0"/>
+    <path
+      id="path0"
+      fill-rule="evenodd"
+      d="m108.630844,32.695637c-17.101631,3.094212 -29.72084,15.170784 -35.069061,33.554272l-1.06237,3.651657l-0.118492,149.56427l-0.118484,149.564255l1.081215,2.978424c3.024193,8.332001 9.247627,16.103882 15.33506,19.149628c15.449501,7.72879 37.770103,-2.855896 41.765106,-19.805359c0.61264,-2.598724 0.694794,-18.895172 0.700165,-139.036163l0.006744,-136.092728l31.608612,19.557617c17.384399,10.755676 76.148804,47.058105 130.588318,80.671631c54.439514,33.613525 99.009369,61.279648 99.045685,61.481613c0.036377,0.200623 -60.936249,35.256226 -135.494904,77.900574c-74.558594,42.644379 -144.257767,82.514984 -154.886887,88.602417c-20.916214,11.978271 -23.295441,13.678864 -26.331757,18.826477c-5.286278,8.960815 -4.770576,18.405029 1.598274,29.218597c6.169571,10.474274 13.113365,14.827423 23.649567,14.827423c7.513359,0 -2.116669,5.275513 168.304543,-92.186707c161.722992,-92.489685 164.685272,-94.20105 170.468384,-98.509827c28.67868,-21.364563 27.874817,-55.449371 -1.825806,-77.430649c-2.134155,-1.579422 -35.100037,-22.136124 -73.257935,-45.680664c-97.810974,-60.353256 -180.861832,-111.643356 -198.722885,-122.722191c-20.527084,-12.735004 -21.376724,-13.14299 -34.020157,-16.320683c-7.84594,-1.972591 -17.885284,-2.734699 -23.242935,-1.763885"
+    />
   </g>
 </template>
diff --git a/src/components/icons/UnknownCryptoFill.vue b/src/components/icons/UnknownCryptoFill.vue
index 976ce3de8..a95f11f81 100644
--- a/src/components/icons/UnknownCryptoFill.vue
+++ b/src/components/icons/UnknownCryptoFill.vue
@@ -1,7 +1,7 @@
 <template>
   <g>
-    <path d="M459.3,131.4l-197-113.7c-1.9-1.1-4.1-1.7-6.3-1.7s-4.3,0.6-6.3,1.7l-197,113.7c-3.9,2.2-6.3,6.4-6.3,10.8v227.5c0,4.5,2.4,8.6,6.3,10.8l197,113.7c1.9,1.1,4.1,1.7,6.3,1.7s4.3-0.6,6.3-1.7l197-113.7c3.9-2.2,6.3-6.4,6.3-10.8V142.3C465.5,137.8,463.1,133.7,459.3,131.4z M268.5,461.8v-77.6c0-6.9-5.6-12.5-12.5-12.5s-12.5,5.6-12.5,12.5v77.6l-172-99.3V164.9l65.6,37.9c2,1.1,4.1,1.7,6.3,1.7c4.3,0,8.5-2.3,10.9-6.3c3.4-6,1.4-13.6-4.6-17.1l-66.5-38.4L256,43l172.8,99.8l-66.4,38.3c-6,3.4-8,11.1-4.6,17.1c2.3,4,6.5,6.3,10.9,6.3c2.1,0,4.3-0.5,6.3-1.7l65.6-37.8v197.7L268.5,461.8z"/>
-    <path d="M261.8,308h-11.5c-3.5,0-5.8,2.3-5.8,5.8v11.5c0,3.5,2.3,5.8,5.8,5.8h11.5c3.5,0,5.8-2.3,5.8-5.8v-11.5C267.5,310.3,265.2,308,261.8,308z"/>
-    <path d="M256,181c-28.9,0-52,23.1-52,52c0,2.9,0,5.8,0.6,8.7c0.6,3.5,4,5.2,7.5,4.6l11-3.5c2.9-0.6,4.6-3.5,4-6.3c0-1.2,0-2.3,0-3.5c0-16.2,12.7-28.9,28.9-28.9s28.9,12.7,28.9,28.9c0,9.8-5.8,14.4-16.2,23.1c-9.8,8.1-21.4,17.3-24.2,34.1c-0.6,3.5,2.3,6.3,5.8,6.3h11.5c2.9,0,5.2-1.7,5.8-4.6c1.7-6.9,6.9-11.5,15.6-17.9c11-8.7,24.8-19.6,24.8-41C308,204,284.9,181,256,181z"/>
+    <path d="M459.3,131.4l-197-113.7c-1.9-1.1-4.1-1.7-6.3-1.7s-4.3,0.6-6.3,1.7l-197,113.7c-3.9,2.2-6.3,6.4-6.3,10.8v227.5c0,4.5,2.4,8.6,6.3,10.8l197,113.7c1.9,1.1,4.1,1.7,6.3,1.7s4.3-0.6,6.3-1.7l197-113.7c3.9-2.2,6.3-6.4,6.3-10.8V142.3C465.5,137.8,463.1,133.7,459.3,131.4z M268.5,461.8v-77.6c0-6.9-5.6-12.5-12.5-12.5s-12.5,5.6-12.5,12.5v77.6l-172-99.3V164.9l65.6,37.9c2,1.1,4.1,1.7,6.3,1.7c4.3,0,8.5-2.3,10.9-6.3c3.4-6,1.4-13.6-4.6-17.1l-66.5-38.4L256,43l172.8,99.8l-66.4,38.3c-6,3.4-8,11.1-4.6,17.1c2.3,4,6.5,6.3,10.9,6.3c2.1,0,4.3-0.5,6.3-1.7l65.6-37.8v197.7L268.5,461.8z" />
+    <path d="M261.8,308h-11.5c-3.5,0-5.8,2.3-5.8,5.8v11.5c0,3.5,2.3,5.8,5.8,5.8h11.5c3.5,0,5.8-2.3,5.8-5.8v-11.5C267.5,310.3,265.2,308,261.8,308z" />
+    <path d="M256,181c-28.9,0-52,23.1-52,52c0,2.9,0,5.8,0.6,8.7c0.6,3.5,4,5.2,7.5,4.6l11-3.5c2.9-0.6,4.6-3.5,4-6.3c0-1.2,0-2.3,0-3.5c0-16.2,12.7-28.9,28.9-28.9s28.9,12.7,28.9,28.9c0,9.8-5.8,14.4-16.2,23.1c-9.8,8.1-21.4,17.3-24.2,34.1c-0.6,3.5,2.3,6.3,5.8,6.3h11.5c2.9,0,5.2-1.7,5.8-4.6c1.7-6.9,6.9-11.5,15.6-17.9c11-8.7,24.8-19.6,24.8-41C308,204,284.9,181,256,181z" />
   </g>
 </template>
diff --git a/src/components/icons/UsdsFill.vue b/src/components/icons/UsdsFill.vue
index 5ca5f3b92..e937618a6 100644
--- a/src/components/icons/UsdsFill.vue
+++ b/src/components/icons/UsdsFill.vue
@@ -1,11 +1,27 @@
 <template>
   <g id="usds_logo">
-    <path id="XMLID_17_" d="m382.898712,382.975708c-34.168945,34.168884 -79.587463,52.95932 -127.898712,52.95932c-48.311203,0 -93.729736,-18.815125 -127.898674,-52.95932c-21.831543,-21.831573 -37.753967,-48.855225 -46.086067,-78.202972l-53.874218,0c23.092476,106.438049 118.651821,183.478912 227.858959,183.478912c109.207153,0 204.766479,-77.065613 227.858948,-183.478912l-53.874237,0c-8.332001,29.347717 -24.254456,56.371399 -46.085999,78.202972z"/>
-    <path id="XMLID_5_" d="m434.844421,235.767288c0.692291,6.428314 1.013672,12.930817 1.013672,19.309662c0,6.40358 -0.34613,12.881363 -1.013672,19.309677l52.539063,0c0.543945,-6.527222 0.815918,-13.029694 0.815918,-19.309677c0,-6.279953 -0.271973,-12.78244 -0.815918,-19.309662l-52.539063,0z"/>
-    <path id="XMLID_4_" class="st2" d="m74.141899,255.07695c0,-6.378845 0.346138,-12.881348 1.013695,-19.309662l-52.539099,0c-0.543936,6.502487 -0.815903,13.004974 -0.815903,19.309662s0.271967,12.807175 0.815903,19.309677l52.539099,0c-0.667557,-6.428314 -1.013695,-12.930786 -1.013695,-19.309677z"/>
-    <path id="XMLID_3_" d="m127.101311,127.178253c34.168953,-34.144226 79.587456,-52.959412 127.898689,-52.959412c48.311249,0 93.729767,18.815186 127.898712,52.984131c21.831543,21.806824 37.753998,48.83046 46.085999,78.178177l53.874237,0c-23.092468,-106.438026 -118.651794,-183.478886 -227.858948,-183.478886c-109.207138,0 -204.766472,77.040852 -227.858955,183.478886l53.874199,0c8.332085,-29.347717 24.254517,-56.346649 46.086067,-78.202896z"/>
+    <path
+      id="XMLID_17_"
+      d="m382.898712,382.975708c-34.168945,34.168884 -79.587463,52.95932 -127.898712,52.95932c-48.311203,0 -93.729736,-18.815125 -127.898674,-52.95932c-21.831543,-21.831573 -37.753967,-48.855225 -46.086067,-78.202972l-53.874218,0c23.092476,106.438049 118.651821,183.478912 227.858959,183.478912c109.207153,0 204.766479,-77.065613 227.858948,-183.478912l-53.874237,0c-8.332001,29.347717 -24.254456,56.371399 -46.085999,78.202972z"
+    />
+    <path
+      id="XMLID_5_"
+      d="m434.844421,235.767288c0.692291,6.428314 1.013672,12.930817 1.013672,19.309662c0,6.40358 -0.34613,12.881363 -1.013672,19.309677l52.539063,0c0.543945,-6.527222 0.815918,-13.029694 0.815918,-19.309677c0,-6.279953 -0.271973,-12.78244 -0.815918,-19.309662l-52.539063,0z"
+    />
+    <path
+      id="XMLID_4_"
+      class="st2"
+      d="m74.141899,255.07695c0,-6.378845 0.346138,-12.881348 1.013695,-19.309662l-52.539099,0c-0.543936,6.502487 -0.815903,13.004974 -0.815903,19.309662s0.271967,12.807175 0.815903,19.309677l52.539099,0c-0.667557,-6.428314 -1.013695,-12.930786 -1.013695,-19.309677z"
+    />
+    <path
+      id="XMLID_3_"
+      d="m127.101311,127.178253c34.168953,-34.144226 79.587456,-52.959412 127.898689,-52.959412c48.311249,0 93.729767,18.815186 127.898712,52.984131c21.831543,21.806824 37.753998,48.83046 46.085999,78.178177l53.874237,0c-23.092468,-106.438026 -118.651794,-183.478886 -227.858948,-183.478886c-109.207138,0 -204.766472,77.040852 -227.858955,183.478886l53.874199,0c8.332085,-29.347717 24.254517,-56.346649 46.086067,-78.202896z"
+    />
     <g id="XMLID_40_">
-      <path id="XMLID_41_" d="m262.862335,357.707397l-14.537872,0c-3.387238,0 -5.093231,-1.705963 -5.093231,-5.09314l0,-18.64212l-1.705948,0c-12.26326,0 -21.831512,-3.510864 -28.704895,-10.532562c-6.873352,-7.021698 -10.285309,-16.738373 -10.285309,-29.174622l0,-4.598724c0,-3.387238 1.681259,-5.093231 5.093201,-5.093231l20.570602,0c3.387238,0 5.093201,1.705994 5.093201,5.093231l0,1.681213c0,6.131622 1.211517,10.334778 3.63446,12.584656c2.423004,2.249908 6.848663,3.387238 13.326416,3.387238l9.691895,0c6.304718,0 10.680878,-1.211456 13.202759,-3.634491c2.497162,-2.422974 3.758148,-6.947479 3.758148,-13.548889l0,-3.63443c0,-4.030121 -1.211548,-7.170074 -3.634521,-9.444672c-2.422943,-2.249939 -5.241547,-3.782867 -8.480408,-4.598755c-2.892731,-0.642853 -8.604065,-1.359833 -17.059769,-2.175751c-8.480408,-0.815887 -14.80983,-1.804871 -19.012955,-3.016357c-4.203125,-1.211456 -8.480438,-3.263611 -12.831909,-6.18103c-9.049088,-5.810226 -13.548889,-17.18338 -13.548889,-34.144241l0,-8.950195c0,-12.757736 3.436646,-22.548538 10.285278,-29.421875c6.848633,-6.873352 16.515808,-10.285309 28.927414,-10.285309l1.705978,0l0,-19.136581c0,-3.387238 1.705963,-5.093201 5.093201,-5.093201l14.537842,0c3.387268,0 5.093231,1.705963 5.093231,5.093201l0,19.136581l0.494446,0c11.472107,0 20.496429,3.560287 27.12262,10.656158c6.626068,7.095886 9.939087,16.787781 9.939087,29.051025l0,4.598709c0,3.387222 -1.705963,5.093231 -5.093201,5.093231l-20.570587,0c-3.387238,0 -5.093201,-1.706009 -5.093201,-5.093231l0,-1.705948c0,-6.131622 -1.162048,-10.334747 -3.510803,-12.584686c-2.348816,-2.249878 -6.823914,-3.387207 -13.450073,-3.387207l-7.738663,0c-6.626099,0 -11.101196,1.260941 -13.450012,3.758072c-2.348801,2.497162 -3.510834,7.392578 -3.510834,14.661514l0,4.845947c0,3.560303 1.211472,6.329422 3.634445,8.356812c2.423004,2.027405 5.167389,3.362518 8.233215,4.005341c3.560272,0.642822 9.568283,1.335098 18.048706,2.052124c8.480438,0.71701 14.859283,1.780136 19.136566,3.139969c4.277344,1.359818 8.505188,3.510849 12.708282,6.428299c8.554596,6.131638 12.83194,17.109207 12.83194,32.932755l0,9.197418c0,12.584686 -3.510895,22.375488 -10.532562,29.298309c-7.021698,6.947479 -16.589996,10.408875 -28.704926,10.408875l-0.494446,0l0,18.64212c-0.02475,3.362488 -1.730682,5.068451 -5.11792,5.068451z"/>
+      <path
+        id="XMLID_41_"
+        d="m262.862335,357.707397l-14.537872,0c-3.387238,0 -5.093231,-1.705963 -5.093231,-5.09314l0,-18.64212l-1.705948,0c-12.26326,0 -21.831512,-3.510864 -28.704895,-10.532562c-6.873352,-7.021698 -10.285309,-16.738373 -10.285309,-29.174622l0,-4.598724c0,-3.387238 1.681259,-5.093231 5.093201,-5.093231l20.570602,0c3.387238,0 5.093201,1.705994 5.093201,5.093231l0,1.681213c0,6.131622 1.211517,10.334778 3.63446,12.584656c2.423004,2.249908 6.848663,3.387238 13.326416,3.387238l9.691895,0c6.304718,0 10.680878,-1.211456 13.202759,-3.634491c2.497162,-2.422974 3.758148,-6.947479 3.758148,-13.548889l0,-3.63443c0,-4.030121 -1.211548,-7.170074 -3.634521,-9.444672c-2.422943,-2.249939 -5.241547,-3.782867 -8.480408,-4.598755c-2.892731,-0.642853 -8.604065,-1.359833 -17.059769,-2.175751c-8.480408,-0.815887 -14.80983,-1.804871 -19.012955,-3.016357c-4.203125,-1.211456 -8.480438,-3.263611 -12.831909,-6.18103c-9.049088,-5.810226 -13.548889,-17.18338 -13.548889,-34.144241l0,-8.950195c0,-12.757736 3.436646,-22.548538 10.285278,-29.421875c6.848633,-6.873352 16.515808,-10.285309 28.927414,-10.285309l1.705978,0l0,-19.136581c0,-3.387238 1.705963,-5.093201 5.093201,-5.093201l14.537842,0c3.387268,0 5.093231,1.705963 5.093231,5.093201l0,19.136581l0.494446,0c11.472107,0 20.496429,3.560287 27.12262,10.656158c6.626068,7.095886 9.939087,16.787781 9.939087,29.051025l0,4.598709c0,3.387222 -1.705963,5.093231 -5.093201,5.093231l-20.570587,0c-3.387238,0 -5.093201,-1.706009 -5.093201,-5.093231l0,-1.705948c0,-6.131622 -1.162048,-10.334747 -3.510803,-12.584686c-2.348816,-2.249878 -6.823914,-3.387207 -13.450073,-3.387207l-7.738663,0c-6.626099,0 -11.101196,1.260941 -13.450012,3.758072c-2.348801,2.497162 -3.510834,7.392578 -3.510834,14.661514l0,4.845947c0,3.560303 1.211472,6.329422 3.634445,8.356812c2.423004,2.027405 5.167389,3.362518 8.233215,4.005341c3.560272,0.642822 9.568283,1.335098 18.048706,2.052124c8.480438,0.71701 14.859283,1.780136 19.136566,3.139969c4.277344,1.359818 8.505188,3.510849 12.708282,6.428299c8.554596,6.131638 12.83194,17.109207 12.83194,32.932755l0,9.197418c0,12.584686 -3.510895,22.375488 -10.532562,29.298309c-7.021698,6.947479 -16.589996,10.408875 -28.704926,10.408875l-0.494446,0l0,18.64212c-0.02475,3.362488 -1.730682,5.068451 -5.11792,5.068451z"
+      />
     </g>
   </g>
 </template>
diff --git a/src/components/icons/common/Atomars.vue b/src/components/icons/common/Atomars.vue
deleted file mode 100644
index e5e7b6bbc..000000000
--- a/src/components/icons/common/Atomars.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <g>
-    <path fill-rule="evenodd" d="m406.842164,28.551923c-3.861338,0.413763 -11.16889,1.898684 -11.760953,2.390028c-0.336183,0.279018 -1.949043,0.75539 -3.585042,1.057547c-1.634638,0.302156 -3.81234,0.982688 -4.838582,1.512142c-5.227846,2.700351 -9.77516,5.438811 -12.325794,7.424603c-1.562501,1.21543 -4.085914,3.154946 -5.608944,4.31185c-1.52303,1.156904 -3.178084,2.749349 -3.678956,3.538766c-0.500871,0.789417 -2.26481,2.854151 -3.918503,4.588146c-1.655054,1.733995 -4.072303,5.163876 -5.370758,7.621957c-1.298455,2.458081 -2.538384,4.714725 -2.754793,5.014159c-0.400153,0.551231 -2.312447,5.491893 -4.415291,11.408437c-5.50142,15.473935 -2.410444,37.482337 7.68865,54.739265c3.491129,5.965543 16.557342,19.599319 18.784042,19.599319c0.21777,0 0.803028,0.368848 1.302538,0.820721c2.316531,2.097399 13.421451,7.540294 16.58048,8.126912c1.188209,0.220492 2.780653,0.714559 3.538766,1.09974c4.9638,2.511163 28.110051,2.508441 35.14539,-0.004083c1.20318,-0.430096 3.591847,-1.147377 5.308149,-1.595167c1.71494,-0.446429 4.050526,-1.400535 5.189736,-2.119176c1.13921,-0.718642 3.772869,-2.173619 5.852575,-3.231166c3.636763,-1.851047 11.388021,-7.665512 13.70183,-10.278754c0.612479,-0.69142 2.319253,-2.605076 3.793285,-4.251963c3.254304,-3.63404 5.711024,-6.884261 6.587549,-8.710809c0.35796,-0.748585 0.894219,-1.728551 1.18957,-2.177702c6.214617,-9.434895 10.086844,-28.016138 8.453567,-40.55698c-1.626471,-12.485039 -8.0085,-28.150883 -14.08565,-34.571021c-1.559779,-1.648248 -3.549654,-3.943002 -4.422096,-5.098545c-0.871081,-1.155543 -2.860956,-3.115475 -4.422096,-4.355404c-1.56114,-1.239929 -3.410826,-2.709878 -4.109052,-3.266553c-2.169536,-1.728551 -6.564411,-4.472456 -10.120871,-6.316697c-1.872824,-0.9718 -3.527877,-1.965376 -3.677594,-2.207646c-0.149717,-0.242269 -1.312066,-0.60159 -2.583299,-0.798944c-1.271234,-0.197354 -3.670789,-0.813916 -5.332648,-1.36923c-6.221423,-2.082428 -18.364834,-3.17264 -26.105204,-2.343752m-206.609491,83.514877c-3.892643,0.234103 -11.242387,1.166432 -16.332766,2.071539c-9.396785,1.671386 -11.416603,2.121899 -17.648915,3.936197c-1.921822,0.560758 -4.189354,1.018076 -5.038658,1.018076c-0.849304,0 -2.458081,0.489983 -3.575515,1.088851c-1.116072,0.598868 -2.332863,1.088851 -2.701712,1.088851c-0.367487,0 -1.474032,0.34571 -2.45672,0.766279c-0.984049,0.42193 -3.760619,1.510781 -6.172425,2.41861c-5.022326,1.891879 -9.85138,4.230186 -10.326391,4.999187c-0.17966,0.289907 -0.828888,0.526732 -1.444089,0.526732c-0.615201,0 -2.071539,0.489983 -3.235249,1.088851c-6.794431,3.496573 -6.554883,3.357744 -13.833853,8.041165c-0.592063,0.379737 -1.921822,1.077963 -2.956231,1.551613c-1.99532,0.911913 -6.858401,4.472456 -10.91301,7.990806c-1.347453,1.169154 -3.297858,2.561522 -4.334988,3.095059c-3.552377,1.825187 -26.539384,24.504593 -28.481622,28.099163c-0.3076,0.570286 -2.326058,3.242054 -4.483344,5.93696c-2.158647,2.694906 -4.615367,6.124787 -5.461949,7.621957c-0.845221,1.49717 -3.168557,5.294538 -5.161154,8.438596c-3.491129,5.508225 -5.938322,10.210701 -6.799875,13.066213c-0.225937,0.748585 -0.582535,1.48356 -0.792139,1.633277c-0.596146,0.427374 -4.05597,7.966307 -5.995486,13.066213c-0.967716,2.545189 -2.20084,5.730079 -2.741183,7.077532c-0.538981,1.347453 -1.154182,3.616347 -1.365147,5.042742c-0.210965,1.426395 -0.579813,2.713961 -0.817999,2.860956c-0.239547,0.146995 -0.594785,1.307982 -0.792139,2.579216c-0.195993,1.271234 -0.820721,3.781035 -1.389646,5.57764c-1.009909,3.193056 -2.429499,10.742877 -4.026027,21.420423c-1.751689,11.720121 -1.6115,34.400889 0.28174,45.543918c1.401896,8.254852 2.867762,15.540627 3.778313,18.782681c0.547148,1.946321 1.512142,5.621194 2.143676,8.166383c1.450894,5.840325 3.349578,11.92428 4.163494,13.338426c0.344349,0.598868 0.790778,1.796604 0.992216,2.662241c0.201437,0.865637 1.85513,4.663005 3.674872,8.438596c1.819742,3.775591 3.94028,8.212659 4.713364,9.859546c1.886434,4.016499 4.88758,9.195347 6.368418,10.986507c0.662838,0.803028 1.763939,2.640464 2.447193,4.083192c0.681893,1.444089 2.025263,3.604097 2.983452,4.801833c0.958189,1.197736 3.331884,4.31185 5.275483,6.92101c5.642971,7.57432 16.287851,19.053533 24.05272,25.939155c8.062942,7.149668 23.060505,18.044984 28.917162,21.006659c0.898302,0.454595 2.000764,1.079324 2.449915,1.389646c1.528475,1.056186 17.589028,9.257956 18.128009,9.257956c0.29399,0 1.542085,0.453234 2.772487,1.007187c1.230402,0.555314 3.952529,1.56114 6.048568,2.236228c2.096038,0.675088 5.316315,1.811576 7.157835,2.526134c1.840158,0.713197 5.270039,1.770744 7.621957,2.349196c2.350557,0.578452 5.500059,1.41959 6.997229,1.868741c1.49717,0.449151 4.533704,1.088851 6.749516,1.420951c2.214451,0.3321 4.236992,0.733613 4.494233,0.892858c0.740419,0.457317 25.266789,2.373695 30.677018,2.395472c6.612048,0.028582 26.310725,-1.536641 31.032256,-2.464887c2.096038,-0.412402 5.280928,-0.993577 7.077532,-1.29165c4.584063,-0.760835 15.041116,-3.638124 19.044005,-5.238735c1.849686,-0.740419 3.659901,-1.346092 4.021944,-1.346092c0.363404,0 1.621027,-0.489983 2.794264,-1.088851c1.173237,-0.598868 2.572411,-1.097017 3.10867,-1.107906c0.536259,-0.009527 1.954488,-0.491344 3.152224,-1.069796c1.197736,-0.578452 2.591466,-1.060269 3.097781,-1.069796c0.506316,-0.010889 1.084768,-0.283101 1.284844,-0.607034c0.198715,-0.322572 2.479858,-1.565223 5.067241,-2.758876c2.587382,-1.195014 5.195181,-2.441749 5.794049,-2.769765c0.598868,-0.329377 2.664963,-1.41959 4.592229,-2.424055c1.925905,-1.005826 4.253324,-2.394111 5.172043,-3.085532c0.917357,-0.69142 3.383605,-2.29067 5.479643,-3.552377c4.156689,-2.502996 4.586785,-2.803792 12.440123,-8.71217c2.938537,-2.210368 5.47556,-4.36221 5.636165,-4.784139c0.161967,-0.420569 1.024881,-1.143294 1.9191,-1.604694c1.826548,-0.944578 16.306906,-15.235749 18.3975,-18.156592c0.74178,-1.037131 1.966737,-2.50708 2.719406,-3.266553c1.420951,-1.431839 11.42477,-14.564744 11.42477,-14.998923c0,-0.465484 3.444853,-5.979153 4.42618,-7.082976c1.229041,-1.382841 3.003868,-4.590868 6.017263,-10.873539c1.29165,-2.694906 3.304663,-6.735905 4.472456,-8.980299c2.11101,-4.058692 5.230568,-12.079442 6.618853,-17.020103c0.400153,-1.423673 0.858831,-2.803792 1.020798,-3.065116c0.83161,-1.344731 5.430645,-19.399243 5.841686,-22.92712c0.261324,-2.245755 0.871081,-5.920628 1.35562,-8.166383c1.105184,-5.121683 1.320232,-44.461872 0.262685,-48.259241c-0.344349,-1.239929 -0.973161,-4.72153 -1.396451,-7.737648c-1.083407,-7.718593 -7.372883,-30.174785 -10.179396,-36.343127c-0.559397,-1.230402 -1.018076,-2.500274 -1.018076,-2.822846c0,-0.322572 -1.898684,-4.344516 -4.219298,-8.939467c-2.320614,-4.594952 -4.464289,-8.883664 -4.763723,-9.530169c-1.159626,-2.502996 -4.740585,-8.382792 -6.545356,-10.748321c-1.041214,-1.363786 -1.89324,-2.588743 -1.89324,-2.723489c0,-0.249075 -1.996681,-3.335967 -3.683039,-5.696052c-2.535662,-3.548293 -10.525107,-13.25404 -13.699108,-16.64445c-6.912843,-7.38241 -18.505024,-18.027291 -22.360918,-20.533009c-1.646887,-1.069796 -4.193438,-3.013395 -5.657942,-4.317294c-1.465866,-1.303899 -4.20977,-3.228443 -6.100288,-4.276463c-1.889157,-1.048019 -5.834881,-3.405382 -8.769334,-5.237374c-6.059456,-3.78648 -11.548627,-6.737266 -12.532676,-6.738627c-0.366126,-0.001361 -2.268893,-0.865637 -4.226103,-1.923183c-1.95721,-1.056186 -5.576279,-2.684018 -8.043887,-3.616347c-2.466248,-0.932329 -6.07715,-2.298837 -8.023471,-3.035172c-1.946321,-0.736336 -5.498698,-1.818381 -7.89417,-2.403639c-2.395472,-0.585257 -5.702857,-1.411423 -7.349745,-1.834714c-18.873872,-4.848109 -36.795,-6.411972 -58.525745,-5.102628m28.854553,117.157653c1.197736,0.446429 4.015138,1.367869 6.260894,2.045679c6.964564,2.102844 17.480143,7.97039 22.55555,12.587118c6.481386,5.896129 8.109218,7.74037 11.973279,13.576612c2.062012,3.112753 4.200243,6.323503 4.752835,7.134697c0.553953,0.811194 1.013993,1.668664 1.024881,1.905489c0.009527,0.236825 0.491344,1.410062 1.069796,2.607798c0.578452,1.197736 1.060269,2.59691 1.069796,3.110031c0.010889,0.513121 0.476372,2.105566 1.03577,3.538766c3.972945,10.186202 3.891282,30.968286 -0.161967,40.562425c-0.469567,1.11335 -0.854748,2.583299 -0.856109,3.266553c-0.002722,4.72153 -11.650706,21.46806 -19.022228,27.349217c-2.027985,1.618305 -4.028749,3.278803 -4.445234,3.689844c-1.092934,1.076601 -12.779028,8.041165 -13.492226,8.041165c-0.329377,0 -2.132787,0.496788 -4.00425,1.105184c-1.872824,0.607034 -4.507843,1.450894 -5.855297,1.875546c-8.905441,2.806514 -25.196014,2.545189 -35.38766,-0.567564c-2.545189,-0.777167 -5.730079,-1.738079 -7.077532,-2.135509c-6.784903,-2.003486 -17.921128,-9.826881 -24.522287,-17.228346c-2.232145,-2.505719 -4.344516,-4.799111 -4.691587,-5.098545c-0.348432,-0.299434 -1.742162,-2.673129 -3.100503,-5.274122c-1.356981,-2.600993 -3.061033,-5.663387 -3.78648,-6.805319c-5.721912,-9.010243 -7.971751,-35.714315 -3.952529,-46.922676c0.470928,-1.310704 0.854748,-2.723489 0.854748,-3.139974c0,-1.224957 5.870268,-13.06213 7.773036,-15.675372c0.231381,-0.318489 1.181403,-1.754411 2.109649,-3.191695c1.833353,-2.839179 10.141287,-11.190667 14.072039,-14.148259c7.559349,-5.686525 18.187896,-10.310059 30.215617,-13.143793c2.652713,-0.624728 23.442964,0.134745 25.588,0.935051" id="path0"/>
-  </g>
-</template>
diff --git a/src/components/icons/common/Cdl.vue b/src/components/icons/common/Cdl.vue
index a69614118..60f115e11 100644
--- a/src/components/icons/common/Cdl.vue
+++ b/src/components/icons/common/Cdl.vue
@@ -1,5 +1,9 @@
 <template>
   <g>
-    <path fill-rule="evenodd" d="M 255.55273 38.513672 C 134.91794 38.513672 37.123047 136.30857 37.123047 256.94336 C 37.123047 377.58025 134.91794 475.37305 255.55273 475.37305 C 376.18753 475.37305 473.98242 377.58025 473.98242 256.94336 C 473.98242 136.30857 376.18753 38.513672 255.55273 38.513672 z M 253.07617 123.29297 C 290.43724 123.29297 324.12338 139.39136 347.86523 165.05664 L 308.51562 204.4082 C 294.81251 189.04595 275.0645 179.32617 253.07617 179.32617 C 211.81371 179.32617 178.24805 213.36761 178.24805 255.20898 C 178.24805 297.04826 211.81372 331.08984 253.07617 331.08984 C 275.0645 331.08984 294.79703 321.35263 308.49805 305.98828 L 347.86328 345.35352 C 324.11933 371.02299 290.43724 387.12305 253.07617 387.12305 C 181.34301 387.12305 122.99023 327.94476 122.99023 255.20898 C 122.99023 182.47111 181.34301 123.29297 253.07617 123.29297 z M 378.83203 195.12305 L 438.7793 255.07227 L 378.83203 315.01953 L 318.88281 255.07227 L 378.83203 195.12305 z " id="path0"/>
+    <path
+      id="path0"
+      fill-rule="evenodd"
+      d="M 255.55273 38.513672 C 134.91794 38.513672 37.123047 136.30857 37.123047 256.94336 C 37.123047 377.58025 134.91794 475.37305 255.55273 475.37305 C 376.18753 475.37305 473.98242 377.58025 473.98242 256.94336 C 473.98242 136.30857 376.18753 38.513672 255.55273 38.513672 z M 253.07617 123.29297 C 290.43724 123.29297 324.12338 139.39136 347.86523 165.05664 L 308.51562 204.4082 C 294.81251 189.04595 275.0645 179.32617 253.07617 179.32617 C 211.81371 179.32617 178.24805 213.36761 178.24805 255.20898 C 178.24805 297.04826 211.81372 331.08984 253.07617 331.08984 C 275.0645 331.08984 294.79703 321.35263 308.49805 305.98828 L 347.86328 345.35352 C 324.11933 371.02299 290.43724 387.12305 253.07617 387.12305 C 181.34301 387.12305 122.99023 327.94476 122.99023 255.20898 C 122.99023 182.47111 181.34301 123.29297 253.07617 123.29297 z M 378.83203 195.12305 L 438.7793 255.07227 L 378.83203 315.01953 L 318.88281 255.07227 L 378.83203 195.12305 z "
+    />
   </g>
 </template>
diff --git a/src/components/icons/common/Copy.vue b/src/components/icons/common/Copy.vue
index d50627071..c38ff396b 100644
--- a/src/components/icons/common/Copy.vue
+++ b/src/components/icons/common/Copy.vue
@@ -1,7 +1,13 @@
 <template>
   <g>
-    <rect x="160.1" y="160.1" fill="none" width="255.8" height="255.8"/>
-    <path d="M426.5,117.4H149.4c-17.6,0-32,14.4-32,32v277.1c0,17.6,14.4,32,32,32h277.1c17.6,0,32-14.4,32-32V149.4 C458.5,131.8,444.1,117.4,426.5,117.4z M415.9,415.9H160.1V160.1h255.8V415.9z"/>
-    <path d="M330.6,53.5H106.9c-29.4,0-53.4,23.9-53.4,53.3v223.8h42.7V106.8c0-5.8,4.9-10.7,10.7-10.7h223.7V53.5z"/>
+    <rect
+      x="160.1"
+      y="160.1"
+      fill="none"
+      width="255.8"
+      height="255.8"
+    />
+    <path d="M426.5,117.4H149.4c-17.6,0-32,14.4-32,32v277.1c0,17.6,14.4,32,32,32h277.1c17.6,0,32-14.4,32-32V149.4 C458.5,131.8,444.1,117.4,426.5,117.4z M415.9,415.9H160.1V160.1h255.8V415.9z" />
+    <path d="M330.6,53.5H106.9c-29.4,0-53.4,23.9-53.4,53.3v223.8h42.7V106.8c0-5.8,4.9-10.7,10.7-10.7h223.7V53.5z" />
   </g>
 </template>
diff --git a/src/components/icons/common/File.vue b/src/components/icons/common/File.vue
index 79bedff94..2ee6b3609 100644
--- a/src/components/icons/common/File.vue
+++ b/src/components/icons/common/File.vue
@@ -2,53 +2,55 @@
   <g>
     <g>
       <g>
-        <path d="M226,0H15C6.716,0,0,6.716,0,15v211c0,8.284,6.716,15,15,15h211c8.284,0,15-6.716,15-15V15C241,6.716,234.284,0,226,0zM211,211H30V30h181V211z"/>
+        <path d="M226,0H15C6.716,0,0,6.716,0,15v211c0,8.284,6.716,15,15,15h211c8.284,0,15-6.716,15-15V15C241,6.716,234.284,0,226,0zM211,211H30V30h181V211z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M497,0H286c-8.284,0-15,6.716-15,15v211c0,8.284,6.716,15,15,15h211c8.284,0,15-6.716,15-15V15C512,6.716,505.284,0,497,0z M482,211H301V30h181V211z"/>
+        <path d="M497,0H286c-8.284,0-15,6.716-15,15v211c0,8.284,6.716,15,15,15h211c8.284,0,15-6.716,15-15V15C512,6.716,505.284,0,497,0z M482,211H301V30h181V211z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M436,61h-90c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15h90c8.284,0,15-6.716,15-15V76C451,67.716,444.284,61,436,61z M421,151h-60V91h60V151z"/>
+        <path d="M436,61h-90c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15h90c8.284,0,15-6.716,15-15V76C451,67.716,444.284,61,436,61z M421,151h-60V91h60V151z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M166,61H76c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15h90c8.284,0,15-6.716,15-15V76C181,67.716,174.284,61,166,61z M151,151H91V91h60V151z"/>
+        <path d="M166,61H76c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15h90c8.284,0,15-6.716,15-15V76C181,67.716,174.284,61,166,61z M151,151H91V91h60V151z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M166,331H76c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15h90c8.284,0,15-6.716,15-15v-90C181,337.716,174.284,331,166,331z M151,421H91v-60h60V421z"/>
+        <path d="M166,331H76c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15h90c8.284,0,15-6.716,15-15v-90C181,337.716,174.284,331,166,331z M151,421H91v-60h60V421z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M226,271H15c-8.284,0-15,6.716-15,15v211c0,8.284,6.716,15,15,15h211c8.284,0,15-6.716,15-15V286C241,277.716,234.284,271,226,271z M211,482H30V301h181V482z"/>
+        <path d="M226,271H15c-8.284,0-15,6.716-15,15v211c0,8.284,6.716,15,15,15h211c8.284,0,15-6.716,15-15V286C241,277.716,234.284,271,226,271z M211,482H30V301h181V482z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M497,361c-8.284,0-15,6.716-15,15v45h-76c-8.284,0-15,6.716-15,15v46h-90v-46c0-8.284-6.716-15-15-15s-15,6.716-15,15v61
-                    c0,8.284,6.716,15,15,15h120c8.284,0,15-6.716,15-15v-46h76c8.284,0,15-6.716,15-15v-60C512,367.716,505.284,361,497,361z"/>
+        <path
+          d="M497,361c-8.284,0-15,6.716-15,15v45h-76c-8.284,0-15,6.716-15,15v46h-90v-46c0-8.284-6.716-15-15-15s-15,6.716-15,15v61
+                    c0,8.284,6.716,15,15,15h120c8.284,0,15-6.716,15-15v-46h76c8.284,0,15-6.716,15-15v-60C512,367.716,505.284,361,497,361z"
+        />
       </g>
     </g>
     <g>
       <g>
-        <path d="M376,271h-90c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15s15-6.716,15-15v-75h60v15c0,8.284,6.716,15,15,15s15-6.716,15-15v-30C391,277.716,384.284,271,376,271z"/>
+        <path d="M376,271h-90c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15s15-6.716,15-15v-75h60v15c0,8.284,6.716,15,15,15s15-6.716,15-15v-30C391,277.716,384.284,271,376,271z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M497,271h-61c-8.284,0-15,6.716-15,15v75.199l-74.999-0.003c-8.284,0-15,6.515-15,14.799c0,0.001,0,0.002,0,0.003s0,0.002,0,0.003v60c0,8.284,6.716,15,15,15s15-6.716,15-15v-45.004L435.999,391c3.979,0,7.794-1.581,10.607-4.393C449.419,383.794,451,379.979,451,376v-75h46c8.284,0,15-6.716,15-15S505.284,271,497,271z"/>
+        <path d="M497,271h-61c-8.284,0-15,6.716-15,15v75.199l-74.999-0.003c-8.284,0-15,6.515-15,14.799c0,0.001,0,0.002,0,0.003s0,0.002,0,0.003v60c0,8.284,6.716,15,15,15s15-6.716,15-15v-45.004L435.999,391c3.979,0,7.794-1.581,10.607-4.393C449.419,383.794,451,379.979,451,376v-75h46c8.284,0,15-6.716,15-15S505.284,271,497,271z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M497,482h-31c-8.284,0-15,6.716-15,15s6.716,15,15,15h31c8.284,0,15-6.716,15-15S505.284,482,497,482z"/>
+        <path d="M497,482h-31c-8.284,0-15,6.716-15,15s6.716,15,15,15h31c8.284,0,15-6.716,15-15S505.284,482,497,482z" />
       </g>
     </g>
   </g>
diff --git a/src/components/icons/common/Logo.vue b/src/components/icons/common/Logo.vue
index dfe40a2c0..6eacce8a3 100644
--- a/src/components/icons/common/Logo.vue
+++ b/src/components/icons/common/Logo.vue
@@ -1,69 +1,351 @@
 <template>
-  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 96 96" enable-background="new 0 0 96 96" xml:space="preserve">
-      <g id="grad__x28_grey_x29_">
-    <path fill="none" stroke="#CCCBCB" stroke-width="0.5" stroke-miterlimit="10" d="M47.9,94.4"/>
-    <path fill="none" stroke="#CCCBCB" stroke-width="0.5" stroke-miterlimit="10" d="M47.6,93.5"/>
-    <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="176.4175" y1="66.7869" x2="195.6784" y2="100.1478" gradientTransform="matrix(-1 0 0 1 254.7937 0)">
-      <stop  offset="0" style="stop-color:#DDDDDD"/>
-      <stop  offset="1" style="stop-color:#DDDDDD"/>
-    </linearGradient>
-    <polygon fill="url(#SVGID_1_)" points="72,73.6 89.9,73.4 47.6,93.5 47.6,93.5 63.1,80.7 64.9,79.2   "/>
-    <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-2.1588" y1="59.4282" x2="60.2225" y2="23.4123">
-      <stop  offset="0" style="stop-color:#444444"/>
-      <stop  offset="1" style="stop-color:#DDDDDD"/>
-    </linearGradient>
-    <polygon fill="url(#SVGID_2_)" points="47.7,1.8 47.9,17.7 47.9,32.7 42.2,42.6 31.4,60.4 23.7,73.3 5.8,73.3 20.9,47.7   "/>
-    <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="35.2568" y1="23.3867" x2="98.0397" y2="59.6345">
-      <stop  offset="0" style="stop-color:#444444"/>
-      <stop  offset="1" style="stop-color:#DDDDDD"/>
-    </linearGradient>
-    <polygon fill="url(#SVGID_3_)" points="47.8,1.6 47.9,17.7 47.9,32.7 53.7,42.6 64.6,60.8 72,73.6 90.2,73.3 74.9,47.2   "/>
-    <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="55.8235" y1="56.446" x2="39.9857" y2="40.6083">
-      <stop  offset="0" style="stop-color:#DDDDDD"/>
-      <stop  offset="1" style="stop-color:#FFFFFF"/>
-    </linearGradient>
-    <polygon fill="url(#SVGID_4_)" points="47.9,32.7 53.7,42.6 59.7,52.6 47.9,52.6 36.1,52.6 42.2,42.6   "/>
-    <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="26.771" y1="93.5044" x2="26.771" y2="73.299">
-      <stop  offset="0" style="stop-color:#DDDDDD"/>
-      <stop  offset="1" style="stop-color:#EEEEEE"/>
-    </linearGradient>
-    <polygon fill="url(#SVGID_5_)" points="5.9,73.5 24.1,73.3 47.6,93.5 18.6,79.6 14.3,77.5 12.1,76.4   "/>
-    <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="36.1318" y1="73.2909" x2="71.3354" y2="73.2909">
-      <stop  offset="0" style="stop-color:#DDDDDD"/>
-      <stop  offset="1" style="stop-color:#FFFFFF"/>
-    </linearGradient>
-    <polyline fill="url(#SVGID_6_)" points="36.1,53.1 47.6,93.5 71.3,73.5   "/>
-    <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="62.603" y1="78.5017" x2="44.9368" y2="47.9029">
-      <stop  offset="0" style="stop-color:#444444"/>
-      <stop  offset="1" style="stop-color:#DDDDDD"/>
-    </linearGradient>
-    <polygon fill="url(#SVGID_7_)" points="59.5,52.8 53.2,52.8 36,53.1 59.6,66.4 71.6,73.3 62.9,58.4   "/>
-    <linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="24.0462" y1="73.1388" x2="47.0794" y2="73.1388">
-      <stop  offset="5.128205e-03" style="stop-color:#DDDDDD"/>
-      <stop  offset="1" style="stop-color:#FFFFFF"/>
-    </linearGradient>
-    <polyline fill="url(#SVGID_8_)" points="35.9,53.5 24,73.1 47.1,92.8   "/>
-  </g>
-  <g id="mono_mini">
-    <g id="_x32_">
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="47.8" y1="1.6" x2="5.8" y2="73.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="90.2" y1="73.3" x2="47.8" y2="1.6"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="5.8" y1="73.3" x2="23.7" y2="73.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="72" y1="73.4" x2="89.9" y2="73.4"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="47.8" y1="32.3" x2="24" y2="73.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="71.7" y1="73.3" x2="47.8" y2="32.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="5.8" y1="73.3" x2="47.6" y2="93.5"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="47.9" y1="93.5" x2="90.2" y2="73.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="47.8" y1="32.3" x2="47.8" y2="1.6"/>
-      <path fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" d="M24,73.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="47.7" y1="93.6" x2="23.7" y2="73.3"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="72" y1="73.4" x2="47.7" y2="93.6"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="35.9" y1="52.8" x2="59.4" y2="52.8"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="35.9" y1="52.8" x2="71.7" y2="73.4"/>
-      <line fill="#FFFFFF" stroke="#666666" stroke-linecap="round" stroke-miterlimit="10" x1="47.7" y1="93.6" x2="35.9" y2="52.8"/>
+  <svg
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    x="0px"
+    y="0px"
+    viewBox="0 0 96 96"
+    enable-background="new 0 0 96 96"
+    xml:space="preserve"
+  >
+    <g id="grad__x28_grey_x29_">
+      <path
+        fill="none"
+        stroke="#CCCBCB"
+        stroke-width="0.5"
+        stroke-miterlimit="10"
+        d="M47.9,94.4"
+      />
+      <path
+        fill="none"
+        stroke="#CCCBCB"
+        stroke-width="0.5"
+        stroke-miterlimit="10"
+        d="M47.6,93.5"
+      />
+      <linearGradient
+        id="SVGID_1_"
+        gradientUnits="userSpaceOnUse"
+        x1="176.4175"
+        y1="66.7869"
+        x2="195.6784"
+        y2="100.1478"
+        gradientTransform="matrix(-1 0 0 1 254.7937 0)"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#DDDDDD"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#DDDDDD"
+        />
+      </linearGradient>
+      <polygon
+        fill="url(#SVGID_1_)"
+        points="72,73.6 89.9,73.4 47.6,93.5 47.6,93.5 63.1,80.7 64.9,79.2   "
+      />
+      <linearGradient
+        id="SVGID_2_"
+        gradientUnits="userSpaceOnUse"
+        x1="-2.1588"
+        y1="59.4282"
+        x2="60.2225"
+        y2="23.4123"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#444444"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#DDDDDD"
+        />
+      </linearGradient>
+      <polygon
+        fill="url(#SVGID_2_)"
+        points="47.7,1.8 47.9,17.7 47.9,32.7 42.2,42.6 31.4,60.4 23.7,73.3 5.8,73.3 20.9,47.7   "
+      />
+      <linearGradient
+        id="SVGID_3_"
+        gradientUnits="userSpaceOnUse"
+        x1="35.2568"
+        y1="23.3867"
+        x2="98.0397"
+        y2="59.6345"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#444444"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#DDDDDD"
+        />
+      </linearGradient>
+      <polygon
+        fill="url(#SVGID_3_)"
+        points="47.8,1.6 47.9,17.7 47.9,32.7 53.7,42.6 64.6,60.8 72,73.6 90.2,73.3 74.9,47.2   "
+      />
+      <linearGradient
+        id="SVGID_4_"
+        gradientUnits="userSpaceOnUse"
+        x1="55.8235"
+        y1="56.446"
+        x2="39.9857"
+        y2="40.6083"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#DDDDDD"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#FFFFFF"
+        />
+      </linearGradient>
+      <polygon
+        fill="url(#SVGID_4_)"
+        points="47.9,32.7 53.7,42.6 59.7,52.6 47.9,52.6 36.1,52.6 42.2,42.6   "
+      />
+      <linearGradient
+        id="SVGID_5_"
+        gradientUnits="userSpaceOnUse"
+        x1="26.771"
+        y1="93.5044"
+        x2="26.771"
+        y2="73.299"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#DDDDDD"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#EEEEEE"
+        />
+      </linearGradient>
+      <polygon
+        fill="url(#SVGID_5_)"
+        points="5.9,73.5 24.1,73.3 47.6,93.5 18.6,79.6 14.3,77.5 12.1,76.4   "
+      />
+      <linearGradient
+        id="SVGID_6_"
+        gradientUnits="userSpaceOnUse"
+        x1="36.1318"
+        y1="73.2909"
+        x2="71.3354"
+        y2="73.2909"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#DDDDDD"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#FFFFFF"
+        />
+      </linearGradient>
+      <polyline
+        fill="url(#SVGID_6_)"
+        points="36.1,53.1 47.6,93.5 71.3,73.5   "
+      />
+      <linearGradient
+        id="SVGID_7_"
+        gradientUnits="userSpaceOnUse"
+        x1="62.603"
+        y1="78.5017"
+        x2="44.9368"
+        y2="47.9029"
+      >
+        <stop
+          offset="0"
+          style="stop-color:#444444"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#DDDDDD"
+        />
+      </linearGradient>
+      <polygon
+        fill="url(#SVGID_7_)"
+        points="59.5,52.8 53.2,52.8 36,53.1 59.6,66.4 71.6,73.3 62.9,58.4   "
+      />
+      <linearGradient
+        id="SVGID_8_"
+        gradientUnits="userSpaceOnUse"
+        x1="24.0462"
+        y1="73.1388"
+        x2="47.0794"
+        y2="73.1388"
+      >
+        <stop
+          offset="5.128205e-03"
+          style="stop-color:#DDDDDD"
+        />
+        <stop
+          offset="1"
+          style="stop-color:#FFFFFF"
+        />
+      </linearGradient>
+      <polyline
+        fill="url(#SVGID_8_)"
+        points="35.9,53.5 24,73.1 47.1,92.8   "
+      />
     </g>
-  </g>
-</svg>
+    <g id="mono_mini">
+      <g id="_x32_">
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="47.8"
+          y1="1.6"
+          x2="5.8"
+          y2="73.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="90.2"
+          y1="73.3"
+          x2="47.8"
+          y2="1.6"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="5.8"
+          y1="73.3"
+          x2="23.7"
+          y2="73.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="72"
+          y1="73.4"
+          x2="89.9"
+          y2="73.4"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="47.8"
+          y1="32.3"
+          x2="24"
+          y2="73.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="71.7"
+          y1="73.3"
+          x2="47.8"
+          y2="32.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="5.8"
+          y1="73.3"
+          x2="47.6"
+          y2="93.5"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="47.9"
+          y1="93.5"
+          x2="90.2"
+          y2="73.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="47.8"
+          y1="32.3"
+          x2="47.8"
+          y2="1.6"
+        />
+        <path
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          d="M24,73.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="47.7"
+          y1="93.6"
+          x2="23.7"
+          y2="73.3"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="72"
+          y1="73.4"
+          x2="47.7"
+          y2="93.6"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="35.9"
+          y1="52.8"
+          x2="59.4"
+          y2="52.8"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="35.9"
+          y1="52.8"
+          x2="71.7"
+          y2="73.4"
+        />
+        <line
+          fill="#FFFFFF"
+          stroke="#666666"
+          stroke-linecap="round"
+          stroke-miterlimit="10"
+          x1="47.7"
+          y1="93.6"
+          x2="35.9"
+          y2="52.8"
+        />
+      </g>
+    </g>
+  </svg>
 </template>
 
 <style lang="stylus" scoped>
diff --git a/src/components/icons/common/QrCode.vue b/src/components/icons/common/QrCode.vue
index c39ef94a9..2c9e96ee0 100644
--- a/src/components/icons/common/QrCode.vue
+++ b/src/components/icons/common/QrCode.vue
@@ -1,23 +1,97 @@
 <template>
   <g>
-    <rect x="98.5" y="368.5" fill="none" width="45" height="45"/>
-    <rect x="368.5" y="98.5" fill="none" width="45" height="45"/>
-    <rect x="98.5" y="98.5" fill="none" width="45" height="45"/>
-    <rect x="323.6" y="368.5" fill="none" width="89.9" height="45"/>
-    <rect x="413.6" y="368.5" width="45" height="45"/>
-    <rect x="233.6" y="323.5" width="45" height="45"/>
-    <polygon points="323.5,413.5 323.5,458.5 413.5,458.5 413.5,413.5 323.6,413.5"/>
-    <rect x="233.6" y="413.5" width="45" height="45"/>
-    <rect x="278.6" y="368.5" width="45" height="45"/>
-    <rect x="323.5" y="368.5" width="0" height="45"/>
-    <polygon points="458.5,278.5 458.5,233.5 368.6,233.5 368.6,323.5 323.5,323.5 323.5,368.5 323.6,368.5 413.5,368.5 413.6,368.5 413.6,278.5"/>
-    <path d="M53.5,458.5h135v-135h-135V458.5z M98.5,368.5h45v45h-45V368.5z"/>
-    <path d="M458.4,53.5h-135v135h135V53.5z M413.5,143.5L413.5,143.5h-45v-45h45h0V143.5z"/>
-    <rect x="413.5" y="98.5" width="0" height="45"/>
-    <path d="M53.5,188.5h135v-135h-135V188.5z M98.5,98.5h45v45h-45V98.5z"/>
-    <rect x="231.7" y="94.2" width="45" height="45"/>
-    <rect x="98" y="233.7" width="89.9" height="45"/>
-    <rect x="231.3" y="188.9" width="45" height="90"/>
-    <rect x="301" y="233.8" width="45" height="45"/>
+    <rect
+      x="98.5"
+      y="368.5"
+      fill="none"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="368.5"
+      y="98.5"
+      fill="none"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="98.5"
+      y="98.5"
+      fill="none"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="323.6"
+      y="368.5"
+      fill="none"
+      width="89.9"
+      height="45"
+    />
+    <rect
+      x="413.6"
+      y="368.5"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="233.6"
+      y="323.5"
+      width="45"
+      height="45"
+    />
+    <polygon points="323.5,413.5 323.5,458.5 413.5,458.5 413.5,413.5 323.6,413.5" />
+    <rect
+      x="233.6"
+      y="413.5"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="278.6"
+      y="368.5"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="323.5"
+      y="368.5"
+      width="0"
+      height="45"
+    />
+    <polygon points="458.5,278.5 458.5,233.5 368.6,233.5 368.6,323.5 323.5,323.5 323.5,368.5 323.6,368.5 413.5,368.5 413.6,368.5 413.6,278.5" />
+    <path d="M53.5,458.5h135v-135h-135V458.5z M98.5,368.5h45v45h-45V368.5z" />
+    <path d="M458.4,53.5h-135v135h135V53.5z M413.5,143.5L413.5,143.5h-45v-45h45h0V143.5z" />
+    <rect
+      x="413.5"
+      y="98.5"
+      width="0"
+      height="45"
+    />
+    <path d="M53.5,188.5h135v-135h-135V188.5z M98.5,98.5h45v45h-45V98.5z" />
+    <rect
+      x="231.7"
+      y="94.2"
+      width="45"
+      height="45"
+    />
+    <rect
+      x="98"
+      y="233.7"
+      width="89.9"
+      height="45"
+    />
+    <rect
+      x="231.3"
+      y="188.9"
+      width="45"
+      height="90"
+    />
+    <rect
+      x="301"
+      y="233.8"
+      width="45"
+      height="45"
+    />
   </g>
 </template>
diff --git a/src/components/icons/common/QrCodeScan.vue b/src/components/icons/common/QrCodeScan.vue
index ea7f6dd86..8588b0821 100644
--- a/src/components/icons/common/QrCodeScan.vue
+++ b/src/components/icons/common/QrCodeScan.vue
@@ -3,61 +3,61 @@
     <g>
       <g>
         <g>
-          <path d="M256,0C114.6,0,0,114.6,0,256s114.6,256,256,256s256-114.6,256-256C511.8,114.7,397.3,0.2,256,0z M256,496C123.5,496,16,388.5,16,256S123.5,16,256,16s240,107.5,240,240C495.9,388.5,388.5,495.9,256,496z"/>
-          <path d="M256,32C132.3,32,32,132.3,32,256s100.3,224,224,224s224-100.3,224-224C479.9,132.3,379.7,32.1,256,32z M256,464c-114.9,0-208-93.1-208-208S141.1,48,256,48s208,93.1,208,208C463.9,370.8,370.8,463.9,256,464z"/>
-          <path d="M86.2,302.6C86.2,302.6,86.2,302.6,86.2,302.6C82.1,287.4,80,271.7,80,256c0-4.4-3.6-8-8-8s-8,3.6-8,8c0,17.2,2.3,34.2,6.8,50.8c1,3.5,4.1,5.9,7.7,5.9c0.7,0,1.4-0.1,2.1-0.3C84.9,311.2,87.4,306.8,86.2,302.6z"/>
-          <path d="M256,432c-66.9,0.2-128-37.7-157.6-97.6c-2-4-6.8-5.6-10.7-3.6s-5.6,6.8-3.6,10.7c32.3,65.4,99,106.7,171.9,106.5c4.4,0,8-3.6,8-8S260.4,432,256,432z"/>
+          <path d="M256,0C114.6,0,0,114.6,0,256s114.6,256,256,256s256-114.6,256-256C511.8,114.7,397.3,0.2,256,0z M256,496C123.5,496,16,388.5,16,256S123.5,16,256,16s240,107.5,240,240C495.9,388.5,388.5,495.9,256,496z" />
+          <path d="M256,32C132.3,32,32,132.3,32,256s100.3,224,224,224s224-100.3,224-224C479.9,132.3,379.7,32.1,256,32z M256,464c-114.9,0-208-93.1-208-208S141.1,48,256,48s208,93.1,208,208C463.9,370.8,370.8,463.9,256,464z" />
+          <path d="M86.2,302.6C86.2,302.6,86.2,302.6,86.2,302.6C82.1,287.4,80,271.7,80,256c0-4.4-3.6-8-8-8s-8,3.6-8,8c0,17.2,2.3,34.2,6.8,50.8c1,3.5,4.1,5.9,7.7,5.9c0.7,0,1.4-0.1,2.1-0.3C84.9,311.2,87.4,306.8,86.2,302.6z" />
+          <path d="M256,432c-66.9,0.2-128-37.7-157.6-97.6c-2-4-6.8-5.6-10.7-3.6s-5.6,6.8-3.6,10.7c32.3,65.4,99,106.7,171.9,106.5c4.4,0,8-3.6,8-8S260.4,432,256,432z" />
         </g>
       </g>
     </g>
     <g>
       <g>
-        <path d="M247.3,146.4h-89.5c-3.5,0-6.4,2.8-6.4,6.4v89.5c0,3.5,2.8,6.4,6.4,6.4h89.5c3.5,0,6.4-2.8,6.4-6.4v-89.5C253.6,149.3,250.8,146.4,247.3,146.4z M240.9,235.9h-76.8v-76.8h76.8V235.9z"/>
+        <path d="M247.3,146.4h-89.5c-3.5,0-6.4,2.8-6.4,6.4v89.5c0,3.5,2.8,6.4,6.4,6.4h89.5c3.5,0,6.4-2.8,6.4-6.4v-89.5C253.6,149.3,250.8,146.4,247.3,146.4z M240.9,235.9h-76.8v-76.8h76.8V235.9z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M362.2,146.4h-89.5c-3.5,0-6.4,2.8-6.4,6.4v89.5c0,3.5,2.8,6.4,6.4,6.4h89.5c3.5,0,6.4-2.8,6.4-6.4v-89.5C368.6,149.3,365.7,146.4,362.2,146.4z M355.9,235.9h-76.8v-76.8h76.8V235.9z"/>
+        <path d="M362.2,146.4h-89.5c-3.5,0-6.4,2.8-6.4,6.4v89.5c0,3.5,2.8,6.4,6.4,6.4h89.5c3.5,0,6.4-2.8,6.4-6.4v-89.5C368.6,149.3,365.7,146.4,362.2,146.4z M355.9,235.9h-76.8v-76.8h76.8V235.9z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M336.3,172.3h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4h38.2c3.5,0,6.4-2.8,6.4-6.4v-38.2C342.7,175.1,339.9,172.3,336.3,172.3z M330,210.5h-25.4V185H330V210.5z"/>
+        <path d="M336.3,172.3h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4h38.2c3.5,0,6.4-2.8,6.4-6.4v-38.2C342.7,175.1,339.9,172.3,336.3,172.3z M330,210.5h-25.4V185H330V210.5z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M221.8,172.3h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4h38.2c3.5,0,6.4-2.8,6.4-6.4v-38.2C228.2,175.1,225.3,172.3,221.8,172.3z M215.5,210.5H190V185h25.4V210.5z"/>
+        <path d="M221.8,172.3h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4h38.2c3.5,0,6.4-2.8,6.4-6.4v-38.2C228.2,175.1,225.3,172.3,221.8,172.3z M215.5,210.5H190V185h25.4V210.5z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M221.8,286.8h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4h38.2c3.5,0,6.4-2.8,6.4-6.4v-38.2C228.2,289.7,225.3,286.8,221.8,286.8z M215.5,325H190v-25.4h25.4V325z"/>
+        <path d="M221.8,286.8h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4h38.2c3.5,0,6.4-2.8,6.4-6.4v-38.2C228.2,289.7,225.3,286.8,221.8,286.8z M215.5,325H190v-25.4h25.4V325z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M247.3,261.4h-89.5c-3.5,0-6.4,2.8-6.4,6.4v89.5c0,3.5,2.8,6.4,6.4,6.4h89.5c3.5,0,6.4-2.8,6.4-6.4v-89.5C253.6,264.2,250.8,261.4,247.3,261.4z M240.9,350.9h-76.8v-76.8h76.8V350.9z"/>
+        <path d="M247.3,261.4h-89.5c-3.5,0-6.4,2.8-6.4,6.4v89.5c0,3.5,2.8,6.4,6.4,6.4h89.5c3.5,0,6.4-2.8,6.4-6.4v-89.5C253.6,264.2,250.8,261.4,247.3,261.4z M240.9,350.9h-76.8v-76.8h76.8V350.9z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M362.2,299.5c-3.5,0-6.4,2.8-6.4,6.4V325h-32.2c-3.5,0-6.4,2.8-6.4,6.4v19.5h-38.2v-19.5c0-3.5-2.8-6.4-6.4-6.4s-6.4,2.8-6.4,6.4v25.9c0,3.5,2.8,6.4,6.4,6.4h50.9c3.5,0,6.4-2.8,6.4-6.4v-19.5h32.2c3.5,0,6.4-2.8,6.4-6.4v-25.4C368.6,302.4,365.7,299.5,362.2,299.5z"/>
+        <path d="M362.2,299.5c-3.5,0-6.4,2.8-6.4,6.4V325h-32.2c-3.5,0-6.4,2.8-6.4,6.4v19.5h-38.2v-19.5c0-3.5-2.8-6.4-6.4-6.4s-6.4,2.8-6.4,6.4v25.9c0,3.5,2.8,6.4,6.4,6.4h50.9c3.5,0,6.4-2.8,6.4-6.4v-19.5h32.2c3.5,0,6.4-2.8,6.4-6.4v-25.4C368.6,302.4,365.7,299.5,362.2,299.5z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M310.9,261.4h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4s6.4-2.8,6.4-6.4v-31.8h25.4v6.4c0,3.5,2.8,6.4,6.4,6.4s6.4-2.8,6.4-6.4v-12.7C317.3,264.2,314.4,261.4,310.9,261.4z"/>
+        <path d="M310.9,261.4h-38.2c-3.5,0-6.4,2.8-6.4,6.4v38.2c0,3.5,2.8,6.4,6.4,6.4s6.4-2.8,6.4-6.4v-31.8h25.4v6.4c0,3.5,2.8,6.4,6.4,6.4s6.4-2.8,6.4-6.4v-12.7C317.3,264.2,314.4,261.4,310.9,261.4z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M362.2,261.4h-25.9c-3.5,0-6.4,2.8-6.4,6.4v31.9l-31.8,0c-3.5,0-6.4,2.8-6.4,6.3c0,0,0,0,0,0c0,0,0,0,0,0v25.4c0,3.5,2.8,6.4,6.4,6.4s6.4-2.8,6.4-6.4v-19.1l31.8,0c1.7,0,3.3-0.7,4.5-1.9c1.2-1.2,1.9-2.8,1.9-4.5v-31.8h19.5c3.5,0,6.4-2.8,6.4-6.4S365.7,261.4,362.2,261.4z"/>
+        <path d="M362.2,261.4h-25.9c-3.5,0-6.4,2.8-6.4,6.4v31.9l-31.8,0c-3.5,0-6.4,2.8-6.4,6.3c0,0,0,0,0,0c0,0,0,0,0,0v25.4c0,3.5,2.8,6.4,6.4,6.4s6.4-2.8,6.4-6.4v-19.1l31.8,0c1.7,0,3.3-0.7,4.5-1.9c1.2-1.2,1.9-2.8,1.9-4.5v-31.8h19.5c3.5,0,6.4-2.8,6.4-6.4S365.7,261.4,362.2,261.4z" />
       </g>
     </g>
     <g>
       <g>
-        <path d="M362.2,350.9h-13.1c-3.5,0-6.4,2.8-6.4,6.4s2.8,6.4,6.4,6.4h13.1c3.5,0,6.4-2.8,6.4-6.4S365.7,350.9,362.2,350.9z"/>
+        <path d="M362.2,350.9h-13.1c-3.5,0-6.4,2.8-6.4,6.4s2.8,6.4,6.4,6.4h13.1c3.5,0,6.4-2.8,6.4-6.4S365.7,350.9,362.2,350.9z" />
       </g>
     </g>
   </g>
diff --git a/src/components/icons/common/Save.vue b/src/components/icons/common/Save.vue
index 9b9597a35..a5cfeedc6 100644
--- a/src/components/icons/common/Save.vue
+++ b/src/components/icons/common/Save.vue
@@ -1,7 +1,10 @@
 <template>
   <g>
-    <path fill="none" d="M288,149.4H96.1v266.4h319.7V96.1H288V149.4z M256,373.2L182,256H224v-58.6H288V256H330L256,373.2z"/>
-    <path d="M426.5,53.5H85.5c-17.7,0-32,14.3-32,32v341.1c0,17.7,14.3,32,32,32h341.1c17.7,0,32-14.3,32-32V85.5 C458.5,67.8,444.2,53.5,426.5,53.5z M415.9,415.9H96.1V149.4H288V96.1h127.9V415.9z"/>
-    <polygon points="288,197.4 224,197.4 224,256 182,256 256,373.2 330,256 288,256"/>
+    <path
+      fill="none"
+      d="M288,149.4H96.1v266.4h319.7V96.1H288V149.4z M256,373.2L182,256H224v-58.6H288V256H330L256,373.2z"
+    />
+    <path d="M426.5,53.5H85.5c-17.7,0-32,14.3-32,32v341.1c0,17.7,14.3,32,32,32h341.1c17.7,0,32-14.3,32-32V85.5 C458.5,67.8,444.2,53.5,426.5,53.5z M415.9,415.9H96.1V149.4H288V96.1h127.9V415.9z" />
+    <polygon points="288,197.4 224,197.4 224,256 182,256 256,373.2 330,256 288,256" />
   </g>
 </template>
diff --git a/src/components/transactions/AdmTransaction.vue b/src/components/transactions/AdmTransaction.vue
index 1a2ba9626..722cc2c69 100644
--- a/src/components/transactions/AdmTransaction.vue
+++ b/src/components/transactions/AdmTransaction.vue
@@ -1,16 +1,16 @@
 <template>
   <transaction-template
+    :id="transaction.id || '' "
     :amount="transaction.amount | currency"
     :timestamp="transaction.timestamp || NaN"
-    :id="transaction.id || '' "
     :fee="transaction.fee | currency"
     :confirmations="transaction.confirmations || NaN"
     :sender="sender || '' "
     :recipient="recipient || '' "
-    :explorerLink="explorerLink"
+    :explorer-link="explorerLink"
     :partner="transaction.partner || '' "
-    :status="status || '' "
-    :admTx="admTx"
+    :status="getTransactionStatus(admTx)"
+    :adm-tx="admTx"
     :crypto="crypto"
   />
 </template>
@@ -19,11 +19,17 @@
 import TransactionTemplate from './TransactionTemplate.vue'
 import getExplorerUrl from '../../lib/getExplorerUrl'
 import { Cryptos } from '../../lib/constants'
+
+import transaction from '@/mixins/transaction'
 import partnerName from '@/mixins/partnerName'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  mixins: [partnerName],
-  name: 'adm-transaction',
+  name: 'AdmTransaction',
+  components: {
+    TransactionTemplate
+  },
+  mixins: [transaction, partnerName],
   props: {
     id: {
       required: true,
@@ -34,9 +40,6 @@ export default {
       type: String
     }
   },
-  components: {
-    TransactionTemplate
-  },
   computed: {
     transaction () {
       return this.$store.state.adm.transactions[this.id] || { }
@@ -60,7 +63,7 @@ export default {
   methods: {
     formatAddress (address) {
       let name = ''
-      if (address === this.$store.state.address) {
+      if (isStringEqualCI(address, this.$store.state.address)) {
         name = this.$t('transaction.me')
       } else {
         name = this.getPartnerName(address)
diff --git a/src/components/transactions/BtcTransaction.vue b/src/components/transactions/BtcTransaction.vue
index 83af76378..5ce50cbf8 100644
--- a/src/components/transactions/BtcTransaction.vue
+++ b/src/components/transactions/BtcTransaction.vue
@@ -1,18 +1,17 @@
 <template>
   <div>
     <transaction-template
+      :id="transaction.hash || '' "
       :amount="transaction.amount | currency(crypto)"
       :timestamp="transaction.timestamp || NaN"
-      :id="transaction.hash || '' "
       :fee="fee"
       :confirmations="confirmations || NaN"
       :sender="sender || '' "
       :recipient="recipient || '' "
-      :explorerLink="explorerLink"
+      :explorer-link="explorerLink"
       :partner="partner || '' "
-      :status="status() || '' "
-      :status_inconsistent="inconsistent_reason"
-      :admTx="admTx"
+      :status="getTransactionStatus(admTx, transaction)"
+      :adm-tx="admTx"
       :crypto="crypto"
     />
   </div>
@@ -23,25 +22,17 @@ import TransactionTemplate from './TransactionTemplate.vue'
 import getExplorerUrl from '../../lib/getExplorerUrl'
 import partnerName from '@/mixins/partnerName'
 import { CryptoNaturalUnits } from '@/lib/constants'
-import { TransactionStatus as TS } from '../../lib/constants'
-import { verifyTransactionDetails } from '@/lib/txVerify'
+
+import transaction from '@/mixins/transaction'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  mixins: [partnerName],
-  name: 'btc-transaction',
-  props: ['id', 'crypto'],
+  name: 'BtcTransaction',
   components: {
     TransactionTemplate
   },
-  mounted () {
-    // Not needed, as called from Transaction.vue
-    // this.$store.dispatch(`${this.cryptoKey}/getTransaction`, { hash: this.id })
-  },
-  data () {
-    return {
-      inconsistent_reason: ''
-    }
-  },
+  mixins: [transaction, partnerName],
+  props: ['id', 'crypto'],
   computed: {
     fee () {
       const fee = this.transaction.fee
@@ -61,6 +52,8 @@ export default {
         return this.formatAddress(senderId)
       } else if (senders) {
         return this.formatAddresses(senders)
+      } else {
+        return undefined
       }
     },
     recipient () {
@@ -70,13 +63,16 @@ export default {
         return this.formatAddress(recipientId)
       } else if (recipients) {
         return this.formatAddresses(recipients)
+      } else {
+        return undefined
       }
     },
     partner () {
       if (this.transaction.partner) return this.transaction.partner
 
-      const id = this.transaction.senderId !== this.$store.state[this.cryptoKey].address
-        ? this.transaction.senderId : this.transaction.recipientId
+      const id = !isStringEqualCI(this.transaction.senderId, this.$store.state[this.cryptoKey].address)
+        ? this.transaction.senderId
+        : this.transaction.recipientId
       return this.getAdmAddress(id)
     },
     explorerLink () {
@@ -98,7 +94,7 @@ export default {
       return result
     },
     admTx () {
-      let admTx = {}
+      const admTx = {}
       // Bad news, everyone: we'll have to scan the messages
       Object.values(this.$store.state.chat.chats).some(chat => {
         Object.values(chat.messages).some(msg => {
@@ -112,22 +108,11 @@ export default {
       return admTx
     }
   },
+  mounted () {
+    // Not needed, as called from Transaction.vue
+    // this.$store.dispatch(`${this.cryptoKey}/getTransaction`, { hash: this.id })
+  },
   methods: {
-    status () {
-      let status = this.transaction.status
-      let messageTx = this.admTx
-      if (status === 'SUCCESS' && messageTx && messageTx.id) {
-        const txVerify = verifyTransactionDetails(this.transaction, messageTx, { recipientCryptoAddress: this.transaction.recipientId, senderCryptoAddress: this.transaction.senderId })
-        if (txVerify.isTxConsistent) {
-          status = TS.CONFIRMED
-          this.inconsistent_reason = ''
-        } else {
-          this.inconsistent_reason = this.$t(`transaction.inconsistent_reasons.${txVerify.txInconsistentReason}`, { crypto: this.crypto })
-          status = TS.INVALID
-        }
-      }
-      return status
-    },
     getAdmAddress (address) {
       let admAddress = ''
 
@@ -135,7 +120,7 @@ export default {
       const partners = this.$store.state.partners
       Object.keys(partners).some(uid => {
         const partner = partners[uid]
-        if (partner[this.crypto] === address) {
+        if (isStringEqualCI(partner[this.crypto], address)) {
           admAddress = uid
         }
         return !!admAddress
@@ -146,7 +131,7 @@ export default {
         Object.values(this.$store.state.chat.chats).some(chat => {
           Object.values(chat.messages).some(msg => {
             if (msg.hash && msg.hash === this.id) {
-              admAddress = msg.senderId === this.$store.state.address ? msg.recipientId : msg.senderId
+              admAddress = isStringEqualCI(msg.senderId, this.$store.state.address) ? msg.recipientId : msg.senderId
             }
             return !!admAddress
           })
@@ -158,10 +143,10 @@ export default {
     },
 
     formatAddress (address) {
-      let admAddress = this.getAdmAddress(address)
+      const admAddress = this.getAdmAddress(address)
       let name = ''
 
-      if (address === this.$store.state[this.cryptoKey].address) {
+      if (isStringEqualCI(address, this.$store.state[this.cryptoKey].address)) {
         name = this.$t('transaction.me')
       } else {
         name = this.getPartnerName(admAddress)
diff --git a/src/components/transactions/Erc20Transaction.vue b/src/components/transactions/Erc20Transaction.vue
index 1f6094df7..eaa6de44c 100644
--- a/src/components/transactions/Erc20Transaction.vue
+++ b/src/components/transactions/Erc20Transaction.vue
@@ -1,17 +1,16 @@
 <template>
   <transaction-template
+    :id="transaction.hash || '' "
     :amount="transaction.amount | currency(crypto)"
     :timestamp="transaction.timestamp || NaN"
-    :id="transaction.hash || '' "
     :fee="transaction.fee | currency('ETH')"
     :confirmations="confirmations || NaN"
     :sender="sender || '' "
     :recipient="recipient || '' "
-    :explorerLink="explorerLink"
+    :explorer-link="explorerLink"
     :partner="partner || '' "
-    :status="status() || '' "
-    :status_inconsistent="inconsistent_reason"
-    :admTx="admTx"
+    :status="getTransactionStatus(admTx, transaction)"
+    :adm-tx="admTx"
     :crypto="crypto"
   />
 </template>
@@ -19,13 +18,18 @@
 <script>
 import TransactionTemplate from './TransactionTemplate.vue'
 import getExplorerUrl from '../../lib/getExplorerUrl'
-import { Cryptos, TransactionStatus as TS } from '../../lib/constants'
+import { Cryptos } from '../../lib/constants'
 import partnerName from '@/mixins/partnerName'
-import { verifyTransactionDetails } from '@/lib/txVerify'
+
+import transaction from '@/mixins/transaction'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  mixins: [partnerName],
-  name: 'erc20-transaction',
+  name: 'Erc20Transaction',
+  components: {
+    TransactionTemplate
+  },
+  mixins: [transaction, partnerName],
   props: {
     crypto: {
       required: true,
@@ -36,9 +40,6 @@ export default {
       type: String
     }
   },
-  components: {
-    TransactionTemplate
-  },
   data () {
     return {
       inconsistent_reason: ''
@@ -58,8 +59,9 @@ export default {
     partner () {
       if (this.transaction.partner) return this.transaction.partner
 
-      const id = this.transaction.senderId !== this.$store.state.eth.address
-        ? this.transaction.senderId : this.transaction.recipientId
+      const id = !isStringEqualCI(this.transaction.senderId, this.$store.state.eth.address)
+        ? this.transaction.senderId
+        : this.transaction.recipientId
       return this.getAdmAddress(id)
     },
     explorerLink () {
@@ -70,7 +72,7 @@ export default {
       return Math.max(0, this.$store.state.eth.blockNumber - this.transaction.blockNumber)
     },
     admTx () {
-      let admTx = {}
+      const admTx = {}
       // Bad news, everyone: we'll have to scan the messages
       Object.values(this.$store.state.chat.chats).some(chat => {
         Object.values(chat.messages).some(msg => {
@@ -85,21 +87,6 @@ export default {
     }
   },
   methods: {
-    status () {
-      let status = this.transaction.status
-      let messageTx = this.admTx
-      if (status === 'SUCCESS' && messageTx && messageTx.id) {
-        const txVerify = verifyTransactionDetails(this.transaction, messageTx, { recipientCryptoAddress: this.transaction.recipientId, senderCryptoAddress: this.transaction.senderId })
-        if (txVerify.isTxConsistent) {
-          status = TS.CONFIRMED
-          this.inconsistent_reason = ''
-        } else {
-          this.inconsistent_reason = this.$t(`transaction.inconsistent_reasons.${txVerify.txInconsistentReason}`, { crypto: this.crypto })
-          status = TS.INVALID
-        }
-      }
-      return status
-    },
     getAdmAddress (address) {
       let admAddress = ''
 
@@ -107,7 +94,7 @@ export default {
       const partners = this.$store.state.partners.list
       Object.keys(partners).some(uid => {
         const partner = partners[uid]
-        if (partner[Cryptos.ETH] === address) {
+        if (isStringEqualCI(partner[Cryptos.ETH], address)) {
           admAddress = uid
         }
         return !!admAddress
@@ -118,7 +105,7 @@ export default {
         Object.values(this.$store.state.chat.chats).some(chat => {
           Object.values(chat.messages).some(msg => {
             if (msg.hash && msg.hash === this.id) {
-              admAddress = msg.senderId === this.$store.state.address ? msg.recipientId : msg.senderId
+              admAddress = isStringEqualCI(msg.senderId, this.$store.state.address) ? msg.recipientId : msg.senderId
             }
             return !!admAddress
           })
@@ -130,10 +117,10 @@ export default {
     },
 
     formatAddress (address) {
-      let admAddress = this.getAdmAddress(address)
+      const admAddress = this.getAdmAddress(address)
       let name = ''
 
-      if (address === this.$store.state.eth.address) {
+      if (isStringEqualCI(address, this.$store.state.eth.address)) {
         name = this.$t('transaction.me')
       } else {
         name = this.getPartnerName(admAddress)
diff --git a/src/components/transactions/EthTransaction.vue b/src/components/transactions/EthTransaction.vue
index d8af43363..f81b79e43 100644
--- a/src/components/transactions/EthTransaction.vue
+++ b/src/components/transactions/EthTransaction.vue
@@ -1,17 +1,16 @@
 <template>
   <transaction-template
+    :id="transaction.hash || '' "
     :amount="transaction.amount | currency(crypto)"
     :timestamp="transaction.timestamp || NaN"
-    :id="transaction.hash || '' "
     :fee="transaction.fee | currency(crypto)"
     :confirmations="confirmations || NaN"
     :sender="sender || '' "
     :recipient="recipient || '' "
-    :explorerLink="explorerLink"
+    :explorer-link="explorerLink"
     :partner="partner || '' "
-    :status="status() || '' "
-    :status_inconsistent="inconsistent_reason"
-    :admTx="admTx"
+    :status="getTransactionStatus(admTx, transaction)"
+    :adm-tx="admTx"
     :crypto="crypto"
   />
 </template>
@@ -19,13 +18,18 @@
 <script>
 import TransactionTemplate from './TransactionTemplate.vue'
 import getExplorerUrl from '../../lib/getExplorerUrl'
-import { Cryptos, TransactionStatus as TS } from '../../lib/constants'
+import { Cryptos } from '../../lib/constants'
 import partnerName from '@/mixins/partnerName'
-import { verifyTransactionDetails } from '@/lib/txVerify'
+
+import transaction from '@/mixins/transaction'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  mixins: [partnerName],
-  name: 'eth-transaction',
+  name: 'EthTransaction',
+  components: {
+    TransactionTemplate
+  },
+  mixins: [transaction, partnerName],
   props: {
     id: {
       required: true,
@@ -36,9 +40,6 @@ export default {
       type: String
     }
   },
-  components: {
-    TransactionTemplate
-  },
   data () {
     return {
       inconsistent_reason: ''
@@ -57,8 +58,9 @@ export default {
     partner () {
       if (this.transaction.partner) return this.transaction.partner
 
-      const id = this.transaction.senderId !== this.$store.state.eth.address
-        ? this.transaction.senderId : this.transaction.recipientId
+      const id = !isStringEqualCI(this.transaction.senderId, this.$store.state.eth.address)
+        ? this.transaction.senderId
+        : this.transaction.recipientId
       return this.getAdmAddress(id)
     },
     explorerLink () {
@@ -69,7 +71,7 @@ export default {
       return Math.max(0, this.$store.state.eth.blockNumber - this.transaction.blockNumber)
     },
     admTx () {
-      let admTx = {}
+      const admTx = {}
       // Bad news, everyone: we'll have to scan the messages
       Object.values(this.$store.state.chat.chats).some(chat => {
         Object.values(chat.messages).some(msg => {
@@ -84,21 +86,6 @@ export default {
     }
   },
   methods: {
-    status () {
-      let status = this.transaction.status
-      let messageTx = this.admTx
-      if (status === 'SUCCESS' && messageTx && messageTx.id) {
-        const txVerify = verifyTransactionDetails(this.transaction, messageTx, { recipientCryptoAddress: this.transaction.recipientId, senderCryptoAddress: this.transaction.senderId })
-        if (txVerify.isTxConsistent) {
-          status = TS.CONFIRMED
-          this.inconsistent_reason = ''
-        } else {
-          this.inconsistent_reason = this.$t(`transaction.inconsistent_reasons.${txVerify.txInconsistentReason}`, { crypto: this.crypto })
-          status = TS.INVALID
-        }
-      }
-      return status
-    },
     getAdmAddress (address) {
       let admAddress = ''
 
@@ -106,7 +93,7 @@ export default {
       const partners = this.$store.state.partners.list
       Object.keys(partners).some(uid => {
         const partner = partners[uid]
-        if (partner[Cryptos.ETH] === address) {
+        if (isStringEqualCI(partner[Cryptos.ETH], address)) {
           admAddress = uid
         }
         return !!admAddress
@@ -117,7 +104,7 @@ export default {
         Object.values(this.$store.state.chat.chats).some(chat => {
           Object.values(chat.messages).some(msg => {
             if (msg.hash && msg.hash === this.id) {
-              admAddress = msg.senderId === this.$store.state.address ? msg.recipientId : msg.senderId
+              admAddress = isStringEqualCI(msg.senderId, this.$store.state.address) ? msg.recipientId : msg.senderId
             }
             return !!admAddress
           })
@@ -129,10 +116,10 @@ export default {
     },
 
     formatAddress (address) {
-      let admAddress = this.getAdmAddress(address)
+      const admAddress = this.getAdmAddress(address)
       let name = ''
 
-      if (address === this.$store.state.eth.address) {
+      if (isStringEqualCI(address, this.$store.state.eth.address)) {
         name = this.$t('transaction.me')
       } else {
         name = this.getPartnerName(admAddress)
diff --git a/src/components/transactions/LskTransaction.vue b/src/components/transactions/LskTransaction.vue
index 7ab25a1b5..954c86b23 100644
--- a/src/components/transactions/LskTransaction.vue
+++ b/src/components/transactions/LskTransaction.vue
@@ -1,17 +1,16 @@
 <template>
   <transaction-template
+    :id="transaction.hash || '' "
     :amount="transaction.amount | currency(crypto)"
     :timestamp="transaction.timestamp || NaN"
-    :id="transaction.hash || '' "
     :fee="transaction.fee | currency('LSK')"
     :confirmations="confirmations || NaN"
     :sender="sender || '' "
     :recipient="recipient || '' "
-    :explorerLink="explorerLink"
+    :explorer-link="explorerLink"
     :partner="partner || '' "
-    :status="status() || '' "
-    :status_inconsistent="inconsistent_reason"
-    :admTx="admTx"
+    :status="getTransactionStatus(admTx, transaction)"
+    :adm-tx="admTx"
     :crypto="crypto"
   />
 </template>
@@ -19,13 +18,18 @@
 <script>
 import TransactionTemplate from './TransactionTemplate.vue'
 import getExplorerUrl from '../../lib/getExplorerUrl'
-import { Cryptos, TransactionStatus as TS } from '../../lib/constants'
+import { Cryptos } from '../../lib/constants'
 import partnerName from '@/mixins/partnerName'
-import { verifyTransactionDetails } from '@/lib/txVerify'
+
+import { isStringEqualCI } from '@/lib/textHelpers'
+import transaction from '@/mixins/transaction'
 
 export default {
-  mixins: [partnerName],
-  name: 'lsk-transaction',
+  name: 'LskTransaction',
+  components: {
+    TransactionTemplate
+  },
+  mixins: [transaction, partnerName],
   props: {
     crypto: {
       required: true,
@@ -36,9 +40,6 @@ export default {
       type: String
     }
   },
-  components: {
-    TransactionTemplate
-  },
   data () {
     return {
       inconsistent_reason: ''
@@ -60,8 +61,9 @@ export default {
     partner () {
       if (this.transaction.partner) return this.transaction.partner
 
-      const id = this.transaction.senderId !== this.$store.state.lsk.address
-        ? this.transaction.senderId : this.transaction.recipientId
+      const id = !isStringEqualCI(this.transaction.senderId, this.$store.state.lsk.address)
+        ? this.transaction.senderId
+        : this.transaction.recipientId
       return this.getAdmAddress(id)
     },
     explorerLink () {
@@ -82,7 +84,7 @@ export default {
       return result
     },
     admTx () {
-      let admTx = {}
+      const admTx = {}
       // Bad news, everyone: we'll have to scan the messages
       Object.values(this.$store.state.chat.chats).some(chat => {
         Object.values(chat.messages).some(msg => {
@@ -97,21 +99,6 @@ export default {
     }
   },
   methods: {
-    status () {
-      let status = this.transaction.status
-      let messageTx = this.admTx
-      if (status === 'SUCCESS' && messageTx && messageTx.id) {
-        const txVerify = verifyTransactionDetails(this.transaction, messageTx, { recipientCryptoAddress: this.recipient, senderCryptoAddress: this.sender })
-        if (txVerify.isTxConsistent) {
-          status = TS.CONFIRMED
-          this.inconsistent_reason = ''
-        } else {
-          this.inconsistent_reason = this.$t(`transaction.inconsistent_reasons.${txVerify.txInconsistentReason}`, { crypto: this.crypto })
-          status = TS.INVALID
-        }
-      }
-      return status
-    },
     getAdmAddress (address) {
       let admAddress = ''
 
@@ -119,7 +106,7 @@ export default {
       const partners = this.$store.state.partners.list
       Object.keys(partners).some(uid => {
         const partner = partners[uid]
-        if (partner[Cryptos.LSK] === address) {
+        if (isStringEqualCI(partner[Cryptos.LSK], address)) {
           admAddress = uid
         }
         return !!admAddress
@@ -130,7 +117,7 @@ export default {
         Object.values(this.$store.state.chat.chats).some(chat => {
           Object.values(chat.messages).some(msg => {
             if (msg.hash && msg.hash === this.id) {
-              admAddress = msg.senderId === this.$store.state.address ? msg.recipientId : msg.senderId
+              admAddress = isStringEqualCI(msg.senderId, this.$store.state.address) ? msg.recipientId : msg.senderId
             }
             return !!admAddress
           })
@@ -142,10 +129,10 @@ export default {
     },
 
     formatAddress (address) {
-      let admAddress = this.getAdmAddress(address)
+      const admAddress = this.getAdmAddress(address)
       let name = ''
 
-      if (address === this.$store.state.lsk.address) {
+      if (isStringEqualCI(address, this.$store.state.lsk.address)) {
         name = this.$t('transaction.me')
       } else {
         name = this.getPartnerName(admAddress)
diff --git a/src/components/transactions/TransactionTemplate.vue b/src/components/transactions/TransactionTemplate.vue
index 781104e07..d88ccac19 100644
--- a/src/components/transactions/TransactionTemplate.vue
+++ b/src/components/transactions/TransactionTemplate.vue
@@ -1,6 +1,10 @@
 <template>
-  <v-layout row wrap justify-center :class="className">
-
+  <v-layout
+    row
+    wrap
+    justify-center
+    :class="className"
+  >
     <app-toolbar-centered
       app
       :title="`${id}`"
@@ -9,11 +13,9 @@
     />
 
     <container>
-
       <v-list class="transparent">
-
         <v-list-tile>
-          <v-list-tile-content>
+          <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
               {{ $t('transaction.amount') }}
             </v-list-tile-title>
@@ -26,27 +28,38 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile>
-          <v-list-tile-content>
-            <v-list-tile-title :class="`${className}__title`" style="width: fit-content;">
+          <v-list-tile-content :class="`${className}__titlecontent`">
+            <v-list-tile-title :class="`${className}__title`">
               {{ $t('transaction.status') }}
-              <v-icon size="20" v-if="statusUpdatable" @click="updateStatus()">mdi-refresh</v-icon>
-              {{ '&nbsp;&nbsp;&nbsp;' }}
+              <v-icon
+                v-if="statusUpdatable"
+                size="20"
+                @click="updateStatus()"
+              >
+                mdi-refresh
+              </v-icon>
             </v-list-tile-title>
           </v-list-tile-content>
 
-          <div :class="`${className}__value ${className}__value-${lowerCaseStatus}`">
-              <v-icon v-if="status_inconsistent" size="20" style="color: #f8a061 !important;">{{ 'mdi-alert-outline' }}</v-icon>
-              {{ $t(`transaction.statuses.${lowerCaseStatus}`) }}<span v-if="status_inconsistent">{{': ' + status_inconsistent }}</span>
+          <div :class="`${className}__value ${className}__value-${status.virtualStatus}`">
+            <v-icon
+              v-if="status.status === 'INVALID'"
+              size="20"
+              style="color: #f8a061 !important;"
+            >
+              {{ 'mdi-alert-outline' }}
+            </v-icon>
+            {{ $t(`transaction.statuses.${status.virtualStatus}`) }}<span v-if="status.status === 'INVALID'">{{ ': ' + $t(`transaction.inconsistent_reasons.${status.inconsistentReason}`, { crypto } ) }}</span><span v-if="status.addStatus">{{ ': ' + status.addDescription }}</span>
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile>
-          <v-list-tile-content>
+          <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
               {{ $t('transaction.date') }}
             </v-list-tile-title>
@@ -59,10 +72,10 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile>
-          <v-list-tile-content>
+          <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
               {{ $t('transaction.confirmations') }}
             </v-list-tile-title>
@@ -75,10 +88,10 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile>
-          <v-list-tile-content>
+          <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
               {{ $t('transaction.commission') }}
             </v-list-tile-title>
@@ -91,7 +104,7 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile :title="id || placeholder">
           <v-list-tile-title :class="`${className}__title`">
@@ -103,7 +116,7 @@
           </v-list-tile-title>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile :title="sender || placeholder">
           <v-list-tile-title :class="`${className}__title`">
@@ -115,7 +128,7 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
         <v-list-tile :title="recipient || placeholder">
           <v-list-tile-title :class="`${className}__title`">
@@ -127,9 +140,12 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
-        <v-list-tile v-if="comment" :title="comment">
+        <v-list-tile
+          v-if="comment"
+          :title="comment"
+        >
           <v-list-tile-title :class="`${className}__title`">
             {{ $t('transaction.comment') }}
           </v-list-tile-title>
@@ -139,10 +155,13 @@
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
-        <v-list-tile v-if="explorerLink" @click="openInExplorer">
-          <v-list-tile-content>
+        <v-list-tile
+          v-if="explorerLink"
+          @click="openInExplorer"
+        >
+          <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
               {{ $t('transaction.explorer') }}
             </v-list-tile-title>
@@ -150,15 +169,20 @@
 
           <div>
             <v-list-tile-title :class="`${className}__value`">
-              <v-icon size="20">mdi-chevron-right</v-icon>
+              <v-icon size="20">
+                mdi-chevron-right
+              </v-icon>
             </v-list-tile-title>
           </div>
         </v-list-tile>
 
-        <v-divider/>
+        <v-divider />
 
-        <v-list-tile v-if="partner && !ifComeFromChat" @click="openChat">
-          <v-list-tile-content>
+        <v-list-tile
+          v-if="partner && !ifComeFromChat"
+          @click="openChat"
+        >
+          <v-list-tile-content :class="`${className}__titlecontent`">
             <v-list-tile-title :class="`${className}__title`">
               {{ hasMessages ? $t('transaction.continueChat') : $t('transaction.startChat') }}
             </v-list-tile-title>
@@ -166,15 +190,14 @@
 
           <div>
             <v-list-tile-title :class="`${className}__value`">
-              <v-icon size="20">{{ hasMessages ? 'mdi-comment' : 'mdi-comment-outline' }}</v-icon>
+              <v-icon size="20">
+                {{ hasMessages ? 'mdi-comment' : 'mdi-comment-outline' }}
+              </v-icon>
             </v-list-tile-title>
           </div>
         </v-list-tile>
-
       </v-list>
-
     </container>
-
   </v-layout>
 </template>
 
@@ -182,8 +205,14 @@
 import { Symbols, tsUpdatable } from '@/lib/constants'
 import AppToolbarCentered from '@/components/AppToolbarCentered'
 
+import transaction from '@/mixins/transaction'
+
 export default {
-  name: 'transaction-template',
+  name: 'TransactionTemplate',
+  components: {
+    AppToolbarCentered
+  },
+  mixins: [transaction],
   props: {
     amount: {
       required: true,
@@ -223,11 +252,7 @@ export default {
     },
     status: {
       required: true,
-      type: String
-    },
-    status_inconsistent: {
-      required: false,
-      type: String
+      type: Object
     },
     timestamp: {
       required: true,
@@ -238,21 +263,6 @@ export default {
       type: Object
     }
   },
-  methods: {
-    openInExplorer: function () {
-      if (this.explorerLink) {
-        window.open(this.explorerLink, '_blank', 'resizable,scrollbars,status,noopener')
-      }
-    },
-    openChat: function () {
-      this.$router.push('/chats/' + this.partner + '/')
-    },
-    updateStatus () {
-      if (this.statusUpdatable) {
-        this.$store.dispatch(this.crypto.toLowerCase() + '/updateTransaction', { hash: this.id, force: true, updateOnly: false, dropStatus: true })
-      }
-    }
-  },
   computed: {
     className: () => 'transaction-view',
     hasMessages: function () {
@@ -260,24 +270,44 @@ export default {
       return chat && chat.messages && Object.keys(chat.messages).length > 0
     },
     placeholder () {
-      if (!this.status) return Symbols.CLOCK
-      return this.status === 'ERROR' ? Symbols.CROSS : Symbols.HOURGLASS
+      if (!this.status.status) return Symbols.CLOCK
+      return this.status.status === 'REJECTED' ? Symbols.CROSS : Symbols.HOURGLASS
     },
     ifComeFromChat () {
-      return this.$route.query.hasOwnProperty('fromChat')
-    },
-    lowerCaseStatus () {
-      return this.status ? this.status.toLowerCase() : 'pending'
+      return Object.prototype.hasOwnProperty.call(this.$route.query, 'fromChat')
     },
     comment () {
       return this.admTx && this.admTx.message ? this.admTx.message : false
     },
     statusUpdatable () {
-      return tsUpdatable(this.status, this.crypto)
+      return tsUpdatable(this.status.virtualStatus, this.crypto)
     }
   },
-  components: {
-    AppToolbarCentered
+  watch: {
+    // fetch Tx status when we get admTx
+    admTx () {
+      this.fetchTransactionStatus(this.admTx, this.partner)
+    }
+  },
+  mounted () {
+    if (this.admTx) {
+      this.fetchTransactionStatus(this.admTx, this.partner)
+    }
+  },
+  methods: {
+    openInExplorer: function () {
+      if (this.explorerLink) {
+        window.open(this.explorerLink, '_blank', 'resizable,scrollbars,status,noopener')
+      }
+    },
+    openChat: function () {
+      this.$router.push('/chats/' + this.partner + '/')
+    },
+    updateStatus () {
+      if (this.crypto && this.statusUpdatable) {
+        this.$store.dispatch(this.crypto.toLowerCase() + '/updateTransaction', { hash: this.id, force: true, updateOnly: false, dropStatus: true })
+      }
+    }
   }
 }
 </script>
@@ -288,6 +318,8 @@ export default {
 .transaction-view
   &__title
     font-weight: 300
+  &__titlecontent
+    flex: 1 0 auto
   &__value
     font-weight: 300
     font-size: 14px
@@ -314,14 +346,16 @@ export default {
 
 .theme--light, .theme--dark
   .transaction-view
-    &__value-error
+    &__value-REJECTED
       color: $adm-colors.danger !important
-    &__value-pending
+    &__value-PENDING
       color: $adm-colors.attention !important
-    &__value-success
-      color: $adm-colors.good !important
-    &__value-confirmed
+    &__value-REGISTERED
+      color: $adm-colors.attention !important
+    &__value-CONFIRMED
       color: $adm-colors.good !important
-    &__value-invalid
+    &__value-INVALID
+      color: $adm-colors.attention !important
+    &__value-UNKNOWN
       color: $adm-colors.attention !important
 </style>
diff --git a/src/filters/helpers/index.js b/src/filters/helpers/index.js
index dd7f27bef..e6618bcae 100644
--- a/src/filters/helpers/index.js
+++ b/src/filters/helpers/index.js
@@ -38,11 +38,11 @@ export const isYesterday = someDate => {
  * @returns {boolean}
  */
 export const isCurrentWeek = someDate => {
-  let today = new Date()
+  const today = new Date()
 
   for (let i = 1; i <= 7; i++) {
-    let first = today.getDate() - today.getDay() + i
-    let day = new Date(today.setDate(first))
+    const first = today.getDate() - today.getDay() + i
+    const day = new Date(today.setDate(first))
 
     if (
       someDate.getDate() === day.getDate() &&
diff --git a/src/filters/numberFormat.js b/src/filters/numberFormat.js
index 202a9231b..2dec586dc 100644
--- a/src/filters/numberFormat.js
+++ b/src/filters/numberFormat.js
@@ -6,6 +6,6 @@
  * @returns {string}
  */
 export default (amount, precision = 8) => {
-  let [whole, fraction] = Number(amount).toFixed(precision).replace(/0+$/, '').split('.')
+  const [whole, fraction] = Number(amount).toFixed(precision).replace(/0+$/, '').split('.')
   return fraction ? `${whole}.${fraction}` : `${whole}`
 }
diff --git a/src/i18n.js b/src/i18n.js
index 50138d553..5e0056616 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -25,7 +25,7 @@ export default new VueI18n({
      * @param choicesLength {number} an overall amount of available choices
      * @returns a final choice index to select plural word by
      */
-    'ru': function (choice, choicesLength) {
+    ru: function (choice, choicesLength) {
       // this === VueI18n instance, so the locale property also exists here
       if (choice === 0) {
         return 0
diff --git a/src/i18n/de.json b/src/i18n/de.json
index fea5123a1..edc15d720 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -42,12 +42,12 @@
     "title": "Chats",
     "too_long": "Nachricht zu lang",
     "transaction_statuses": {
-      "confirmed": "Confirmed in a blockchain",
-      "delivered": "Delivered to a node",
-      "invalid": "Incorrect information. Check the Tx in a blockchain explorer carefully",
-      "pending": "Not confirmed yet. Fetching…",
-      "rejected": "Unable to fetch Tx info. It may be cancelled or not accepted. Check the Tx in a blockchain explorer",
-      "unknown": "This cryptocurrency is not supported yet"
+      "CONFIRMED": "Confirmed in a blockchain",
+      "REGISTERED": "Delivered to a node",
+      "INVALID": "Incorrect information. Check the Tx in a blockchain explorer carefully",
+      "PENDING": "Not confirmed yet. Fetching…",
+      "REJECTED": "Unable to fetch Tx info. It may be cancelled or not accepted. Check the Tx in a blockchain explorer",
+      "UNKNOWN": "This cryptocurrency is not supported yet"
     },
     "welcome_message_title": "Willkommen in ADAMANT",
     "you": "YOU"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 5c01f9198..ad3a58b4b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -42,12 +42,12 @@
     "how_to_use_messenger": "How to start with a Blockchain Messenger",
     "how_to_use_messenger_link": "https://medium.com/adamant-im/how-to-start-with-a-blockchain-messenger-54d1eb9704e6",
     "transaction_statuses": {
-      "confirmed": "Confirmed in a blockchain",
-      "delivered": "Delivered to a node",
-      "invalid": "Incorrect information. Check the Tx in a blockchain explorer carefully",
-      "pending": "Not confirmed yet. Fetching…",
-      "rejected": "Unable to fetch Tx info. It may be cancelled or not accepted. Check the Tx in a blockchain explorer",
-      "unknown": "This cryptocurrency is not supported yet"
+      "CONFIRMED": "Confirmed in a blockchain",
+      "REGISTERED": "Delivered to a node",
+      "INVALID": "Incorrect information. Check the Tx in a blockchain explorer carefully",
+      "PENDING": "Not confirmed yet. Fetching…",
+      "REJECTED": "Unable to fetch Tx info. It may be cancelled or not accepted. Check the Tx in a blockchain explorer",
+      "UNKNOWN": "This cryptocurrency is not supported yet"
     },
     "virtual": {
       "bitcoin_bet": "Hi! I'm anonymous and Blockchain-proved bet bot 🤑. I accept bets on BTC rate and pay rewards to winners. Learn more on ADAMANT’s blog or type **/help** to start betting.",
@@ -56,9 +56,11 @@
       "bounty_foundation_wallet_title": "Adoption hot Wallet",
       "exchange_bot": "Hi! I'm your exchange bot ₿. I operate instantly and anonymously. Type **/help** to see what I can do. **ℹ**️ Learn more on ADAMANT blog.",
       "exchange_bot_title": "ADAMANT Exchange",
+      "bounty_bot": "Welcome! Earn ADM with your social activity! Send **/help** command for details.",
+      "bounty_bot_title": "ADM Bounty bot",
       "donate_bot": "We develop decentralized ADAMANT Messenger thanks to your support—transfer ADM, BTC, ETH and other coins in this chat. For additional donation wallets, see https://adamant.im/donate.",
       "donate_bot_title": "Donate to ADAMANT Foundation",
-      "welcome_message": "ADAMANT is a unqiue Blockchain messenger that is independent from government, corporations and even its developers. It is possible due to a decentralized network, fully open source and users' feedback. That's why every action, including messaging or saving new contacts, has a network fee of 0.001 ADM.\n\nUnlike typical P2P and centralized messengers, the blockchain system offers superior security and privacy. What’s more, it provides users with new possibilities such as storing and transferring cryptocurrencies In-Chat with full control of private keys; use ADAMANT as a 2FA solution, exchange cryptocurrency anonymously and bet on Bitcoin rates and more.\n\nThe ADAMANT blockchain system belongs to its users. Nobody can control, block, deactivate, restrict or censor accounts. Users take full responsibility for their content, messages, media, and goals and intentions of using the messenger.\n\nADAMANT is anonymous, your IP is hidden even from partners, and Tor version is available for those that want to take privacy to the next level. But remember, your security and anonymity are up to you. Do not follow links you receive, otherwise your IP can be compromised. Set a password on your device. Learn more about security and anonymity at https://adamant.im/staysecured/.\n\nMake sure you've saved your unique passpharse for this account — logout and login again. Write your passphrase on a sheet of paper as well. Only *you are responsible for the passphrase's safety*. It cannot be recovered. And if other person gets it, your tokens will be stolen and your correspondence will be compromised. Treat this matter with outmost importance, as if tokens in your wallet cost a billion dollars.\n\nTo Start messaging now, *get your free welcoming tokens* on Account tab. Then start a new chat and fill in your friend's ADM address. It is recommended to share your ADM address personally and via ADAMANT only.\n\nSearch Internet for ADAMANT bots' addresses. They can exchange cryptocurrencies, accept bets on crypto rates, and make wishes come true.\n\n",
+      "welcome_message": "ADAMANT is a unique Blockchain messenger that is independent from government, corporations and even its developers. It is possible due to a decentralized network, fully open source and users' feedback. That's why every action, including messaging or saving new contacts, has a network fee of 0.001 ADM.\n\nUnlike typical P2P and centralized messengers, the blockchain system offers superior security and privacy. What’s more, it provides users with new possibilities such as storing and transferring cryptocurrencies In-Chat with full control of private keys; use ADAMANT as a 2FA solution, exchange cryptocurrency anonymously and bet on Bitcoin rates and more.\n\nThe ADAMANT blockchain system belongs to its users. Nobody can control, block, deactivate, restrict or censor accounts. Users take full responsibility for their content, messages, media, and goals and intentions of using the messenger.\n\nADAMANT is anonymous, your IP is hidden even from partners, and Tor version is available for those that want to take privacy to the next level. But remember, your security and anonymity are up to you. Do not follow links you receive, otherwise your IP can be compromised. Set a password on your device. Learn more about security and anonymity at https://adamant.im/staysecured/.\n\nMake sure you've saved your unique passphrase for this account — logout and login again. Write your passphrase on a sheet of paper as well. Only *you are responsible for the passphrase's safety*. It cannot be recovered. And if other person gets it, your tokens will be stolen and your correspondence will be compromised. Treat this matter with outmost importance, as if tokens in your wallet cost a billion dollars.\n\nTo Start messaging now, *get your free welcoming tokens* on Account tab. Then start a new chat and fill in your friend's ADM address. It is recommended to share your ADM address personally and via ADAMANT only.\n\nSearch Internet for ADAMANT bots' addresses. They can exchange cryptocurrencies, accept bets on crypto rates, and make wishes come true.\n\n",
       "welcome_message_title": "Welcome to ADAMANT"
     },
     "you": "You"
@@ -205,7 +207,7 @@
     "connect_camera": "Switch on camera and try again",
     "hold_your_device": "Hold your device steady for 2-3 seconds to scan the QR code",
     "login": {
-      "modal_header": "Scan the QR code containg a passphrase"
+      "modal_header": "Scan the QR code containing a passphrase"
     },
     "new-chat": {
       "modal_header": "Scan the QR code contain an ADAMANT address"
@@ -232,12 +234,16 @@
     "status": "Status",
     "comment": "Comment",
     "statuses": {
-      "error": "Error",
-      "pending": "Pending",
-      "registered": "Pending",
-      "success": "Success",
-      "confirmed": "Success",
-      "invalid": "Inconsistent"
+      "REJECTED": "Error",
+      "PENDING": "Pending",
+      "REGISTERED": "Pending, waiting for confirmations",
+      "CONFIRMED": "Success",
+      "INVALID": "Inconsistent",
+      "UNKNOWN": "Unknown"      
+    },
+    "statuses_add": {
+      "instant_send": "Confirmed as InstantSend (yet 0 network confirmations)",
+      "adm_registered": "Confirmed as registered in ADAMANT blockchain (yet 0 network confirmations)"
     },
     "inconsistent_reasons": {
       "unknown": "Failed to check Tx. Somethings went wrong",
@@ -274,6 +280,7 @@
     "decode_from_image": "Read QR from image",
     "error_chat_fee": "To send {crypto} via chat, you need 0.001 ADM",
     "error_dust_amount": "Dust amount—Send more tokens",
+    "error_precision": "Too high precision—Set less decimal places",
     "error_erc20_fee": "You need a {fee} to pay a transfer fee",
     "error_field_is_required": "Field is required",
     "error_incorrect_address": "Incorrect {crypto} wallet address",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 9910c7668..7501c12b1 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -42,12 +42,12 @@
     "how_to_use_messenger": "Как пользоваться мессенджером на блокчейне",
     "how_to_use_messenger_link": "https://vk.com/@adamant_im-kak-polzovatsya-messendzherom-na-blokcheine",
     "transaction_statuses": {
-      "confirmed": "Перевод подтвержден в блокчейне криптовалюты",
-      "delivered": "Транзакция доставлена на узел сети",
-      "invalid": "Противоречивая информация. Внимательно проверьте перевод в эксплорере криптовалюты",
-      "pending": "В ожидании. Обновляю…",
-      "rejected": "Не получил информацию из блокчейна. Возможно, транзакция не принята или отменена. Проверьте перевод в эксплорере криптовалюты",
-      "unknown": "Криптовалюта пока не поддерживается"
+      "CONFIRMED": "Перевод подтвержден в блокчейне криптовалюты",
+      "REGISTERED": "Транзакция доставлена на узел сети",
+      "INVALID": "Противоречивая информация. Внимательно проверьте перевод в эксплорере криптовалюты",
+      "PENDING": "В ожидании. Обновляю…",
+      "REJECTED": "Не получил информацию из блокчейна. Возможно, транзакция не принята или отменена. Проверьте перевод в эксплорере криптовалюты",
+      "UNKNOWN": "Криптовалюта пока не поддерживается"
     },
     "virtual": {
       "bitcoin_bet": "Привет! Принимаю ставки на курс биткоина анонимно и с доказательством в блокчейне 🤑. Узнайте больше в блоге АДАМАНТа или наберите **/help**.",
@@ -56,6 +56,8 @@
       "bounty_foundation_wallet_title": "Adoption hot Wallet",
       "exchange_bot": "Привет! Я — бот-обменник криптовалют ₿. Меняю анонимно и без задержек. **ℹ**️ Узнайте больше в блоге АДАМАНТа или наберите **/help**, чтобы приступить к обмену.",
       "exchange_bot_title": "Обменник АДАМАНТа",
+      "bounty_bot": "Добро пожаловать! Заработайте ADM с помощью вашей социальной активности! Скомандуйте **/help**, чтобы узнать как.",
+      "bounty_bot_title": "Баунти-бот ADM",
       "donate_bot": "Мы развиваем децентрализованный месенджер АДАМАНТ благодаря вашей поддержке — переведите ADM, BTC, ETH или монеты токены в этом чате. Дополнительные кошельки для донатов смотрите на https://adamant.im/donate.",
       "donate_bot_title": "Поддержите ADAMANT Foundation",
       "welcome_message": "АДАМАНТ — мессенджер, полностью работающий на блокчейне, независимый от государств, корпораций и даже разработчиков. Это возможно благодаря децентрализованной сетевой инфраструктуре, с полностью открытым исходным кодом и поддерживаемой пользователями. Поэтому каждое действие, включая отправку сообщения или сохранение адресной книги, имеет комиссию сети 0.001 ADM.\n\nБлокчейн позволяет добиться превосходной безопасности и приватности, недоступной для типичных P2P- и централизованных мессенджеров. Также блокчейн предоставляет и новые возможности. Храните и передавайте криптовалюты в чатах, сохраняя полный контроль над приватными ключами, используйте АДАМАНТ как 2FA, анонимно обменивайте криптовалюты, делайте ставки на курс биткоина, и больше.\n\nБлокчейн АДАМАНТа принадлежит пользователям. Никто не может контролировать, блокировать, деактивировать, ограничивать или подвергать цензуре аккаунты. Сами пользователи берут на себя полную ответственность за контент, сообщения, медиа, намерения и цели использования мессенджера.\n\nАДАМАНТ анонимен, ваш IP-адрес скрыт от собеседников, а для параноиков доступна Tor-версия. Но помните, что безопасность и анонимность зависит и от вас самих. Не переходите по ссылкам, которые вы получаете в чатах, иначе ваш IP-адрес может быть определен. Установите на ваше устройство пароль. Более полную информацию о безопасности и анонимности читайте на странице https://adamant.im/ru-staysecured/.\n\nУбедитесь, что вы сохранили пассфразу к этому аккаунту — выйдите из аккаунта и войдите в него снова. Запишите пассфразу на бумаге. Только *вы несете ответственность за сохранность вашей пассфразы*. Ее невозможно восстановить. А если она попадет в другие руки, ваши деньги будут украдены, а переписка прочитана. Отнеситесь к этому вопросу так серьезно, как если бы цена токенов на вашем кошельке когда-то станет равна миллиарду долларов.\n\nЧтобы начать общение, *получите бесплатные токены* на вкладке Аккаунт. Затем создайте новый чат и введите ADM-адрес вашего собеседника. Лучше обменивайтесь ADM-адресами лично, а не через другие мессенджеры.\n\nПоищите в Интернете адреса ботов в АДАМАНТе. Они могу обменивать криптовалюты, принимать ставки на курсы криптовалют, и исполнять ваши желания.\n\n",
@@ -91,7 +93,7 @@
     "warning": "Внимание",
     "headline": "Ваш аккаунт может быть взломан",
     "about": "Вы можете принимать криптовалюты в чате, поскольку АДАМАНТ сохраняет адреса кошельков в блокчейне. Для этого необходима пассфраза — это означает, что никто не может указать неправильные адреса от вашего имени.",
-    "specifics_wrong_addresses": "Мы обнаружили несоответствия в сохраненных адресах вашей учетной записи. {crypto}-адрес указан как {storedAddress}, но правильный — {corretoAddress}. Это означает, что если кто-то пришлет вам {крипто} в чате, вы их не получите.",
+    "specifics_wrong_addresses": "Мы обнаружили несоответствия в сохраненных адресах вашей учетной записи. {crypto}-адрес указан как {storedAddress}, но правильный — {correctAddress}. Это означает, что если кто-то пришлет вам {крипто} в чате, вы их не получите.",
     "specifics_many_addresses": "Ваш аккаунт хранит более одного {crypto}-адреса: {manyAddresses}. Это означает, что кто-то указал мошеннические адреса.",
     "full_list_wrong_addresses": "Полный список криптовалют с несовпадающими адресами: {crypto_list}.",
     "full_list_many_addresses": "Кошельки с множественными адресами: {crypto_list}.",
@@ -234,12 +236,16 @@
     "status": "Статус",
     "comment": "Комментарий",
     "statuses": {
-      "error": "Ошибка",
-      "pending": "Ожидание",
-      "registered": "Ожидание",
-      "success": "Успешно",
-      "confirmed": "Успешно",
-      "invalid": "Неверные данные"
+      "REJECTED": "Ошибка",
+      "PENDING": "Ожидание",
+      "REGISTERED": "Ожидание подтверждений сети",
+      "CONFIRMED": "Успешно",
+      "INVALID": "Неверные данные",
+      "UNKNOWN": "Неизвестная криптовалюта"
+    },
+    "statuses_add": {
+      "instant_send": "Подтверждена как InstantSend (пока 0 подтверждений сети)",
+      "adm_registered": "Подтверждена как зарегистрированная на узле АДАМАНТа (пока 0 подтверждений сети)"
     },
     "inconsistent_reasons": {
       "unknown": "Не удалось проверить транзакцию. Что-то пошло не так",
@@ -276,6 +282,7 @@
     "decode_from_image": "Прочитать QR-код с изображения",
     "error_chat_fee": "Чтобы отправить {crypto} в чате, вам также нужно 0.001 ADM",
     "error_dust_amount": "Мелочь — Отправьте больше токенов",
+    "error_precision": "Уменьшите количество знаков после запятой",
     "error_erc20_fee": "Вам также нужно {fee}, чтобы оплатить комиссию",
     "error_field_is_required": "Поле не заполнено",
     "error_incorrect_address": "Неверный адрес {crypto}-кошелька",
@@ -285,7 +292,7 @@
     "error_not_enough": "Недостаточно токенов",
     "error_not_enough_eth_fee": "Недостаточно ETH для оплаты комиссии",
     "error_same_recipient": "Не отправляйте токены самому себе",
-    "error_transfre_send": "Ошибка при отправке транзакции",
+    "error_transfer_send": "Ошибка при отправке транзакции",
     "error_unknown": "Неизвестная ошибка. Плохое подключение?",
     "error_no_hash": "Ошибка. Не удалось получить хэш транзакции",
     "final_amount_label": "Количество, включая комиссию за перевод",
diff --git a/src/layouts/chat.vue b/src/layouts/chat.vue
index 12de6ae68..096754d62 100644
--- a/src/layouts/chat.vue
+++ b/src/layouts/chat.vue
@@ -1,10 +1,13 @@
 <template>
   <v-content>
-    <v-container fluid class="pa-0">
-      <slot/>
+    <v-container
+      fluid
+      class="pa-0"
+    >
+      <slot />
     </v-container>
 
-    <app-snackbar/>
+    <app-snackbar />
   </v-content>
 </template>
 
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 2b2ecc402..e78865e03 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -1,10 +1,13 @@
 <template>
   <v-content>
-    <v-container fluid fill-height>
-      <slot/>
+    <v-container
+      fluid
+      fill-height
+    >
+      <slot />
     </v-container>
 
-    <app-snackbar/>
+    <app-snackbar />
   </v-content>
 </template>
 
diff --git a/src/layouts/no-container.vue b/src/layouts/no-container.vue
index fca79ef96..5b739c0f5 100644
--- a/src/layouts/no-container.vue
+++ b/src/layouts/no-container.vue
@@ -1,9 +1,9 @@
 <template>
   <v-content>
-    <slot/>
+    <slot />
 
-    <app-snackbar/>
-    <app-navigation v-if="showNavigation"/>
+    <app-snackbar />
+    <app-navigation v-if="showNavigation" />
   </v-content>
 </template>
 
@@ -12,14 +12,14 @@ import AppSnackbar from '@/components/AppSnackbar'
 import AppNavigation from '@/components/AppNavigation'
 
 export default {
+  components: {
+    AppSnackbar,
+    AppNavigation
+  },
   computed: {
     showNavigation () {
       return this.$route.meta.showNavigation || false
     }
-  },
-  components: {
-    AppSnackbar,
-    AppNavigation
   }
 }
 </script>
diff --git a/src/layouts/toolbar.vue b/src/layouts/toolbar.vue
index 88cb4b146..da02b2ca7 100644
--- a/src/layouts/toolbar.vue
+++ b/src/layouts/toolbar.vue
@@ -1,10 +1,13 @@
 <template>
   <v-content>
-    <v-container fluid :class="{ 'pa-0': containerNoPadding }">
-      <slot/>
+    <v-container
+      fluid
+      :class="{ 'pa-0': containerNoPadding }"
+    >
+      <slot />
     </v-container>
-    <app-snackbar/>
-    <app-navigation v-if="showNavigation"/>
+    <app-snackbar />
+    <app-navigation v-if="showNavigation" />
   </v-content>
 </template>
 
@@ -13,6 +16,10 @@ import AppSnackbar from '@/components/AppSnackbar'
 import AppNavigation from '@/components/AppNavigation'
 
 export default {
+  components: {
+    AppSnackbar,
+    AppNavigation
+  },
   computed: {
     containerNoPadding () {
       return this.$route.meta.containerNoPadding
@@ -20,10 +27,6 @@ export default {
     showNavigation () {
       return this.$route.meta.showNavigation || false
     }
-  },
-  components: {
-    AppSnackbar,
-    AppNavigation
   }
 }
 </script>
diff --git a/src/lib/adamant-api.js b/src/lib/adamant-api.js
index 7ad8b56f8..03676c35e 100644
--- a/src/lib/adamant-api.js
+++ b/src/lib/adamant-api.js
@@ -8,6 +8,7 @@ import { encryptPassword } from '@/lib/idb/crypto'
 import { restoreState } from '@/lib/idb/state'
 import i18n from '@/i18n'
 import store from '@/store'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 Queue.configure(Promise)
 
@@ -307,6 +308,8 @@ export function getForgedByAccount (accountPublicKey) {
 
 /**
  * Stores user address for the specified crypto
+ * Before it checks if there are any address for this crypto is already stored.
+ * If stored already, the function does nothing
  * @param {string} crypto crypto
  * @param {*} address user address for `crypto`
  * @returns {Promise<boolean>}
@@ -361,7 +364,7 @@ export function getTransactions (options = { }) {
     query['and:type'] = options.type
   }
   if (options.orderBy) {
-    query['orderBy'] = options.orderBy
+    query.orderBy = options.orderBy
   }
 
   return client.get('/api/transactions', query)
@@ -406,12 +409,13 @@ export function getChats (from = 0, offset = 0, orderBy = 'desc') {
     params.offset = offset
   }
 
+  // Doesn't return ADM direct transfer transactions, only messages and in-chat transfers
+  // https://github.com/Adamant-im/adamant/wiki/API-Specification#get-chat-transactions
   return client.get('/api/chats/get/', params).then(response => {
-  // return client.get('/api/transactions/', params).then(response => {
     const { count, transactions } = response
 
     const promises = transactions.map(transaction => {
-      const promise = (transaction.recipientId === myAddress)
+      const promise = (isStringEqualCI(transaction.recipientId, myAddress))
         ? Promise.resolve(transaction.senderPublicKey)
         : queue.add(() => getPublicKey(transaction.recipientId))
 
diff --git a/src/lib/adamant.js b/src/lib/adamant.js
index fb6b1abca..7111fb9a9 100644
--- a/src/lib/adamant.js
+++ b/src/lib/adamant.js
@@ -2,7 +2,6 @@
 'use strict'
 
 import sodium from 'sodium-browserify-tweetnacl'
-import * as bip39 from 'bip39'
 import crypto from 'crypto'
 import nacl from 'tweetnacl/nacl-fast'
 import ed2curve from 'ed2curve'
@@ -11,6 +10,7 @@ import bignum from './bignumber.js'
 import ByteBuffer from 'bytebuffer'
 import constants from './constants.js'
 import { hexToBytes, bytesToHex } from './hex'
+import cache from '@/store/cache'
 
 /**
  * Crypto functions that implements sodium.
@@ -18,7 +18,7 @@ import { hexToBytes, bytesToHex } from './hex'
  * @requires sodium
  * @namespace
  */
-var adamant = {}
+const adamant = {}
 
 /**
  * Converts provided `time` to Adamant's epoch timestamp
@@ -48,16 +48,16 @@ adamant.toTimestamp = function (epochTime) {
  * @returns {*}
  */
 adamant.parseURI = function (uri) {
-  var r = /^adm:(U[0-9]{17,22})(?:\?(.*))?$/
-  var match = r.exec(uri)
+  const r = /^adm:(U[0-9]{17,22})(?:\?(.*))?$/
+  const match = r.exec(uri)
   if (!match) {
     return false
   }
-  var parsed = { url: uri }
+  const parsed = { url: uri }
   if (match[2]) {
-    var queries = match[2].split('&')
-    for (var i = 0; i < queries.length; i++) {
-      var query = queries[i].split('=')
+    const queries = match[2].split('&')
+    for (let i = 0; i < queries.length; i++) {
+      const query = queries[i].split('=')
       if (query.length === 2) {
         parsed[query[0]] = decodeURIComponent(query[1].replace(/\+/g, '%20'))
       }
@@ -69,11 +69,12 @@ adamant.parseURI = function (uri) {
 
 /**
  * Creates a hash based on a passphrase.
- * @param {string} passPhrase
+ * bip39.mnemonicToSeedSync is time consuming, so we use cached value, if possible
+ * @param {string} passphrase
  * @return {string} hash
  */
 adamant.createPassphraseHash = function (passphrase) {
-  const seedHex = bip39.mnemonicToSeedSync(passphrase).toString('hex')
+  const seedHex = cache.mnemonicToSeedSync(passphrase).toString('hex')
   return crypto.createHash('sha256').update(seedHex, 'hex').digest()
 }
 
@@ -84,7 +85,7 @@ adamant.createPassphraseHash = function (passphrase) {
  * @return {Object} publicKey, privateKey
  */
 adamant.makeKeypair = function (hash) {
-  var keypair = sodium.crypto_sign_seed_keypair(hash)
+  const keypair = sodium.crypto_sign_seed_keypair(hash)
 
   return {
     publicKey: keypair.publicKey,
@@ -101,7 +102,7 @@ adamant.getAddressFromPublicKey = function (publicKey) {
   const publicKeyHash = crypto.createHash('sha256').update(publicKey, 'hex').digest()
   const temp = Buffer.alloc(8)
 
-  for (var i = 0; i < 8; i++) {
+  for (let i = 0; i < 8; i++) {
     temp[i] = publicKeyHash[7 - i]
   }
 
@@ -131,10 +132,10 @@ adamant.getHash = function (trs) {
  */
 
 adamant.getBytes = function (transaction) {
-  var skipSignature = false
-  var skipSecondSignature = true
-  var assetSize = 0
-  var assetBytes = null
+  const skipSignature = false
+  const skipSecondSignature = true
+  let assetSize = 0
+  let assetBytes = null
 
   switch (transaction.type) {
     case constants.Transactions.SEND:
@@ -159,34 +160,34 @@ adamant.getBytes = function (transaction) {
       alert('Not supported yet')
   }
 
-  var bb = new ByteBuffer(1 + 4 + 32 + 8 + 8 + 64 + 64 + assetSize, true)
+  const bb = new ByteBuffer(1 + 4 + 32 + 8 + 8 + 64 + 64 + assetSize, true)
 
   bb.writeByte(transaction.type)
   bb.writeInt(transaction.timestamp)
 
-  var senderPublicKeyBuffer = Buffer.from(transaction.senderPublicKey, 'hex')
-  for (var i = 0; i < senderPublicKeyBuffer.length; i++) {
+  const senderPublicKeyBuffer = Buffer.from(transaction.senderPublicKey, 'hex')
+  for (let i = 0; i < senderPublicKeyBuffer.length; i++) {
     bb.writeByte(senderPublicKeyBuffer[i])
   }
 
   if (transaction.requesterPublicKey) {
-    var requesterPublicKey = Buffer.from(transaction.requesterPublicKey, 'hex')
+    const requesterPublicKey = Buffer.from(transaction.requesterPublicKey, 'hex')
 
-    for (var i = 0; i < requesterPublicKey.length; i++) {
+    for (let i = 0; i < requesterPublicKey.length; i++) {
       bb.writeByte(requesterPublicKey[i])
     }
   }
 
   if (transaction.recipientId) {
-    var recipient = transaction.recipientId.slice(1)
+    let recipient = transaction.recipientId.slice(1)
     // eslint-disable-next-line new-cap
     recipient = new bignum(recipient).toBuffer({ size: 8 })
 
-    for (i = 0; i < 8; i++) {
+    for (let i = 0; i < 8; i++) {
       bb.writeByte(recipient[i] || 0)
     }
   } else {
-    for (i = 0; i < 8; i++) {
+    for (let i = 0; i < 8; i++) {
       bb.writeByte(0)
     }
   }
@@ -194,30 +195,30 @@ adamant.getBytes = function (transaction) {
   bb.writeLong(transaction.amount)
 
   if (assetSize > 0) {
-    for (var i = 0; i < assetSize; i++) {
+    for (let i = 0; i < assetSize; i++) {
       bb.writeByte(assetBytes[i])
     }
   }
 
   if (!skipSignature && transaction.signature) {
-    var signatureBuffer = Buffer.from(transaction.signature, 'hex')
-    for (var i = 0; i < signatureBuffer.length; i++) {
+    const signatureBuffer = Buffer.from(transaction.signature, 'hex')
+    for (let i = 0; i < signatureBuffer.length; i++) {
       bb.writeByte(signatureBuffer[i])
     }
   }
 
   if (!skipSecondSignature && transaction.signSignature) {
-    var signSignatureBuffer = Buffer.from(transaction.signSignature, 'hex')
-    for (var i = 0; i < signSignatureBuffer.length; i++) {
+    const signSignatureBuffer = Buffer.from(transaction.signSignature, 'hex')
+    for (let i = 0; i < signSignatureBuffer.length; i++) {
       bb.writeByte(signSignatureBuffer[i])
     }
   }
 
   bb.flip()
-  var arrayBuffer = new Uint8Array(bb.toArrayBuffer())
-  var buffer = []
+  const arrayBuffer = new Uint8Array(bb.toArrayBuffer())
+  const buffer = []
 
-  for (var i = 0; i < arrayBuffer.length; i++) {
+  for (let i = 0; i < arrayBuffer.length; i++) {
     buffer[i] = arrayBuffer[i]
   }
 
@@ -225,22 +226,22 @@ adamant.getBytes = function (transaction) {
 }
 
 adamant.transactionSign = function (trs, keypair) {
-  var hash = this.getHash(trs)
+  const hash = this.getHash(trs)
   return this.sign(hash, keypair).toString('hex')
 }
 adamant.chatGetBytes = function (trs) {
-  var buf
+  let buf
 
   try {
     buf = Buffer.from([])
-    var messageBuf = Buffer.from(trs.asset.chat.message, 'hex')
+    const messageBuf = Buffer.from(trs.asset.chat.message, 'hex')
     buf = Buffer.concat([buf, messageBuf])
 
     if (trs.asset.chat.own_message) {
-      var ownMessageBuf = Buffer.from(trs.asset.chat.own_message, 'hex')
+      const ownMessageBuf = Buffer.from(trs.asset.chat.own_message, 'hex')
       buf = Buffer.concat([buf, ownMessageBuf])
     }
-    var bb = new ByteBuffer(4 + 4, true)
+    const bb = new ByteBuffer(4 + 4, true)
     bb.writeInt(trs.asset.chat.type)
     bb.flip()
     buf = Buffer.concat([buf, Buffer.from(bb.toBuffer())])
@@ -255,7 +256,7 @@ adamant.delegateGetBytes = function (trs) {
   if (!trs.asset.delegate.username) {
     return null
   }
-  var buf
+  let buf
 
   try {
     buf = Buffer.from(trs.asset.delegate.username, 'utf8')
@@ -269,10 +270,10 @@ adamant.voteGetBytes = function (trs) {
   if (!trs.asset.votes || trs.asset.votes.length === 0) {
     return null
   }
-  var buf
+  let buf
   try {
     buf = Buffer.from([])
-    for (let i in trs.asset.votes) {
+    for (const i in trs.asset.votes) {
       buf = Buffer.concat([buf, Buffer.from(trs.asset.votes[i], 'utf8')])
     }
   } catch (e) {
@@ -285,19 +286,19 @@ adamant.stateGetBytes = function (trs) {
   if (!trs.asset.state.value) {
     return null
   }
-  var buf
+  let buf
 
   try {
     buf = Buffer.from([])
-    var stateBuf = Buffer.from(trs.asset.state.value)
+    const stateBuf = Buffer.from(trs.asset.state.value)
     buf = Buffer.concat([buf, stateBuf])
 
     if (trs.asset.state.key) {
-      var keyBuf = Buffer.from(trs.asset.state.key)
+      const keyBuf = Buffer.from(trs.asset.state.key)
       buf = Buffer.concat([buf, keyBuf])
     }
 
-    var bb = new ByteBuffer(4 + 4, true)
+    const bb = new ByteBuffer(4 + 4, true)
     bb.writeInt(trs.asset.state.type)
     bb.flip()
 
@@ -403,7 +404,7 @@ adamant.encodeValue = function (value, privateKey) {
   sodium.randombytes(nonce)
 
   // for some reason calling `JSON.stringify` directly breaks the module compilation.
-  const padded = randomString() + JSON['stringify']({ payload: value }) + randomString()
+  const padded = randomString() + JSON.stringify({ payload: value }) + randomString()
 
   const plainText = Buffer.from(padded)
   const secretKey = ed2curve.convertSecretKey(sodium.crypto_hash_sha256(privateKey))
diff --git a/src/lib/bignumber.js b/src/lib/bignumber.js
index a4207ecd9..9121e85fa 100644
--- a/src/lib/bignumber.js
+++ b/src/lib/bignumber.js
@@ -18,9 +18,9 @@ import BigNumber from 'bignumber.js'
 BigNumber.fromBuffer = function (buf, opts) {
   if (!opts) opts = {}
 
-  var endian = { 1: 'big', '-1': 'little' }[opts.endian] || opts.endian || 'big'
+  const endian = { 1: 'big', '-1': 'little' }[opts.endian] || opts.endian || 'big'
 
-  var size = opts.size === 'auto' ? Math.ceil(buf.length) : (opts.size || 1)
+  const size = opts.size === 'auto' ? Math.ceil(buf.length) : (opts.size || 1)
 
   if (buf.length % size !== 0) {
     throw new RangeError('Buffer length (' + buf.length + ')' +
@@ -28,10 +28,10 @@ BigNumber.fromBuffer = function (buf, opts) {
     )
   }
 
-  var hex = []
-  for (var i = 0; i < buf.length; i += size) {
-    var chunk = []
-    for (var j = 0; j < size; j++) {
+  const hex = []
+  for (let i = 0; i < buf.length; i += size) {
+    const chunk = []
+    for (let j = 0; j < size; j++) {
       chunk.push(buf[i + (endian === 'big' ? j : (size - j - 1))])
     }
 
@@ -52,15 +52,16 @@ BigNumber.fromBuffer = function (buf, opts) {
  * @return {ArrayBuffer} new buffer | error message invalid option
  */
 BigNumber.prototype.toBuffer = function (opts) {
+  let buf, len
   if (typeof opts === 'string') {
     if (opts !== 'mpint') return 'Unsupported Buffer representation'
 
-    var abs = this.abs()
-    var buf = abs.toBuffer({ size: 1, endian: 'big' })
-    var len = buf.length === 1 && buf[0] === 0 ? 0 : buf.length
+    const abs = this.abs()
+    buf = abs.toBuffer({ size: 1, endian: 'big' })
+    len = buf.length === 1 && buf[0] === 0 ? 0 : buf.length
     if (buf[0] & 0x80) len++
 
-    var ret = Buffer.alloc(4 + len)
+    const ret = Buffer.alloc(4 + len)
     if (len > 0) buf.copy(ret, 4 + (buf[0] & 0x80 ? 1 : 0))
     if (buf[0] & 0x80) ret[4] = 0
 
@@ -70,9 +71,9 @@ BigNumber.prototype.toBuffer = function (opts) {
     ret[3] = len & (0xff << 0)
 
     // Two's compliment for negative integers
-    var isNeg = this.lt(0)
+    const isNeg = this.lt(0)
     if (isNeg) {
-      for (var i = 4; i < ret.length; i++) {
+      for (let i = 4; i < ret.length; i++) {
         ret[i] = 0xff - ret[i]
       }
     }
@@ -84,16 +85,16 @@ BigNumber.prototype.toBuffer = function (opts) {
 
   if (!opts) opts = {}
 
-  var endian = { 1: 'big', '-1': 'little' }[opts.endian] || opts.endian || 'big'
+  const endian = { 1: 'big', '-1': 'little' }[opts.endian] || opts.endian || 'big'
 
-  var hex = this.toString(16)
+  let hex = this.toString(16)
   if (hex.charAt(0) === '-') {
     throw new Error(
       'Converting negative numbers to Buffers not supported yet'
     )
   }
 
-  var size = opts.size === 'auto' ? Math.ceil(hex.length / 2) : (opts.size || 1)
+  const size = opts.size === 'auto' ? Math.ceil(hex.length / 2) : (opts.size || 1)
 
   len = Math.ceil(hex.length / (2 * size)) * size
   buf = Buffer.alloc(len)
@@ -107,7 +108,7 @@ BigNumber.prototype.toBuffer = function (opts) {
 
   hx.forEach(function (chunk, i) {
     for (let j = 0; j < size; j++) {
-      let ix = i * size + (endian === 'big' ? j : size - j - 1)
+      const ix = i * size + (endian === 'big' ? j : size - j - 1)
       buf[ix] = parseInt(chunk.slice(j * 2, j * 2 + 2), 16)
     }
   })
diff --git a/src/lib/bitcoin/bitcoin-utils.js b/src/lib/bitcoin/bitcoin-utils.js
index 70f73eeb8..2bd329703 100644
--- a/src/lib/bitcoin/bitcoin-utils.js
+++ b/src/lib/bitcoin/bitcoin-utils.js
@@ -1,4 +1,4 @@
-import bitcoin from 'bitcoinjs-lib'
+import * as bitcoin from 'bitcoinjs-lib'
 
 /**
  * Checks if the supplied string is a valid BTC address
diff --git a/src/lib/bitcoin/btc-base-api.js b/src/lib/bitcoin/btc-base-api.js
index c18404ebc..71fd92c58 100644
--- a/src/lib/bitcoin/btc-base-api.js
+++ b/src/lib/bitcoin/btc-base-api.js
@@ -1,4 +1,4 @@
-import bitcoin from 'bitcoinjs-lib'
+import * as bitcoin from 'bitcoinjs-lib'
 import axios from 'axios'
 
 import networks from './networks'
@@ -170,24 +170,30 @@ export default class BtcBaseApi {
 
   _mapTransaction (tx) {
     // Remove курьи txs like "possibleDoubleSpend" and txs without info
-    if (tx.possibleDoubleSpend || (!tx.hash && !tx.time && !tx.valueIn)) return
+    if (tx.possibleDoubleSpend || (!tx.txid && !tx.time && !tx.valueIn && !tx.vin)) return
 
-    const senders = getUnique(tx.vin.map(x => x.addr)).filter(sender => sender !== undefined && sender !== 'undefined')
+    const addressField = tx.vin[0].address ? 'address' : 'addr'
+    const senders = getUnique(tx.vin.map(input => input[addressField])).filter(sender => sender !== undefined && sender !== 'undefined')
 
     const direction = senders.includes(this._address) ? 'from' : 'to'
 
     const recipients = getUnique(tx.vout.reduce((list, out) => {
       list.push(...out.scriptPubKey.addresses)
       return list
-    }, [])).filter(sender => sender !== undefined && sender !== 'undefined')
+    }, [])).filter(recipient => recipient !== undefined && recipient !== 'undefined')
 
     if (direction === 'from') {
-      // Disregard our address for the outgoing transaction unless it's the only address
-      // (i.e. we're sending to ourselves)
+      // Disregard our address for an outgoing transaction unless it's the only address (i.e. we're sending to ourselves)
       const idx = recipients.indexOf(this._address)
       if (idx >= 0 && recipients.length > 1) recipients.splice(idx, 1)
     }
 
+    if (direction === 'to' && senders.length === 1) {
+      // Disregard the only sender address for an incoming transaction unless it's the only address (i.e. we're sending to ourselves)
+      const idx = recipients.indexOf(senders[0])
+      if (idx >= 0 && recipients.length > 1) recipients.splice(idx, 1)
+    }
+
     let senderId, recipientId
     if (direction === 'from') {
       senderId = this._address
@@ -200,7 +206,7 @@ export default class BtcBaseApi {
     // Calculate amount from outputs:
     // * for the outgoing transactions take outputs that DO NOT target us
     // * for the incoming transactions take outputs that DO target us
-    let amount = tx.vout.reduce((sum, t) =>
+    const amount = tx.vout.reduce((sum, t) =>
       ((direction === 'to') === (t.scriptPubKey.addresses.includes(this._address)) ? sum + Number(t.value) : sum), 0)
 
     const confirmations = tx.confirmations
@@ -213,13 +219,13 @@ export default class BtcBaseApi {
       fee = totalIn - totalOut
     }
 
-    let height = tx.height
+    const height = tx.height
 
     return {
       id: tx.txid,
       hash: tx.txid,
       fee,
-      status: confirmations > 0 ? 'SUCCESS' : 'REGISTERED',
+      status: confirmations > 0 ? 'CONFIRMED' : 'REGISTERED',
       timestamp,
       direction,
       senders,
@@ -228,7 +234,10 @@ export default class BtcBaseApi {
       recipientId,
       amount,
       confirmations,
-      height
+      height,
+      instantlock: tx.instantlock,
+      instantlock_internal: tx.instantlock_internal,
+      instantsend: tx.instantlock
     }
   }
 }
diff --git a/src/lib/chatHelpers.js b/src/lib/chatHelpers.js
index 56aa25f30..2bf404f80 100644
--- a/src/lib/chatHelpers.js
+++ b/src/lib/chatHelpers.js
@@ -185,7 +185,12 @@ export function transformMessage (abstract) {
   transaction.recipientId = abstract.recipientId
   transaction.admTimestamp = abstract.timestamp
   transaction.timestamp = getRealTimestamp(abstract.timestamp)
-  transaction.status = abstract.status || abstract.height ? TS.CONFIRMED : TS.DELIVERED
+  transaction.confirmations = abstract.confirmations
+  transaction.status = abstract.height || abstract.confirmations > 0
+    ? TS.CONFIRMED
+    : abstract.status
+      ? abstract.status
+      : TS.REGISTERED
   transaction.i18n = !!abstract.i18n
   transaction.amount = abstract.amount ? abstract.amount : 0
   transaction.message = ''
diff --git a/src/lib/constants.js b/src/lib/constants.js
index 2c8a37d1f..0ad95dc56 100644
--- a/src/lib/constants.js
+++ b/src/lib/constants.js
@@ -59,6 +59,10 @@ export const LSK_BASED = Object.freeze([
   Cryptos.LSK
 ])
 
+export const INSTANT_SEND = Object.freeze([
+  Cryptos.DASH
+])
+
 export const isErc20 = crypto => ERC20.includes(crypto)
 
 export const isEthBased = crypto => isErc20(crypto) || crypto === Cryptos.ETH
@@ -71,6 +75,8 @@ export const isLskBased = crypto => LSK_BASED.includes(crypto)
 
 export const isSelfTxAllowed = crypto => LSK_BASED.includes(crypto) || crypto === Cryptos.ADM
 
+export const isInstantSendPossible = crypto => INSTANT_SEND.includes(crypto)
+
 /** Number of decimal places for the different crypto amounts */
 export const CryptoAmountPrecision = {
   ADM: 8,
@@ -140,14 +146,11 @@ export const WelcomeMessage = {
  */
 
 /** Gas limit value for the ETH transfers */
-export const ETH_TRANSFER_GAS = 22000 // Default gas limit; while to be calculated with estimateGas(transactionObject)
+export const ETH_TRANSFER_GAS = 24000
 /** Gas limit value for the ERC-20 transfers */
-export const ERC20_TRANSFER_GAS = ETH_TRANSFER_GAS * 2
+export const ERC20_TRANSFER_GAS = ETH_TRANSFER_GAS * 2.4
 
-/** Gas price multiplier. To be sure a transaction will be confirmed */
-export const ETH_GASPRICE_MULTIPLIER = 1.1
-
-/** Increase fee multiplier. Used in SendFundsForm */
+/** Increase fee multiplier. Used as a checkbox on SendFundsForm */
 export const INCREASE_FEE_MULTIPLIER = 2
 
 export default {
@@ -164,24 +167,29 @@ export const UserPasswordHashSettings = {
   DIGEST: 'sha512'
 }
 
+/** Status of ADM or coin transaction */
 export const TransactionStatus = {
-  CONFIRMED: 'confirmed',
-  PENDING: 'pending',
-  DELIVERED: 'delivered',
-  REGISTERED: 'registered', // ~DELIVERED
-  REJECTED: 'rejected',
-  ERROR: 'error', // ~REJECTED
-  INVALID: 'invalid',
-  UNKNOWN: 'unknown' // We don't recognize a cryptocurrency
+  CONFIRMED: 'CONFIRMED', // Tx has at least 1 network confirmation
+  PENDING: 'PENDING', // We don't know about this Tx anything yet, it may not exist in a blockchain
+  REGISTERED: 'REGISTERED', // This Ts is seen on a blockchain, but has 0 confirmations yet
+  REJECTED: 'REJECTED', // We unable to find this Tx in a blockchain, or it says it was rejected
+  INVALID: 'INVALID', // Wrong sender, recipient, time or amount
+  UNKNOWN: 'UNKNOWN' // We don't recognize a cryptocurrency
+}
+
+/** Additional status of ADM or coin transaction, which leads to new virtualStatus */
+export const TransactionAdditionalStatus = {
+  NONE: false,
+  INSTANT_SEND: 'instant_send', // Dash InstantSend enabled transaction
+  ADM_REGISTERED: 'adm_registered' // ADM tx, registered in a blockchain, but has 0 confirmations yet
 }
 
 export const tsIcon = function (status) {
-  status = status.toLowerCase()
   if (status === TransactionStatus.CONFIRMED) {
     return 'mdi-check'
-  } else if (status === TransactionStatus.PENDING || status === TransactionStatus.DELIVERED || status === TransactionStatus.REGISTERED) {
+  } else if (status === TransactionStatus.PENDING || status === TransactionStatus.REGISTERED) {
     return 'mdi-clock-outline'
-  } else if (status === TransactionStatus.REJECTED || status === TransactionStatus.ERROR) {
+  } else if (status === TransactionStatus.REJECTED) {
     return 'mdi-close-circle-outline'
   } else if (status === TransactionStatus.INVALID) {
     return 'mdi-alert-outline'
@@ -191,8 +199,7 @@ export const tsIcon = function (status) {
 }
 
 export const tsColor = function (status) {
-  status = status.toLowerCase()
-  if (status === TransactionStatus.REJECTED || status === TransactionStatus.ERROR) {
+  if (status === TransactionStatus.REJECTED) {
     return 'red'
   } else if (status === TransactionStatus.INVALID || status === TransactionStatus.UNKNOWN) {
     return 'yellow'
@@ -202,14 +209,13 @@ export const tsColor = function (status) {
 
 export const tsUpdatable = function (status, currency) {
   currency = currency.toUpperCase()
-  status = status.toLowerCase()
   if (currency === Cryptos.ADM) {
     return false
   } else if (status === TransactionStatus.CONFIRMED) {
     return true
-  } else if (status === TransactionStatus.PENDING || status === TransactionStatus.DELIVERED || status === TransactionStatus.REGISTERED) {
+  } else if (status === TransactionStatus.PENDING || status === TransactionStatus.REGISTERED) {
     return false
-  } else if (status === TransactionStatus.REJECTED || status === TransactionStatus.ERROR) {
+  } else if (status === TransactionStatus.REJECTED) {
     return true
   } else if (status === TransactionStatus.INVALID) {
     return true
diff --git a/src/lib/eth-index.js b/src/lib/eth-index.js
index b081b225f..6f63e27b3 100644
--- a/src/lib/eth-index.js
+++ b/src/lib/eth-index.js
@@ -48,7 +48,7 @@ export function getTransactions (options) {
     )
   } else {
     filters.push(
-      `contract_to.eq.`,
+      'contract_to.eq.',
       `or(txfrom.eq.${address},txto.eq.${address})`
     )
   }
@@ -135,7 +135,7 @@ function parseTxFromIndex (tx, decimals) {
     recipientId,
     amount: utils.toFraction(value, decimals),
     fee: utils.calculateFee(tx.gas, tx.gasprice),
-    status: 'SUCCESS',
+    status: 'CONFIRMED',
     timestamp: tx.time * 1000,
     blockNumber: tx.block,
     time: tx.time
diff --git a/src/lib/eth-utils.js b/src/lib/eth-utils.js
index be50ae5ea..de261b73a 100644
--- a/src/lib/eth-utils.js
+++ b/src/lib/eth-utils.js
@@ -1,17 +1,16 @@
-import * as bip39 from 'bip39'
 import hdkey from 'hdkey'
-import Web3 from 'web3'
-import { BN, bufferToHex, privateToAddress } from 'ethereumjs-util'
+import web3Utils from 'web3-utils'
+import BigNumber from 'bignumber.js'
+import cache from '@/store/cache.js'
 
 const HD_KEY_PATH = "m/44'/60'/3'/1/0"
-const web3 = new Web3()
 
 /**
  * Converts Wei amount to Ether.
  * @param {string | number} wei Wei amount
  */
 export function toEther (wei) {
-  return web3.fromWei(String(wei), 'ether')
+  return web3Utils.fromWei(String(wei), 'ether')
 }
 
 /**
@@ -19,31 +18,47 @@ export function toEther (wei) {
  * @param {string | number} eth Ether amount
  */
 export function toWei (eth) {
-  return web3.toWei(String(eth), 'ether')
+  return web3Utils.toWei(String(eth), 'ether')
 }
 
 /**
  * Generates a ETH account from the passphrase specified.
+ * bip39.mnemonicToSeedSync is time consuming, so we use cached value, if possible
  * @param {string} passphrase user-defined passphrase
  * @returns {{address: string, privateKey: string}}
  */
-export function getAccountFromPassphrase (passphrase) {
-  const seed = bip39.mnemonicToSeedSync(passphrase)
-  const privateKey = hdkey.fromMasterSeed(seed).derive(HD_KEY_PATH)._privateKey
+export function getAccountFromPassphrase (passphrase, api) {
+  const seed = cache.mnemonicToSeedSync(passphrase)
+  const privateKey = web3Utils.bytesToHex(hdkey.fromMasterSeed(seed).derive(HD_KEY_PATH)._privateKey)
+  const web3Account = api.accounts.privateKeyToAccount(privateKey)
 
   return {
-    address: bufferToHex(privateToAddress(privateKey)),
-    privateKey: bufferToHex(privateKey)
+    web3Account,
+    address: web3Account.address,
+    privateKey
   }
 }
 
+/**
+ * Calculates Tx fee in ETH (not in wei) based on gas price and used gas.
+ * @param {string|number} gasUsed used gas, generally number, i. e., 51823
+ * @param {string|number} gasPrice gas price in wei. May be string, hex or dec number, i. e., "0x342770c00" (14000000000 wei)
+ * @returns {string} fee in ETH
+ */
 export function calculateFee (gasUsed, gasPrice) {
-  const gas = new BN(+gasUsed, 10)
-  const price = new BN(+gasPrice, 10)
-  const fee = gas.mul(price).toString(10)
+  const gas = BigNumber(gasUsed, 10)
+  const price = BigNumber(gasPrice, 10)
+  const fee = gas.times(price).toString(10)
   return toEther(fee)
 }
 
+/**
+ * Transforms amount in token to sats.
+ * Used for ERC20 tokens. I. e., 1.00035 RES = 100035 res-sats.
+ * @param {string|number} amount value in token
+ * @param {string|number} decimals decimal places for token's contract
+ * @returns {string} value in sats
+ */
 export function toWhole (amount, decimals) {
   let [whole, fraction] = Number(amount).toFixed(decimals).replace(/0+$/, '').split('.')
   if (!whole) whole = '0'
@@ -53,14 +68,22 @@ export function toWhole (amount, decimals) {
     fraction += '0'
   }
 
-  const num = new BN(whole, 10)
-    .mul(new BN(10, 10).pow(new BN(decimals, 10)))
-    .add(new BN(fraction, 10))
+  const num = BigNumber(whole, 10)
+    .times(BigNumber(10, 10).pow(BigNumber(decimals, 10)))
+    .plus(BigNumber(fraction, 10))
     .toString(10)
 
   return num
 }
 
+/**
+ * Transforms amount in token-sats to token.
+ * Used for ERC20 tokens. I. e., 100035 res-sats = 1.00035 RES.
+ * @param {string|number} amount value in sats
+ * @param {string|number} decimals decimal places for token's contract
+ * @param {string} separator decimal separator sign
+ * @returns {string} value in token
+ */
 export function toFraction (amount, decimals, separator = '.') {
   amount = `${amount}`
   const len = amount.length
@@ -79,12 +102,6 @@ export function toFraction (amount, decimals, separator = '.') {
   return whole + (fraction ? separator + fraction : '')
 }
 
-export function promisify (func, ...args) {
-  return new Promise((resolve, reject) => {
-    func(...args, (error, result) => error ? reject(error) : resolve(result))
-  })
-}
-
 export class BatchQueue {
   constructor (createBatchRequest) {
     this._createBatchRequest = createBatchRequest
@@ -96,7 +113,7 @@ export class BatchQueue {
     if (typeof supplier !== 'function') return
     if (this._queue.some(x => x.key === key)) return
 
-    let requests = supplier()
+    const requests = supplier()
     this._queue.push({ key, requests: Array.isArray(requests) ? requests : [requests] })
   }
 
diff --git a/src/lib/formatters.js b/src/lib/formatters.js
index e41947471..bb254ca2a 100644
--- a/src/lib/formatters.js
+++ b/src/lib/formatters.js
@@ -1,15 +1,15 @@
 import { EPOCH } from './constants'
 
 function getTime (date) {
-  var hours = date.getHours()
-  var time = ''
+  const hours = date.getHours()
+  let time = ''
   if (hours < 10) {
     time = '0' + hours
   } else {
     time = '' + hours
   }
   time = time + ':'
-  var minutes = date.getMinutes()
+  const minutes = date.getMinutes()
   if (minutes < 10) {
     time = time + '0' + minutes
   } else {
@@ -39,9 +39,9 @@ function formatDate (timestamp) {
     return this.$t('chats.date_yesterday') + ', ' + getTime(date)
   }
 
-  let options = { 'weekday': 'short' }
+  let options = { weekday: 'short' }
   if ((Date.now() - timestamp) > (4 * 3600 * 24 * 1000)) {
-    options = { 'day': 'numeric', 'month': 'short' }
+    options = { day: 'numeric', month: 'short' }
   }
 
   if (startToday.getFullYear() !== date.getFullYear()) {
diff --git a/src/lib/idb/db.js b/src/lib/idb/db.js
index 1dcefd116..360ccdea2 100644
--- a/src/lib/idb/db.js
+++ b/src/lib/idb/db.js
@@ -1,17 +1,19 @@
-import { openDb } from 'idb'
+import { openDB } from 'idb'
 
 const DB_NAME = 'adm'
 const DB_VERSION = 1
 
-const dbPromise = openDb(DB_NAME, DB_VERSION, upgradeDB => {
-  if (!upgradeDB.objectStoreNames.contains('security')) {
-    upgradeDB.createObjectStore('security', { keyPath: 'name', autoIncrement: true })
-  }
-  if (!upgradeDB.objectStoreNames.contains('common')) {
-    upgradeDB.createObjectStore('common', { keyPath: 'name', autoIncrement: true })
-  }
-  if (!upgradeDB.objectStoreNames.contains('chatList')) {
-    upgradeDB.createObjectStore('chatList', { keyPath: 'name', autoIncrement: true })
+const dbPromise = openDB(DB_NAME, DB_VERSION, {
+  upgrade (db, oldVersion, newVersion, transaction) {
+    if (!db.objectStoreNames.contains('security')) {
+      db.createObjectStore('security', { keyPath: 'name', autoIncrement: true })
+    }
+    if (!db.objectStoreNames.contains('common')) {
+      db.createObjectStore('common', { keyPath: 'name', autoIncrement: true })
+    }
+    if (!db.objectStoreNames.contains('chatList')) {
+      db.createObjectStore('chatList', { keyPath: 'name', autoIncrement: true })
+    }
   }
 })
 
diff --git a/src/lib/idb/state.js b/src/lib/idb/state.js
index e968ab1bc..91392be59 100644
--- a/src/lib/idb/state.js
+++ b/src/lib/idb/state.js
@@ -14,7 +14,7 @@ const modules = ['adm', 'eth', 'doge', 'lsk', 'bnb', 'bz', 'dash', 'kcs', 'usds'
  * @returns {Array<{ name: string, value: string }>}
  */
 function cloneModules (state) {
-  let modulesToStore = []
+  const modulesToStore = []
 
   // clone all modules
   modules.forEach(moduleName => {
@@ -52,7 +52,7 @@ function cloneModules (state) {
  * @returns {Array<{ name: string, value: string }>}
  */
 function cloneChats (state) {
-  let chats = []
+  const chats = []
 
   if (state.chat) {
     const keys = Object.keys(state.chat.chats)
@@ -74,7 +74,7 @@ function cloneChats (state) {
  * @returns {Array<{ name: string, value: string }>}
  */
 function cloneSecurity (state) {
-  let security = []
+  const security = []
 
   security.push({
     name: 'passphrase',
@@ -125,7 +125,7 @@ function saveState (store) {
  * @returns {Promise}
  */
 function restoreState (store) {
-  let restoredState = {}
+  const restoredState = {}
 
   const promises = Promise.all([
     Modules.getAll(),
diff --git a/src/lib/identicon.js b/src/lib/identicon.js
index ca1d2684a..a02275cb9 100644
--- a/src/lib/identicon.js
+++ b/src/lib/identicon.js
@@ -50,17 +50,18 @@ export default class Identicon {
       this.Hexa16(key, size || 40)
     }
   }
+
   Hexa16 (key, size) {
-    let fringeSize = size / 6
-    let distance = this.distanceTo3rdPoint(fringeSize)
-    let lines = size / fringeSize
-    let offset = ((fringeSize - distance) * lines) / 2
-    let fillTriangle = this.triangleColors(0, key, Math.trunc(lines))
-    let transparent = 'rgba(0, 0, 0, 0)'
-    let isLeft = v => v % 2 === 0
-    let isRight = v => v % 2 !== 0
-    let L = Math.trunc(lines)
-    let hL = L / 2
+    const fringeSize = size / 6
+    const distance = this.distanceTo3rdPoint(fringeSize)
+    const lines = size / fringeSize
+    const offset = ((fringeSize - distance) * lines) / 2
+    const fillTriangle = this.triangleColors(0, key, Math.trunc(lines))
+    const transparent = 'rgba(0, 0, 0, 0)'
+    const isLeft = v => v % 2 === 0
+    const isRight = v => v % 2 !== 0
+    const L = Math.trunc(lines)
+    const hL = L / 2
     let xL = 0
     let yL = 0
     for (xL = 0; xL < hL; xL++) {
@@ -68,42 +69,42 @@ export default class Identicon {
         /* if (this.isOutsideHexagon(xL, yL, Math.trunc(lines))) {
           continue
         } */
-        var x1, x2, y1, y2, y3
+        let x1, x2, y1, y2, y3
         if (xL % 2 === 0) {
-          let result = this.right1stTriangle(xL, yL, fringeSize, distance)
+          const result = this.right1stTriangle(xL, yL, fringeSize, distance)
           x1 = result.x1
           y1 = result.y1
           x2 = result.x2
           y2 = result.y2
           y3 = result.y3
         } else {
-          let result = this.left1stTriangle(xL, yL, fringeSize, distance)
+          const result = this.left1stTriangle(xL, yL, fringeSize, distance)
           x1 = result.x1
           y1 = result.y1
           x2 = result.x2
           y2 = result.y2
           y3 = result.y3
         }
-        let xs = [x2 + offset, x1 + offset, x2 + offset]
-        let ys = [y1, y2, y3]
+        const xs = [x2 + offset, x1 + offset, x2 + offset]
+        const ys = [y1, y2, y3]
         let fill = this.canFill(xL, yL, fillTriangle, isLeft, isRight)
         if (fill) {
           this.Polygon(xs, ys, fill)
         } else {
           this.Polygon(xs, ys, transparent)
         }
-        let xsMirror = this.mirrorCoordinates(xs, lines, distance, offset * 2)
-        let xLMirror = lines - xL - 1.0
-        let yLMirror = yL
+        const xsMirror = this.mirrorCoordinates(xs, lines, distance, offset * 2)
+        const xLMirror = lines - xL - 1.0
+        const yLMirror = yL
         fill = this.canFill(Math.trunc(xLMirror), yLMirror, fillTriangle, isLeft, isRight)
         if (fill) {
           this.Polygon(xsMirror, ys, fill)
         } else {
           this.Polygon(xsMirror, ys, transparent)
         }
-        var x11, x12, y11, y12, y13
+        let x11, x12, y11, y12, y13
         if (xL % 2 === 0) {
-          let result = this.left2ndTriangle(xL, yL, fringeSize, distance)
+          const result = this.left2ndTriangle(xL, yL, fringeSize, distance)
           x11 = result.x1
           y11 = result.y1
           x12 = result.x2
@@ -113,7 +114,7 @@ export default class Identicon {
           // we make sure that the previous triangle and this one touch each other in this point.
           y12 = y3
         } else {
-          let result = this.right2ndTriangle(xL, yL, fringeSize, distance)
+          const result = this.right2ndTriangle(xL, yL, fringeSize, distance)
           x11 = result.x1
           y11 = result.y1
           x12 = result.x2
@@ -123,8 +124,8 @@ export default class Identicon {
           // we make sure that the previous triangle and this one touch each other in this point.
           y12 = y1 + fringeSize
         }
-        var xs1 = [x12 + offset, x11 + offset, x12 + offset]
-        let ys1 = [y11, y12, y13]
+        let xs1 = [x12 + offset, x11 + offset, x12 + offset]
+        const ys1 = [y11, y12, y13]
         // triangles that go to the right
         fill = this.canFill(xL, yL, fillTriangle, isRight, isLeft)
         if (fill) {
@@ -142,11 +143,12 @@ export default class Identicon {
       }
     }
   }
+
   Polygon (xs, ys, color) {
     this.cache.beginPath()
     for (let i = 0; i < xs.length; i++) {
-      let x = xs[i]
-      let y = ys[i]
+      const x = xs[i]
+      const y = ys[i]
       if (i === 0) {
         this.cache.moveTo(x, y)
       } else {
@@ -156,104 +158,115 @@ export default class Identicon {
     this.cache.fillStyle = color
     this.cache.fill()
   }
+
   distanceTo3rdPoint (AC) {
     // distance from center of vector to third point of equilateral triangles
     // ABC triangle, O is the center of AB vector
     // OC = SQRT(AC^2 - AO^2)
     return Math.ceil(Math.sqrt((AC * AC) - (AC / 2 * AC / 2)))
   }
+
   // right1stTriangle computes a right oriented triangle '>'
   right1stTriangle (xL, yL, fringeSize, distance) {
-    let x1 = xL * distance
-    let x2 = xL * distance + distance
-    let x3 = x1
-    let y1 = yL * fringeSize
-    let y2 = y1 + fringeSize / 2
-    let y3 = yL * fringeSize + fringeSize
+    const x1 = xL * distance
+    const x2 = xL * distance + distance
+    const x3 = x1
+    const y1 = yL * fringeSize
+    const y2 = y1 + fringeSize / 2
+    const y3 = yL * fringeSize + fringeSize
     return { x1, y1, x2, y2, x3, y3 }
   }
+
   // left1stTriangle computes the coordinates of a left oriented triangle '<'
   left1stTriangle (xL, yL, fringeSize, distance) {
-    let x1 = xL * distance + distance
-    let x2 = xL * distance
-    let x3 = x1
-    let y1 = yL * fringeSize
-    let y2 = y1 + fringeSize / 2
-    let y3 = yL * fringeSize + fringeSize
+    const x1 = xL * distance + distance
+    const x2 = xL * distance
+    const x3 = x1
+    const y1 = yL * fringeSize
+    const y2 = y1 + fringeSize / 2
+    const y3 = yL * fringeSize + fringeSize
     return { x1, y1, x2, y2, x3, y3 }
   }
+
   // left2ndTriangle computes the coordinates of a left oriented triangle '<'
   left2ndTriangle (xL, yL, fringeSize, distance) {
-    let x1 = xL * distance + distance
-    let x2 = xL * distance
-    let x3 = x1
-    let y1 = yL * fringeSize + fringeSize / 2
-    let y2 = y1 + fringeSize / 2
-    let y3 = yL * fringeSize + fringeSize + fringeSize / 2
+    const x1 = xL * distance + distance
+    const x2 = xL * distance
+    const x3 = x1
+    const y1 = yL * fringeSize + fringeSize / 2
+    const y2 = y1 + fringeSize / 2
+    const y3 = yL * fringeSize + fringeSize + fringeSize / 2
     return { x1, y1, x2, y2, x3, y3 }
   }
+
   // right2ndTriangle computes the coordinates of a right oriented triangle '>'
   right2ndTriangle (xL, yL, fringeSize, distance) {
-    let x1 = xL * distance
-    let x2 = xL * distance + distance
-    let x3 = x1
-    let y1 = yL * fringeSize + fringeSize / 2
-    let y2 = yL + fringeSize
-    let y3 = yL * fringeSize + fringeSize / 2 + fringeSize
+    const x1 = xL * distance
+    const x2 = xL * distance + distance
+    const x3 = x1
+    const y1 = yL * fringeSize + fringeSize / 2
+    const y2 = yL + fringeSize
+    const y3 = yL * fringeSize + fringeSize / 2 + fringeSize
     return { x1, y1, x2, y2, x3, y3 }
   }
+
   mirrorCoordinates (xs, lines, fringeSize, offset) {
-    var xsMirror = []
+    const xsMirror = []
     for (let i = 0; i < xs.length; i++) {
       xsMirror.push((lines * fringeSize) - xs[i] + offset)
     }
     return xsMirror
   }
+
   triangleColors (id, key, lines) {
-    let keyHash = md5(key)
+    const keyHash = md5(key)
     /* if (keyHash.length !== 32) {
       throw new Error('AdamantIdenticon: Wrong md5 hash')
     } */
-    var tColors = []
-    var rawKeyArray = []
+    const tColors = []
+    const rawKeyArray = []
     for (const u of keyHash) {
       rawKeyArray.push(u.charCodeAt())
     }
     const reducer = (accum, crntValue) => accum + crntValue
-    let seed = this.scramble(rawKeyArray.reduce(reducer)) // sum of all values
+    const seed = this.scramble(rawKeyArray.reduce(reducer)) // sum of all values
     // process hash values to number array with 10 values. 1 - avatar color set (merge first 5), 2-10 - values for triange colors (merged by 3 values)
-    var keyArray = []
+    const keyArray = []
     keyArray.push(rawKeyArray.slice(0, 5).reduce(reducer)) // merge first 5
     for (let i = 5; i < 32; i += 3) {
       keyArray.push(rawKeyArray.slice(i, i + 3).reduce(reducer)) // merge rest by 3
     }
-    let setId = seed % this.getValue(keyHash, keyArray[0])
-    let colorsSet = this.colors[setId % this.colors.length]
+    const setId = seed % this.getValue(keyHash, keyArray[0])
+    const colorsSet = this.colors[setId % this.colors.length]
     for (let i = 0; i < Triangle.triangles[id].length; i++) {
-      let t = Triangle.triangles[id][i]
-      let x = t.x
-      let y = t.y
-      let index = x + 3 * y + lines + seed % this.getValue(keyHash, keyArray[i + 1])
-      let color = this.PickColor(keyHash, colorsSet, index)
+      const t = Triangle.triangles[id][i]
+      const x = t.x
+      const y = t.y
+      const index = x + 3 * y + lines + seed % this.getValue(keyHash, keyArray[i + 1])
+      const color = this.PickColor(keyHash, colorsSet, index)
       tColors.push(color)
     }
     return tColors
   }
+
   scramble (seed) {
-    let multiplier = 0x5DEEC
-    let mask = (1 << 30) - 1
+    const multiplier = 0x5DEEC
+    const mask = (1 << 30) - 1
     return (seed ^ multiplier) & mask
   }
+
   getValue (string, index) {
-    let s = String(string[index % string.length])
+    const s = String(string[index % string.length])
     return s.charCodeAt()
   }
+
   isOutsideHexagon (xL, yL, lines) {
     return !this.isFill1InHexagon(xL, yL, lines) && !this.isFill2InHexagon(xL, yL, lines)
   }
+
   isFill1InHexagon (xL, yL, lines) {
-    let half = lines / 2
-    let start = half / 2
+    const half = lines / 2
+    const start = half / 2
     if (xL < start + 1) {
       if (yL > start - 1 && yL < start + half + 1) {
         return true
@@ -266,9 +279,10 @@ export default class Identicon {
     }
     return false
   }
+
   isFill2InHexagon (xL, yL, lines) {
-    let half = lines / 2
-    let start = half / 2
+    const half = lines / 2
+    const start = half / 2
     if (xL < start) {
       if (yL > start - 1 && yL < start + half) {
         return true
@@ -286,16 +300,18 @@ export default class Identicon {
     }
     return false
   }
+
   // PickColor returns a color given a key string, an array of colors and an index.
   // key: should be a md5 hash string.
   // index: is an index from the key string.
   // Algorithm: PickColor converts the key[index] value to a decimal value.
   // We pick the ith colors that respects the equality value%numberOfColors == i.
   PickColor (key, colors, index) {
-    let n = colors.length
-    let i = this.PickIndex(key, n, index)
+    const n = colors.length
+    const i = this.PickIndex(key, n, index)
     return colors[i]
   }
+
   // PickIndex returns an index of given a key string, the size of an array of colors
   //  and an index.
   // key: should be a md5 hash string.
@@ -303,7 +319,7 @@ export default class Identicon {
   // Algorithm: PickIndex converts the key[index] value to a decimal value.
   // We pick the ith index that respects the equality value%sizeOfArray == i.
   PickIndex (key, n, index) {
-    let r = this.getValue(key, index)
+    const r = this.getValue(key, index)
     for (let i = 0; i < n; i++) {
       if (r % n === i) {
         return i
@@ -311,16 +327,17 @@ export default class Identicon {
     }
     return 0
   }
+
   // canFill returns a fill svg string given position. the fill is computed to be a rotation of the
   // triangle 0 with the 'fills' array given as param.
   canFill (x, y, fills, isLeft, isRight) {
-    let l = new Triangle(x, y, 'left')
-    let r = new Triangle(x, y, 'right')
+    const l = new Triangle(x, y, 'left')
+    const r = new Triangle(x, y, 'right')
     if (isLeft(x) && l.isInTriangle()) {
-      let rid = l.rotationID()
+      const rid = l.rotationID()
       return fills[rid]
     } else if (isRight(x) && r.isInTriangle()) {
-      let rid = r.rotationID()
+      const rid = r.rotationID()
       return fills[rid]
     }
     return null
@@ -331,19 +348,21 @@ class Triangle {
   constructor (x, y, direction) {
     this.x = x
     this.y = y
-    this.direction = { 'left': 0, 'right': 1 }[direction]
+    this.direction = { left: 0, right: 1 }[direction]
   }
+
   isInTriangle () {
     return this.triangleID() !== -1
   }
+
   // triangleID returns the triangle id (from 0 to 5)
   // that has a match with the position given as param.
   // returns -1 if a match is not found.
   triangleID () {
     for (let i = 0; i < Triangle.triangles.length; i++) {
-      let t = Triangle.triangles[i]
+      const t = Triangle.triangles[i]
       for (let i2 = 0; i2 < t.length; i2++) {
-        let ti = t[i2]
+        const ti = t[i2]
         if (ti.x === this.x && ti.y === this.y && this.direction === ti.direction) {
           return i
         }
@@ -351,14 +370,15 @@ class Triangle {
     }
     return -1
   }
+
   // subTriangleID returns the sub triangle id (from 0 to 8)
   // that has a match with the position given as param.
   // returns -1 if a match is not found.
   subTriangleID () {
     for (let i = 0; i < Triangle.triangles.length; i++) {
-      let t = Triangle.triangles[i]
+      const t = Triangle.triangles[i]
       for (let i2 = 0; i2 < t.length; i2++) {
-        let ti = t[i2]
+        const ti = t[i2]
         if (ti.x === this.x && ti.y === this.y && this.direction === ti.direction) {
           return i2
         }
@@ -366,8 +386,9 @@ class Triangle {
     }
     return -1
   }
+
   subTriangleRotations (lookforSubTriangleID) {
-    let m = {
+    const m = {
       0: [0, 6, 8, 8, 2, 0],
       1: [1, 2, 5, 7, 6, 3],
       2: [2, 0, 0, 6, 8, 8],
@@ -380,14 +401,15 @@ class Triangle {
     }
     return m[lookforSubTriangleID]
   }
+
   // rotationId returns the original sub triangle id
   // if the current triangle was rotated to position 0.
   rotationID () {
-    let currentTID = this.triangleID()
-    let currentSTID = this.subTriangleID()
-    let numberOfSubTriangles = 9
+    const currentTID = this.triangleID()
+    const currentSTID = this.subTriangleID()
+    const numberOfSubTriangles = 9
     for (let i = 0; i < numberOfSubTriangles; i++) {
-      let rotations = this.subTriangleRotations(i)
+      const rotations = this.subTriangleRotations(i)
       if (rotations) {
         if (rotations[currentTID] === currentSTID) {
           return i
diff --git a/src/lib/lisk/lisk-api.js b/src/lib/lisk/lisk-api.js
index cb4a04d54..49209271c 100644
--- a/src/lib/lisk/lisk-api.js
+++ b/src/lib/lisk/lisk-api.js
@@ -20,9 +20,9 @@ export const TX_CHUNK_SIZE = 25
 
 export function getAccount (crypto, passphrase) {
   const network = networks[crypto]
-  var liskSeed = pbkdf2.pbkdf2Sync(passphrase, LiskHashSettings.SALT, LiskHashSettings.ITERATIONS, LiskHashSettings.KEYLEN, LiskHashSettings.DIGEST)
-  var keyPair = sodium.crypto_sign_seed_keypair(liskSeed)
-  var address = cryptography.getAddressFromPublicKey(keyPair.publicKey)
+  const liskSeed = pbkdf2.pbkdf2Sync(passphrase, LiskHashSettings.SALT, LiskHashSettings.ITERATIONS, LiskHashSettings.KEYLEN, LiskHashSettings.DIGEST)
+  const keyPair = sodium.crypto_sign_seed_keypair(liskSeed)
+  const address = cryptography.getAddressFromPublicKey(keyPair.publicKey)
   return {
     network,
     keyPair,
@@ -41,7 +41,7 @@ export default class LiskApi extends LskBaseApi {
 
   /** @override */
   getBalance () {
-    return this._get(`/api/accounts`, { address: this.address }).then(
+    return this._get('/api/accounts', { address: this.address }).then(
       data => {
         if (data && data.data[0] && data.data[0].balance) {
           return (data.data[0].balance) / this.multiplier
@@ -65,7 +65,7 @@ export default class LiskApi extends LskBaseApi {
   /** @override */
   createTransaction (address = '', amount = 0, fee) {
     amount = transactions.utils.convertLSKToBeddows(amount.toString())
-    var liskTx = transactions.transfer({
+    const liskTx = transactions.transfer({
       amount,
       recipientId: address
       // data: 'Sent with ADAMANT Messenger'
@@ -78,7 +78,7 @@ export default class LiskApi extends LskBaseApi {
     const liskTxBytes = transactions.utils.getTransactionBytes(liskTx)
     const txSignature = cryptography.signDataWithPrivateKey(cryptography.hash(liskTxBytes), this._keyPair.secretKey)
     liskTx.signature = txSignature
-    var txid = transactions.utils.getTransactionId(liskTx)
+    const txid = transactions.utils.getTransactionId(liskTx)
     liskTx.id = txid
 
     return Promise.resolve({ hex: liskTx, txid })
@@ -93,7 +93,7 @@ export default class LiskApi extends LskBaseApi {
 
   /** @override */
   getTransaction (txid) {
-    return this._get(`/api/transactions`, { id: txid }).then(data => {
+    return this._get('/api/transactions', { id: txid }).then(data => {
       if (data && data.data[0]) {
         return this._mapTransaction(data.data[0])
       }
@@ -102,7 +102,7 @@ export default class LiskApi extends LskBaseApi {
 
   /** @override */
   getTransactions (options = { }) {
-    let url = `/api/transactions`
+    const url = '/api/transactions'
     options.limit = TX_CHUNK_SIZE
     options.type = 0
     options.senderIdOrRecipientId = this.address
@@ -115,7 +115,7 @@ export default class LiskApi extends LskBaseApi {
     // additional options: offset, height
     return this._get(url, options).then(transactions => {
       if (transactions && transactions.data) {
-        var mappedTxs = transactions.data.map(tx => this._mapTransaction(tx))
+        const mappedTxs = transactions.data.map(tx => this._mapTransaction(tx))
         return mappedTxs
       }
     })
diff --git a/src/lib/lisk/lsk-base-api.js b/src/lib/lisk/lsk-base-api.js
index a253261f1..6ed3afccc 100644
--- a/src/lib/lisk/lsk-base-api.js
+++ b/src/lib/lisk/lsk-base-api.js
@@ -1,5 +1,6 @@
 import axios from 'axios'
 import getEnpointUrl from '../getEndpointUrl'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 const createClient = url => {
   const client = axios.create({ baseURL: url })
@@ -103,13 +104,13 @@ export default class LskBaseApi {
   }
 
   _mapTransaction (tx) {
-    const direction = tx.senderId === this._address ? 'from' : 'to'
+    const direction = isStringEqualCI(tx.senderId, this._address) ? 'from' : 'to'
     // additional data: asset, receivedAt, blockId, height, type, recipientPublicKey, senderSecondPublicKey
     return {
       id: tx.id,
       hash: tx.id,
       fee: tx.fee,
-      status: tx.confirmations > 0 ? 'SUCCESS' : 'REGISTERED',
+      status: tx.confirmations > 0 ? 'CONFIRMED' : 'REGISTERED',
       timestamp: tx.timestamp,
       direction,
       senderId: tx.senderId,
diff --git a/src/lib/markdown.js b/src/lib/markdown.js
index d3f067fcf..1cd5ec29d 100644
--- a/src/lib/markdown.js
+++ b/src/lib/markdown.js
@@ -2,6 +2,7 @@ import marked from 'marked'
 import DOMPurify from 'dompurify'
 
 marked.setOptions({
+  // marked sanitize is deprecated, using DOMPurify
   // sanitize: true,
   gfm: true,
   breaks: true
@@ -31,16 +32,29 @@ renderer.heading = function (text) {
 }
 
 /**
- * Renders markdown-formatted input to HTML
+ * Sanitizes text to show HTML
+ * @param {string} text text to sanitize
+ * @returns {string} sanitized HTML
+ */
+export function sanitizeHTML (text = '') {
+  return DOMPurify.sanitize(text)
+}
+
+/**
+ * Renders markdown-formatted input to HTML, and sanitizes it
  * @param {string} text text to render
- * @returns {string} resulting HTML
+ * @returns {string} resulting sanitized HTML
  */
 export function renderMarkdown (text = '') {
-  // return marked(text, { renderer })
-  // return DOMPurify.sanitize(marked(text, { renderer }))
   return marked(DOMPurify.sanitize(text), { renderer })
 }
 
+/**
+ * Gets the first line of a message, sanitizes it, and returns back
+ * Used in ChatPreview and Notifications
+ * @param {string} text text to process
+ * @returns {string} resulting clear text of the first line
+ */
 export function removeFormats (text = '') {
   // get first line
   const line = /^([^\n]*)\n?/.exec(text)[1]
diff --git a/src/lib/notifications.js b/src/lib/notifications.js
index bfd2795b7..08b04061f 100644
--- a/src/lib/notifications.js
+++ b/src/lib/notifications.js
@@ -15,29 +15,37 @@ class Notification {
     this.store = ctx.$store
     this.interval = null
   }
+
   get lastUnread () {
     return this.store.getters['chat/lastUnreadMessage']
   }
+
   get partnerAddress () {
     return this.lastUnread && this.lastUnread.senderId
   }
+
   get partnerIdentity () {
     const isAdmChat = this.store.getters['chat/isAdamantChat'](this.partnerAddress)
     const name = this.store.getters['partners/displayName'](this.partnerAddress) || this.partnerAddress
     return isAdmChat ? this.i18n.t(name) : name
   }
+
   get pushAllowed () {
     return this.store.state.options.allowPushNotifications
   }
+
   get soundAllowed () {
     return this.store.state.options.allowSoundNotifications
   }
+
   get tabAllowed () {
     return this.store.state.options.allowTabNotifications
   }
+
   get tabHidden () {
     return Visibility.hidden()
   }
+
   get unreadAmount () {
     return this.store.getters['chat/totalNumOfNewMessages']
   }
@@ -48,6 +56,7 @@ class PushNotification extends Notification {
     super(ctx)
     this.tag = null
   }
+
   get messageBody () {
     let message
     if (this.lastUnread.type !== 'message') {
@@ -57,9 +66,11 @@ class PushNotification extends Notification {
     }
     return `${this.partnerIdentity}: ${removeFormats(message)}`
   }
+
   increaseCounter () {
     this.store.commit('notification/increaseDesktopActivateClickCount')
   }
+
   notify (messageArrived) {
     try {
       Notify.requestPermission(
@@ -122,6 +133,7 @@ class SoundNotification extends Notification {
     super(ctx)
     this.audio = new Audio('/sound/bbpro_link.mp3')
   }
+
   notify (messageArrived) {
     if (messageArrived) {
       this.audio.play()
@@ -134,6 +146,7 @@ class TabNotification extends Notification {
     super(ctx)
     this.showAmount = true
   }
+
   notify () {
     if (this.unreadAmount > 0 && this.lastUnread && this.tabHidden) {
       if (!this.interval) {
@@ -142,6 +155,7 @@ class TabNotification extends Notification {
       }
     }
   }
+
   start () {
     this.interval = window.setInterval(() => {
       if (this.unreadAmount && this.showAmount) {
@@ -154,6 +168,7 @@ class TabNotification extends Notification {
       this.showAmount = !this.showAmount
     }, 1e3)
   }
+
   stop () {
     if (this.interval) {
       window.clearInterval(this.interval)
@@ -171,10 +186,12 @@ export default class extends Notification {
     this.sound = new SoundNotification(ctx)
     this.tab = new TabNotification(ctx)
   }
+
   // Returns true once message arrived
   get messageArrived () {
     return this.unreadAmount > this.prevAmount
   }
+
   start () {
     this.interval = window.setInterval(() => {
       if (this.pushAllowed) {
@@ -189,6 +206,7 @@ export default class extends Notification {
       this.prevAmount = this.unreadAmount
     }, 3e3)
   }
+
   stop () {
     if (this.interval) {
       window.clearInterval(this.interval)
diff --git a/src/lib/store-crypto-address.js b/src/lib/store-crypto-address.js
index 48b000f2f..b16ce6284 100644
--- a/src/lib/store-crypto-address.js
+++ b/src/lib/store-crypto-address.js
@@ -2,7 +2,7 @@ import * as admApi from './adamant-api'
 import store from '@/store'
 import { Cryptos, isErc20 } from './constants'
 import { vueBus } from '@/main'
-import { uniqueCaseInsensitiveArray } from '@/lib/textHelpers'
+import { uniqueCaseInsensitiveArray, isStringEqualCI } from '@/lib/textHelpers'
 
 let queue = { }
 let stored = []
@@ -39,7 +39,7 @@ export function flushCryptoAddresses () {
  */
 export function parseCryptoAddressesKVStxs (txs) {
   if (!txs || !txs.length || !txs[0].asset || !txs[0].asset.state || !txs[0].asset) return null
-  let addresses = { }
+  const addresses = { }
   // validateInfo.storedAddresses = [...new Set(txs.map(tx => tx.asset.state.value))]
   addresses.storedAddresses = uniqueCaseInsensitiveArray(txs.map(tx => tx.asset.state.value))
   addresses.addressesCount = addresses.storedAddresses.length
@@ -60,14 +60,14 @@ export function validateStoredCryptoAddresses () {
 
   Object.keys(Cryptos).forEach(crypto => {
     if (skip(crypto)) return
-    let address = store.state[crypto.toLowerCase()].address
+    const address = store.state[crypto.toLowerCase()].address
     if (address) {
       if (!store.state.adm.validatedCryptos[crypto]) {
         const key = `${crypto.toLowerCase()}:address`
         admApi.getStored(key, store.state.address, 20).then(txs => {
           if (txs.length > 0) {
-            let validateInfo = parseCryptoAddressesKVStxs(txs)
-            validateInfo.isMainAddressValid = validateInfo.mainAddress.toLowerCase() === address.toLowerCase()
+            const validateInfo = parseCryptoAddressesKVStxs(txs)
+            validateInfo.isMainAddressValid = isStringEqualCI(validateInfo.mainAddress, address)
             store.state.adm.validatedCryptos[crypto] = validateInfo
           }
         })
@@ -76,7 +76,7 @@ export function validateStoredCryptoAddresses () {
   })
 
   let isAllValidated = true
-  let validateSummary = { }
+  const validateSummary = { }
   validateSummary.isAllRight = true
   validateSummary.wrongCoins = []
   validateSummary.manyAddressesCoins = []
@@ -107,7 +107,7 @@ export function validateStoredCryptoAddresses () {
   }
 
   if (isAllValidated) {
-    store.state.adm.validatedCryptos['summary'] = validateSummary
+    store.state.adm.validatedCryptos.summary = validateSummary
     store.state.adm.addressesValidated = true
     if (!store.state.options.suppressWarningOnAddressesNotification) {
       vueBus.$emit('warningOnAddressDialog', validateSummary)
diff --git a/src/lib/textHelpers.js b/src/lib/textHelpers.js
index 2709edd18..a2b62e5b9 100644
--- a/src/lib/textHelpers.js
+++ b/src/lib/textHelpers.js
@@ -4,14 +4,14 @@
  * @param {string} data
  */
 export function copyToClipboard (data) {
-  let el = document.createElement('textarea')
+  const el = document.createElement('textarea')
   el.value = data
   document.body.appendChild(el)
 
   // this will make fake positive result in Chrome's simulator, and the function will not work
   // https://chromium.googlesource.com/chromium/src/+/master/docs/ios/user_agent.md
   // https://stackoverflow.com/questions/28083715/how-to-detect-if-a-mobile-device-is-emulated-by-google-chrome
-  var isiOSDevice = navigator.userAgent.match(/ipad|iphone/i)
+  const isiOSDevice = navigator.userAgent.match(/ipad|iphone/i)
 
   if (isiOSDevice) {
     copyToClipboardIos(el)
@@ -28,12 +28,12 @@ export function copyToClipboard (data) {
  * @param {HTMLTextAreaElement} el
  */
 function copyToClipboardIos (el) {
-  var range = document.createRange()
+  const range = document.createRange()
   el.contentEditable = true
   el.readOnly = false
   range.selectNodeContents(el)
 
-  var s = window.getSelection()
+  const s = window.getSelection()
   s.removeAllRanges()
   s.addRange(range)
   el.setSelectionRange(0, 999999) // A big number, to cover anything that could be inside the element.
@@ -49,12 +49,12 @@ function copyToClipboardIos (el) {
  * @param {string} type Example `text/plain`
  */
 export function downloadFile (data, filename, type) {
-  var file = new Blob([data], { type: type })
+  const file = new Blob([data], { type: type })
   if (window.navigator.msSaveOrOpenBlob) { // IE10+
     window.navigator.msSaveOrOpenBlob(file, filename)
   } else { // Others
-    var a = document.createElement('a')
-    var url = URL.createObjectURL(file)
+    const a = document.createElement('a')
+    const url = URL.createObjectURL(file)
     a.href = url
     a.download = filename
     document.body.appendChild(a)
@@ -73,3 +73,14 @@ export function downloadFile (data, filename, type) {
 export function uniqueCaseInsensitiveArray (values) {
   return [...new Map(values.map(s => [s.toLowerCase(), s])).values()]
 }
+
+/**
+ * Compares two strings, case insensitive
+ * @param {string} string1
+ * @param {string} string2
+ * @return {boolean} true, if strings are equal, case insensitive
+ */
+export function isStringEqualCI (string1, string2) {
+  if (typeof string1 !== 'string' || typeof string2 !== 'string') return false
+  return string1.toUpperCase() === string2.toUpperCase()
+}
diff --git a/src/lib/transactionsFetching.js b/src/lib/transactionsFetching.js
index 8dc40f02d..49ed5c61b 100644
--- a/src/lib/transactionsFetching.js
+++ b/src/lib/transactionsFetching.js
@@ -1,4 +1,4 @@
-import { Cryptos, isErc20 } from './constants'
+import { Cryptos, isErc20, isInstantSendPossible } from './constants'
 
 /** Pending transaction may be not known to blockchain yet */
 
@@ -9,6 +9,11 @@ export const NEW_PENDING_ATTEMPTS = 20
 /** Interval (ms) between attempts to fetch an old pending transaction */
 export const OLD_PENDING_INTERVAL = 5 * 1000
 
+/** Interval (ms) between attempts to fetch an registered transaction, when InstantSend is possible */
+export const INSTANT_SEND_INTERVAL = 4 * 1000
+/** Time (ms) to consider InstantSend is yet possible */
+export const INSTANT_SEND_TIME = 60 * 1000
+
 /**
  * Returns `true` if the transaction with the specified timestamp can be considered as new
  * ~ Timestamp less then 20 * Block time
@@ -32,6 +37,23 @@ export const getPendingTxRetryTimeout = function (timestamp, crypto) {
   }
 }
 
+/**
+ * Returns a retry interval (ms) for a registered transaction details re-fetching
+ * This function is important to get InstantSend txs faster
+ * @param {string} timestamp transaction timestamp. Expected Date.now() when it was checked first time
+ * @param {string} crypto crypto name
+ * @param {number} regularTimeout regular retry interval for a coin
+ * @param {boolean} gotInstantSendAlready if tx has InstantSend status already
+ * @returns {number}
+ */
+export const getRegisteredTxRetryTimeout = function (timestamp, crypto, regularTimeout, gotInstantSendAlready) {
+  if (!gotInstantSendAlready && isInstantSendPossible(crypto)) {
+    return (Date.now() - timestamp < INSTANT_SEND_TIME) ? INSTANT_SEND_INTERVAL : regularTimeout
+  } else {
+    return regularTimeout
+  }
+}
+
 /**
  * Returns a retry count (times) for a pending transaction details re-fetching
  * @param {number} timestamp transaction timestamp
diff --git a/src/lib/txVerify.js b/src/lib/txVerify.js
index 7763dc04b..286387d73 100644
--- a/src/lib/txVerify.js
+++ b/src/lib/txVerify.js
@@ -1,3 +1,5 @@
+import { isStringEqualCI } from '@/lib/textHelpers'
+
 const AllowAmountErrorPercent = 0.3
 const AllowTimestampDeltaSec = 1800 // 30 min
 
@@ -47,7 +49,7 @@ export function verifyTransactionDetails (transaction, admSpecialMessage, { reci
       }
     }
 
-    if (transaction.hash !== admSpecialMessage.hash) {
+    if (!isStringEqualCI(transaction.hash, admSpecialMessage.hash)) {
       return {
         isTxConsistent: false,
         txCoin: coin,
@@ -63,7 +65,8 @@ export function verifyTransactionDetails (transaction, admSpecialMessage, { reci
       }
     }
 
-    if (!verifyTimestamp(transaction.timestamp, admSpecialMessage.timestamp)) {
+    // Don't check timestamp if there is no timestamp yet. F. e. transaction.instantsend = true for Dash
+    if (transaction.timestamp && !verifyTimestamp(transaction.timestamp, admSpecialMessage.timestamp)) {
       return {
         isTxConsistent: false,
         txCoin: coin,
@@ -71,7 +74,7 @@ export function verifyTransactionDetails (transaction, admSpecialMessage, { reci
       }
     }
 
-    if (transaction.senderId.toLowerCase() !== senderCryptoAddress.toLowerCase()) {
+    if (!isStringEqualCI(transaction.senderId, senderCryptoAddress)) {
       return {
         isTxConsistent: false,
         txCoin: coin,
@@ -79,7 +82,7 @@ export function verifyTransactionDetails (transaction, admSpecialMessage, { reci
       }
     }
 
-    if (transaction.recipientId.toLowerCase() !== recipientCryptoAddress.toLowerCase()) {
+    if (!isStringEqualCI(transaction.recipientId, recipientCryptoAddress)) {
       return {
         isTxConsistent: false,
         txCoin: coin,
diff --git a/src/lib/uri.js b/src/lib/uri.js
index 990e7406c..6d33cfe3a 100644
--- a/src/lib/uri.js
+++ b/src/lib/uri.js
@@ -1,5 +1,6 @@
-import { isValidAddress, isHexString } from 'ethereumjs-util'
-import { Cryptos, isErc20,
+import { isAddress, isHexStrict } from 'web3-utils'
+import {
+  Cryptos, isErc20,
   RE_ADM_ADDRESS, RE_BTC_ADDRESS, RE_DASH_ADDRESS, RE_DOGE_ADDRESS, RE_LSK_ADDRESS
 } from './constants'
 
@@ -45,12 +46,14 @@ export function parseURI (uri = getURI()) {
     params = query.split('&').reduce((accum, param) => {
       const [key, value = ''] = param.split('=')
 
-      return key && value ? {
-        ...accum,
-        [key]: window.decodeURIComponent(
-          value.includes('+') ? value.replace(/\+/g, ' ') : value
-        )
-      } : accum
+      return key && value
+        ? {
+            ...accum,
+            [key]: window.decodeURIComponent(
+              value.includes('+') ? value.replace(/\+/g, ' ') : value
+            )
+          }
+        : accum
     }, Object.create(null))
   }
   if (origin.includes(':')) {
@@ -60,7 +63,7 @@ export function parseURI (uri = getURI()) {
     } else if (/^https?$/.test(protocol)) {
       crypto = Cryptos.ADM
       address = params.address; delete params.address
-    } else if (Cryptos.hasOwnProperty(protocol.toUpperCase())) {
+    } else if (Object.prototype.hasOwnProperty.call(Cryptos, protocol.toUpperCase())) {
       crypto = protocol.toUpperCase()
     }
   } else {
@@ -73,7 +76,7 @@ export function parseURI (uri = getURI()) {
       crypto = Cryptos.DASH
     } else if (RE_DOGE_ADDRESS.test(address)) {
       crypto = Cryptos.DOGE
-    } else if (isHexString(address) && isValidAddress(address)) {
+    } else if (isHexStrict(address) && isAddress(address)) {
       crypto = Cryptos.ETH
     } else if (RE_LSK_ADDRESS.test(address)) {
       crypto = Cryptos.LSK
@@ -115,7 +118,7 @@ export function generateURI (crypto = Cryptos.ADM, address, name) {
  * @returns {string}
  */
 export function websiteUriToOnion (str) {
-  let hostname = window.location.origin
+  const hostname = window.location.origin
   if (hostname.includes('.onion')) {
     str = str.replace('https://adamant.im', 'http://adamantim345sddv.onion')
   }
@@ -129,7 +132,7 @@ export function websiteUriToOnion (str) {
  * @returns {string}
  */
 export function explorerUriToOnion (str) {
-  let hostname = window.location.origin
+  const hostname = window.location.origin
   if (hostname.includes('.onion')) {
     str = str.replace('https://explorer.adamant.im', 'http://srovpmanmrbmbqe63vp5nycsa3j3g6be3bz46ksmo35u5pw7jjtjamid.onion')
   }
diff --git a/src/lib/validateAddress.js b/src/lib/validateAddress.js
index c619a2319..7d2e0654e 100644
--- a/src/lib/validateAddress.js
+++ b/src/lib/validateAddress.js
@@ -1,4 +1,4 @@
-import { isValidAddress, isHexString } from 'ethereumjs-util'
+import { isAddress, isHexStrict } from 'web3-utils'
 import { isValidAddress as isValidBtcAddress } from './bitcoin/bitcoin-utils'
 import {
   Cryptos, isErc20,
@@ -16,7 +16,7 @@ export default function validateAddress (crypto, address) {
   if (crypto === Cryptos.ADM) {
     return RE_ADM_ADDRESS.test(address)
   } else if (crypto === Cryptos.ETH || isErc20(crypto)) {
-    return isHexString(address) && isValidAddress(address)
+    return isHexStrict(address) && isAddress(address)
   } else if (crypto === Cryptos.DOGE) {
     return RE_DOGE_ADDRESS.test(address)
   } else if (crypto === Cryptos.DASH) {
diff --git a/src/main.js b/src/main.js
index f1e886996..d95305d76 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,8 +35,8 @@ window.ep = new Vue({
   version: packageJSON.version,
   router,
   store,
-  template: '<App/>',
   components: { App },
+  template: '<App/>',
   i18n,
   render: h => h(App)
 }).$mount('#app')
diff --git a/src/middlewares/title.js b/src/middlewares/title.js
index afe196cb3..e44d9ad0c 100644
--- a/src/middlewares/title.js
+++ b/src/middlewares/title.js
@@ -1,7 +1,7 @@
 import i18n from '@/i18n'
 
 export default (to, from, next) => {
-  if (to.meta.hasOwnProperty('title')) {
+  if (Object.prototype.hasOwnProperty.call(to.meta, 'title')) {
     document.title = to.meta.title
   } else {
     document.title = i18n.t('app_title')
diff --git a/src/mixins/scrollPosition.js b/src/mixins/scrollPosition.js
index 5e0408fad..f250c5fc4 100644
--- a/src/mixins/scrollPosition.js
+++ b/src/mixins/scrollPosition.js
@@ -1,7 +1,7 @@
 import throttle from 'lodash/throttle'
 
 const updateRouteScrollPosition = throttle(function () {
-  if (this.$route.meta.hasOwnProperty('scrollPosition')) {
+  if (Object.prototype.hasOwnProperty.call(this.$route.meta, 'scrollPosition')) {
     this.$route.meta.scrollPosition = {
       x: window.scrollX,
       y: window.scrollY
diff --git a/src/mixins/transaction.js b/src/mixins/transaction.js
index 7b407e5cd..db953957b 100644
--- a/src/mixins/transaction.js
+++ b/src/mixins/transaction.js
@@ -1,4 +1,4 @@
-import { Cryptos, TransactionStatus as TS } from '@/lib/constants'
+import { Cryptos, TransactionStatus as TS, TransactionAdditionalStatus as TAS } from '@/lib/constants'
 import { verifyTransactionDetails } from '@/lib/txVerify'
 
 export default {
@@ -12,12 +12,11 @@ export default {
       if (!admSpecialMessage || !partnerId) return
 
       const { type, hash, senderId, recipientId } = admSpecialMessage
-
-      // ADM transaction already has property `status`
-      if (type === Cryptos.ADM) return
-
       if (type in Cryptos) {
-        this.fetchCryptoAddresses(type, recipientId, senderId)
+        // Don't need to fetch coin addresses for ADM txs
+        if (type !== Cryptos.ADM) this.fetchCryptoAddresses(type, recipientId, senderId)
+        // Update status, including ADM direct transfers and in-chat transfers
+        // Message txs are not processed here
         this.fetchTransaction(type, hash, admSpecialMessage.timestamp)
       }
     },
@@ -26,11 +25,11 @@ export default {
      * Fetch transaction and save to state.
      * @param {string} type Transaction type
      * @param {string} hash Transaction hash
-     * @param {number} timestamp ADAMANT special message timestamp
+     * @param {number} timestamp ADAMANT special message timestamp. If coin Tx is not known yet, set its timestamp to ADM rich message timestamp. Later it will be updated
      */
-    fetchTransaction (type, hash) {
+    fetchTransaction (type, hash, timestamp) {
       const cryptoModule = type.toLowerCase()
-      return this.$store.dispatch(`${cryptoModule}/getTransaction`, { hash })
+      return this.$store.dispatch(`${cryptoModule}/getTransaction`, { hash, timestamp })
     },
 
     /**
@@ -53,53 +52,106 @@ export default {
       return Promise.all([recipientCryptoAddress, senderCryptoAddress])
     },
 
-    getTransactionStatus (admSpecialMessage) {
-      if (!admSpecialMessage) return TS.PENDING
-
-      const { hash, type, senderId, recipientId } = admSpecialMessage
-
-      // ADM transaction already has property `status`
-      // if (type === Cryptos.ADM) return admSpecialMessage.status
-      if (type === Cryptos.ADM) {
-        // Special case for socket ADM transfer
-        if (admSpecialMessage.amount > 0 && admSpecialMessage.height === undefined && !admSpecialMessage.message && admSpecialMessage.status === 'delivered') {
-          admSpecialMessage.status = 'confirmed'
-        }
-        return admSpecialMessage.status
+    /**
+     * Get Tx status with additional info to show in Chat, ChatPreview and TransactionTemplate
+     * @param {{ id: string, type: string, hash: string }} admSpecialMessage ADM message or ADM rich message of Tx transfer
+     * @param {object} coinTx in case it's not in-chat coin transfer, we have all the data already
+     * @returns {object}
+     */
+    getTransactionStatus (admSpecialMessage, coinTx) {
+      const status = {
+        status: TS.PENDING,
+        virtualStatus: TS.PENDING,
+        inconsistentReason: '',
+        addStatus: TAS.NONE,
+        addDescription: ''
       }
-      if (!Cryptos[type]) return admSpecialMessage.status // if crypto is not supported
 
-      const getterName = type.toLowerCase() + '/transaction'
-      const getter = this.$store.getters[getterName]
+      // if no hash, it is an empty object
+      admSpecialMessage = admSpecialMessage && (admSpecialMessage.hash || admSpecialMessage.id) ? admSpecialMessage : undefined
+
+      if (!admSpecialMessage && !coinTx) return status
+      status.status = admSpecialMessage ? admSpecialMessage.status : coinTx.status
+      status.virtualStatus = status.status
+
+      // we don't need all this in case of not in-chat coin transfer
+      if (admSpecialMessage) {
+        const { type, senderId, recipientId } = admSpecialMessage
+        const hash = admSpecialMessage.hash || admSpecialMessage.id
+
+        // ADM is a special case when using sockets
+        if (type === Cryptos.ADM || type === 0 || type === 'message') {
+          if (admSpecialMessage.status === TS.REGISTERED) {
+            // If it's a message, getChats() in adamant-api.js will update height and confirmations later,
+            // But now we must show Tx as confirmed
+            if (type === 'message') {
+              status.virtualStatus = TS.CONFIRMED
+              status.addStatus = TAS.ADM_REGISTERED
+              status.addDescription = this.$t('transaction.statuses_add.adm_registered')
+            } else {
+              // All transactions we get via socket are shown in chats, including ADM direct transfers
+              // Currently, we don't update confirmations for direct transfers, see getChats() in adamant-api.js
+              // So we'll update confirmations here
+              const transfer = this.$store.state.adm.transactions[hash]
+              if (transfer && (transfer.height || transfer.confirmations > 0)) {
+                status.status = TS.CONFIRMED
+                status.virtualStatus = status.status
+              } else {
+                this.fetchTransaction('ADM', hash, admSpecialMessage.timestamp)
+              }
+            }
+          }
+          return status
+        } else if (!Cryptos[type]) {
+          // if crypto is not supported
+          status.status = TS.UNKNOWN
+          status.virtualStatus = status.status
+          return status
+        }
 
-      if (!getter) return admSpecialMessage.status
+        const getterName = type.toLowerCase() + '/transaction'
+        const getter = this.$store.getters[getterName]
+        if (!getter) return status
 
-      const transaction = getter(hash)
-      let status = (transaction && transaction.status) || 'PENDING'
+        coinTx = getter(hash)
+        status.status = (coinTx && coinTx.status) || TS.PENDING
+        status.virtualStatus = status.status
 
-      const recipientCryptoAddress = this.$store.getters['partners/cryptoAddress'](recipientId, type)
-      const senderCryptoAddress = this.$store.getters['partners/cryptoAddress'](senderId, type)
+        const recipientCryptoAddress = this.$store.getters['partners/cryptoAddress'](recipientId, type)
+        const senderCryptoAddress = this.$store.getters['partners/cryptoAddress'](senderId, type)
 
-      // do not update status until cryptoAddresses and transaction are received
-      if (!recipientCryptoAddress || !senderCryptoAddress || !transaction) return TS.PENDING
+        // do not update status until cryptoAddresses and transaction are received
+        if (!recipientCryptoAddress || !senderCryptoAddress || !coinTx) {
+          status.status = TS.PENDING
+          status.virtualStatus = status.status
+          return status
+        }
 
-      if (status === 'SUCCESS') {
-        // sometimes timestamp is missing (ETHLike transactions)
-        if (!transaction.timestamp) return TS.PENDING
+        // check if Tx is not a fake
+        // we are unable to check status.status === TS.REGISTERED txs, as their timestamps are Date.now()
+        if (status.status === TS.CONFIRMED) {
+          const txVerify = verifyTransactionDetails(coinTx, admSpecialMessage, { recipientCryptoAddress, senderCryptoAddress })
+          if (!txVerify.isTxConsistent) {
+            status.status = TS.INVALID
+            status.virtualStatus = status.status
+            status.inconsistentReason = txVerify.txInconsistentReason
+            return status
+          }
+        }
+      }
 
-        const txVerify = verifyTransactionDetails(transaction, admSpecialMessage, { recipientCryptoAddress, senderCryptoAddress })
-        if (txVerify.isTxConsistent) {
-          status = TS.CONFIRMED
-        } else {
-          status = TS.INVALID
+      if (status.status === TS.REGISTERED) {
+        // Dash InstantSend transactions must be shown as confirmed
+        // don't need to verify timestamp, as such txs are fresh
+        if (coinTx.instantsend) {
+          status.virtualStatus = TS.CONFIRMED
+          status.addStatus = TAS.INSTANT_SEND
+          status.addDescription = this.$t('transaction.statuses_add.instant_send')
         }
-      } else {
-        status = (status === 'PENDING' || status === 'REGISTERED')
-          ? TS.PENDING
-          : TS.REJECTED
       }
 
       return status
     }
+
   }
 }
diff --git a/src/plugins/layout.js b/src/plugins/layout.js
index 91647988c..525ad89fb 100644
--- a/src/plugins/layout.js
+++ b/src/plugins/layout.js
@@ -7,10 +7,10 @@ import NoContainer from '@/layouts/no-container'
 import Container from '@/components/Container'
 
 // Register layouts globally
-Vue.component('default', Default)
-Vue.component('toolbar', Toolbar)
-Vue.component('chat', Chat)
-Vue.component('no-container', NoContainer)
+Vue.component('Default', Default)
+Vue.component('Toolbar', Toolbar)
+Vue.component('Chat', Chat)
+Vue.component('NoContainer', NoContainer)
 
 // Register components
-Vue.component('container', Container)
+Vue.component('Container', Container)
diff --git a/src/store/__tests__/modules/chat.test.js b/src/store/__tests__/modules/chat.test.js
index 17ef481d6..b1053f934 100644
--- a/src/store/__tests__/modules/chat.test.js
+++ b/src/store/__tests__/modules/chat.test.js
@@ -867,7 +867,7 @@ describe('Store: chat.js', () => {
           partnerId,
           id: 'localId1',
           realId: 'realId1',
-          status: TS.DELIVERED
+          status: TS.REGISTERED
         })
 
         // update message 2
@@ -875,17 +875,17 @@ describe('Store: chat.js', () => {
           partnerId,
           id: 'localId2',
           realId: 'realId2',
-          status: TS.DELIVERED
+          status: TS.REGISTERED
         })
 
         expect(messages).toEqual([
           {
             id: 'realId1',
-            status: TS.DELIVERED
+            status: TS.REGISTERED
           },
           {
             id: 'realId2',
-            status: TS.DELIVERED
+            status: TS.REGISTERED
           }
         ])
       })
@@ -1156,7 +1156,7 @@ describe('Store: chat.js', () => {
         ])
       })
 
-      it('should update message status to `delivered`', async () => {
+      it('should update message status to `REGISTERED`', async () => {
         const messageObject = {
           id: '1',
           message: 'hello world',
@@ -1181,7 +1181,7 @@ describe('Store: chat.js', () => {
           ['updateMessage', {
             id: messageObject.id,
             realId: transactionId,
-            status: TS.DELIVERED,
+            status: TS.REGISTERED,
             partnerId: recipientId
           }]
         ])
@@ -1232,7 +1232,7 @@ describe('Store: chat.js', () => {
           ['updateMessage', {
             id: messageId,
             realId: transactionId,
-            status: TS.DELIVERED,
+            status: TS.REGISTERED,
             partnerId: recipientId
           }]
         ])
diff --git a/src/store/cache.js b/src/store/cache.js
new file mode 100644
index 000000000..a9f49ed7b
--- /dev/null
+++ b/src/store/cache.js
@@ -0,0 +1,19 @@
+import * as bip39 from 'bip39'
+
+let cachedSeed
+
+export default {
+  /**
+   * Creates seed from mnemonic
+   * bip39.mnemonicToSeedSync is time consuming, so we use cached value, if possible
+   * @param {string} passphrase
+   * @return {string} seed
+   */
+  mnemonicToSeedSync (passphrase) {
+    cachedSeed = cachedSeed || bip39.mnemonicToSeedSync(passphrase)
+    return cachedSeed
+  },
+  resetCachedSeed () {
+    cachedSeed = undefined
+  }
+}
diff --git a/src/store/index.js b/src/store/index.js
index f20ede91d..011bfc697 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -34,6 +34,7 @@ import chat from './modules/chat'
 import options from './modules/options'
 import identicon from './modules/identicon'
 import notification from './modules/notification'
+import cache from '@/store/cache'
 
 Vue.use(Vuex)
 
@@ -93,6 +94,7 @@ const store = {
       state.password = ''
       state.IDBReady = false
       state.publicKeys = {}
+      cache.resetCachedSeed()
     },
     setPublicKey (state, { adamantAddress, publicKey }) {
       state.publicKeys[adamantAddress] = publicKey
@@ -109,7 +111,7 @@ const store = {
           commit('setBalance', account.balance)
           commit('setPassphrase', passphrase)
 
-          // retrieve eth & erc20 data
+          // retrieve wallet data
           dispatch('afterLogin', passphrase)
         })
     },
@@ -118,7 +120,7 @@ const store = {
         .then(account => {
           commit('setIDBReady', true)
 
-          // retrieve eth & erc20 data
+          // retrieve wallet data
           dispatch('afterLogin', account.passphrase)
         })
     },
@@ -126,12 +128,15 @@ const store = {
       dispatch('reset')
     },
     unlock ({ state, dispatch }) {
+      // user updated an app, F5 or something
       const passphrase = Base64.decode(state.passphrase)
 
       unlock(passphrase)
 
-      // retrieve eth & erc20 data
-      dispatch('afterLogin', passphrase)
+      // retrieve wallet data only if loginViaPassword, otherwise coin modules will be loaded twice
+      if (state.password) {
+        dispatch('afterLogin', passphrase)
+      }
     },
     sendCryptoTransferMessage (context, payload) {
       const msg = {
diff --git a/src/store/modules/adm/adm-actions.js b/src/store/modules/adm/adm-actions.js
index 284847b53..fa3199f29 100644
--- a/src/store/modules/adm/adm-actions.js
+++ b/src/store/modules/adm/adm-actions.js
@@ -40,6 +40,7 @@ export default {
       context.state.transactionsCount = 0
       context.state.maxHeight = -1
       context.state.minHeight = Infinity
+      context.commit('bottom', false)
     }
     if (context.state.maxHeight > 0) {
       options.fromHeight = context.state.maxHeight + 1
@@ -93,7 +94,7 @@ export default {
       // Successful but empty response means, that the oldest transaction for the current
       // address has been received already
       if (response.success && !hasResult) {
-        context.commit('bottom')
+        context.commit('bottom', true)
       }
     }, error => {
       context.commit('areOlderLoading', false)
@@ -108,7 +109,9 @@ export default {
    */
   getTransaction (context, { hash }) {
     return admApi.getTransaction(hash).then(
-      transaction => context.commit('transactions', [{ ...transaction, status: 'SUCCESS' }])
+      transaction => {
+        context.commit('transactions', [transaction])
+      }
     )
   },
 
diff --git a/src/store/modules/adm/adm-getters.js b/src/store/modules/adm/adm-getters.js
index ce650e618..fe1b014f4 100644
--- a/src/store/modules/adm/adm-getters.js
+++ b/src/store/modules/adm/adm-getters.js
@@ -1,4 +1,5 @@
 import { Fees } from '@/lib/constants'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 const sortFunc = (a, b) => ((b && b.timestamp) || 0) - ((a && a.timestamp) || 0)
 
@@ -27,7 +28,7 @@ export default {
    * This getter was added to support transactions display in chats and supposed to be removed
    * as soon as we add an endpoint to fetch transactions for chats.
    */
-  partnerTransactions: state => partner => Object.values(state.transactions).filter(tx => tx.partner === partner),
+  partnerTransactions: state => partner => Object.values(state.transactions).filter(tx => isStringEqualCI(tx.partner, partner)),
 
   fee: state => amount => Fees.ADM_TRANSFER
 }
diff --git a/src/store/modules/adm/adm-mutations.js b/src/store/modules/adm/adm-mutations.js
index 9169eafc8..2e158783f 100644
--- a/src/store/modules/adm/adm-mutations.js
+++ b/src/store/modules/adm/adm-mutations.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 
 import { resetState } from '../../../lib/reset-state'
 import getInitialState from './adm-state'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
   /** Resets module state */
@@ -15,8 +16,8 @@ export default {
   },
 
   /** Sets a flag, indicating that the oldest transaction has been retrieved for this account */
-  bottom (state) {
-    state.bottomReached = true
+  bottom (state, value) {
+    state.bottomReached = value
   },
 
   /**
@@ -25,8 +26,8 @@ export default {
    * @param {Array<{id: string, height: number}>} transactions transactions list
    */
   transactions (state, transactions) {
-    if (transactions.updateTimestamps) {
-      var updateTimestamps = transactions.updateTimestamps
+    const updateTimestamps = transactions.updateTimestamps
+    if (updateTimestamps) {
       transactions = transactions.transactions
     }
     let minHeight = Infinity
@@ -37,8 +38,13 @@ export default {
       if (!tx) return
       Vue.set(state.transactions, tx.id, {
         ...tx,
-        direction: tx.recipientId === address ? 'to' : 'from',
-        partner: tx.recipientId === address ? tx.senderId : tx.recipientId
+        direction: isStringEqualCI(tx.recipientId, address) ? 'to' : 'from',
+        partner: isStringEqualCI(tx.recipientId, address) ? tx.senderId : tx.recipientId,
+        status: tx.height || tx.confirmations > 0
+          ? 'CONFIRMED'
+          : tx.status
+            ? tx.status
+            : 'REGISTERED'
       })
 
       if (tx.height && updateTimestamps) {
@@ -48,7 +54,7 @@ export default {
     })
 
     // Magic here helps to refresh Tx list when browser deletes it
-    let txCount = Object.keys(state.transactions).length
+    const txCount = Object.keys(state.transactions).length
     if (state.transactionsCount < txCount) { // We don't delete transactions, so they can't become in short
       state.transactionsCount = txCount
     }
diff --git a/src/store/modules/btc-base/btc-base-actions.js b/src/store/modules/btc-base/btc-base-actions.js
index 995faf69b..6622aa0af 100644
--- a/src/store/modules/btc-base/btc-base-actions.js
+++ b/src/store/modules/btc-base/btc-base-actions.js
@@ -108,7 +108,7 @@ function createActions (options) {
         ))
         .then(({ hash, error }) => {
           if (error) {
-            context.commit('transactions', [{ hash, status: 'ERROR' }])
+            context.commit('transactions', [{ hash, status: 'REJECTED' }])
             throw error
           } else {
             console.log(`${crypto} transaction has been sent: ${hash}`)
@@ -139,17 +139,18 @@ function createActions (options) {
       if (!api) return
       if (!payload.hash) return
 
-      const existing = context.state.transactions[payload.hash]
+      let existing = context.state.transactions[payload.hash]
       if (existing && !payload.force) return
 
       if (!existing || payload.dropStatus) {
         payload.updateOnly = false
         context.commit('transactions', [{
           hash: payload.hash,
-          timestamp: payload.timestamp,
+          timestamp: (existing && existing.timestamp) || payload.timestamp || Date.now(),
           amount: payload.amount,
           status: 'PENDING'
         }])
+        existing = context.state.transactions[payload.hash]
       }
 
       let tx = null
@@ -164,24 +165,24 @@ function createActions (options) {
       if (tx) {
         context.commit('transactions', [tx])
         // The transaction has been confirmed, we're done here
-        if (tx.status === 'SUCCESS') return
+        if (tx.status === 'CONFIRMED') return
         // If it's not confirmed but is already registered, keep on trying to fetch its details
-        retryTimeout = fetchRetryTimeout
+        retryTimeout = tf.getRegisteredTxRetryTimeout(tx.timestamp || existing.timestamp || payload.timestamp, context.state.crypto, fetchRetryTimeout, tx.instantsend)
         retry = true
       } else if (existing && existing.status === 'REGISTERED') {
         // We've failed to fetch the details for some reason, but the transaction is known to be
         // accepted by the network - keep on fetching
-        retryTimeout = fetchRetryTimeout
+        retryTimeout = tf.getRegisteredTxRetryTimeout(existing.timestamp || payload.timestamp, context.state.crypto, fetchRetryTimeout, existing.instantsend)
         retry = true
       } else {
         // The network does not yet know this transaction. We'll make several attempts to retrieve it.
-        retry = attempt < tf.getPendingTxRetryCount(payload.timestamp || (existing && existing.timestamp), context.state.crypto)
-        retryTimeout = tf.getPendingTxRetryTimeout(payload.timestamp || (existing && existing.timestamp), context.state.crypto)
+        retry = attempt < tf.getPendingTxRetryCount(existing.timestamp || payload.timestamp, context.state.crypto)
+        retryTimeout = tf.getPendingTxRetryTimeout(existing.timestamp || payload.timestamp, context.state.crypto)
       }
 
       if (!retry) {
         // If we're here, we have abandoned any hope to get the transaction details.
-        context.commit('transactions', [{ hash: payload.hash, status: 'ERROR' }])
+        context.commit('transactions', [{ hash: payload.hash, status: 'REJECTED' }])
       } else if (!payload.updateOnly) {
         // Try to get the details one more time
         const newPayload = {
diff --git a/src/store/modules/btc-base/btc-base-mutations.js b/src/store/modules/btc-base/btc-base-mutations.js
index a1c0653ca..9611b6719 100644
--- a/src/store/modules/btc-base/btc-base-mutations.js
+++ b/src/store/modules/btc-base/btc-base-mutations.js
@@ -18,8 +18,8 @@ export default (initialState) => ({
   },
 
   /** Sets a flag, indicating that the oldest transaction has been retrieved for this account */
-  bottom (state) {
-    state.bottomReached = true
+  bottom (state, value) {
+    state.bottomReached = value
   },
 
   transactions (state, transactions) {
diff --git a/src/store/modules/btc/btc-actions.js b/src/store/modules/btc/btc-actions.js
index c77f97624..8807d0843 100644
--- a/src/store/modules/btc/btc-actions.js
+++ b/src/store/modules/btc/btc-actions.js
@@ -33,9 +33,9 @@ const customActions = getApi => ({
    * @param {{hash: string}} payload action payload
    */
   updateTransaction ({ dispatch, getters }, payload) {
-    const tx = getters['transaction'](payload.hash)
+    const tx = getters.transaction(payload.hash)
 
-    if (tx && (tx.status === 'SUCCESS' || tx.status === 'ERROR')) {
+    if (tx && (tx.status === 'CONFIRMED' || tx.status === 'REJECTED')) {
       // If transaction is in one of the final statuses (either succeeded or failed),
       // just update the current height to recalculate its confirmations counter.
       return dispatch('updateHeight')
@@ -59,7 +59,7 @@ const retrieveNewTransactions = async (api, context, latestTxId, toTx) => {
 const getNewTransactions = async (api, context) => {
   context.commit('areRecentLoading', true)
   // Determine the most recent transaction ID
-  const latestTransaction = context.getters['sortedTransactions'][0]
+  const latestTransaction = context.getters.sortedTransactions[0]
   const latestId = latestTransaction && latestTransaction.txid
   // Now fetch the transactions until we meet that latestId among the
   // retrieved results
@@ -71,7 +71,7 @@ const getOldTransactions = async (api, context) => {
   // If we already have the most old transaction for this address, no need to request anything
   if (context.state.bottomReached) return Promise.resolve()
 
-  const transactions = context.getters['sortedTransactions']
+  const transactions = context.getters.sortedTransactions
   const oldestTx = transactions[transactions.length - 1]
   const toTx = oldestTx && oldestTx.txid
 
@@ -81,7 +81,7 @@ const getOldTransactions = async (api, context) => {
   context.commit('areOlderLoading', false)
 
   if (chunk.length < TX_CHUNK_SIZE) {
-    context.commit('bottom')
+    context.commit('bottom', true)
   }
 }
 
diff --git a/src/store/modules/chat/index.js b/src/store/modules/chat/index.js
index e8b7fac8f..37a7cd9d0 100644
--- a/src/store/modules/chat/index.js
+++ b/src/store/modules/chat/index.js
@@ -11,6 +11,7 @@ import {
 } from '@/lib/chatHelpers'
 import { isNumeric } from '@/lib/numericHelpers'
 import { EPOCH, Cryptos, TransactionStatus as TS } from '@/lib/constants'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export let interval
 
@@ -300,7 +301,7 @@ const mutations = {
    * @param {string} userId Your address
    */
   pushMessage (state, { message, userId }) {
-    let partnerId = message.senderId === userId
+    const partnerId = isStringEqualCI(message.senderId, userId)
       ? message.recipientId
       : message.senderId
 
@@ -340,7 +341,7 @@ const mutations = {
         message.height === undefined || // unconfirmed transaction (socket)
         (message.height > state.lastMessageHeight && state.lastMessageHeight > 0)
       ) &&
-      userId !== message.senderId // do not notify yourself when send message from other device
+      !isStringEqualCI(userId, message.senderId) // do not notify yourself when send message from other device
     ) {
       chat.numOfNewMessages += 1
     }
@@ -475,6 +476,25 @@ const mutations = {
       isAdamantChat: true,
       numOfNewMessages: 0
     })
+
+    const bountyBotMessages = [
+      {
+        id: 'b2',
+        message: 'chats.virtual.bounty_bot',
+        timestamp: EPOCH,
+        senderId: 'U1644771796259136854',
+        type: 'message',
+        i18n: true,
+        status: TS.CONFIRMED,
+        readonly: true
+      }
+    ]
+
+    Vue.set(state.chats, 'U1644771796259136854', {
+      messages: bountyBotMessages,
+      isAdamantChat: true,
+      numOfNewMessages: 0
+    })
   },
 
   updateScrollPosition (state, { contactId, scrollPosition }) {
@@ -620,19 +640,19 @@ const actions = {
           throw new Error('Message rejected')
         }
 
-        // update `message.status` to 'confirmed'
+        // update `message.status` to 'REGISTERED'
         // and `message.id` with `realId` from server
         commit('updateMessage', {
           id: messageObject.id,
           realId: res.transactionId,
-          status: TS.DELIVERED, // not confirmed yet, wait to be stored in the blockchain (optional line)
+          status: TS.REGISTERED, // not confirmed yet, wait to be stored in the blockchain (optional line)
           partnerId: recipientId
         })
 
         return res
       })
       .catch(err => {
-        // update `message.status` to 'rejected'
+        // update `message.status` to 'REJECTED'
         commit('updateMessage', {
           id: messageObject.id,
           status: TS.REJECTED,
@@ -670,7 +690,7 @@ const actions = {
           commit('updateMessage', {
             id: messageId,
             realId: res.transactionId,
-            status: TS.DELIVERED,
+            status: TS.REGISTERED,
             partnerId: recipientId
           })
 
@@ -696,7 +716,7 @@ const actions = {
    * @param {number} transactionId
    * @param {string} recipientId
    * @param {string} type ADM, ETH...
-   * @param {string} status Can be: `sent`, `confirmed`, 'rejected'
+   * @param {string} status Can be: `sent`, `confirmed`, 'REJECTED'
    * @param {number} amount
    * @param {string} hash Transaction hash
    * @param {string} comment Transaction comment
diff --git a/src/store/modules/dash/dash-actions.js b/src/store/modules/dash/dash-actions.js
index e9ccff11a..7ed3f39ea 100644
--- a/src/store/modules/dash/dash-actions.js
+++ b/src/store/modules/dash/dash-actions.js
@@ -17,7 +17,7 @@ const getNewTransactions = (api, context) => {
     result => {
       context.commit('areRecentLoading', false)
       context.commit('transactions', result.items)
-      context.commit('bottom')
+      context.commit('bottom', true)
     },
     error => {
       context.commit('areRecentLoading', false)
@@ -37,7 +37,7 @@ const getOldTransactions = (api, context) => {
     result => {
       context.commit('areOlderLoading', false)
       context.commit('transactions', result.items)
-      context.commit('bottom')
+      context.commit('bottom', true)
     },
     error => {
       context.commit('areOlderLoading', false)
diff --git a/src/store/modules/delegates/actions.js b/src/store/modules/delegates/actions.js
index 8ffbd631a..4c56a74a8 100644
--- a/src/store/modules/delegates/actions.js
+++ b/src/store/modules/delegates/actions.js
@@ -4,7 +4,7 @@ import * as admApi from '../../../lib/adamant-api'
 function _getDelegates (context, limit = constants.Delegates.ACTIVE_DELEGATES, offset = 0, votes = []) {
   admApi.getDelegates(limit, offset).then(response => {
     if (response.success) {
-      for (let i in response.delegates) {
+      for (const i in response.delegates) {
         const delegate = response.delegates[i]
         const voted = votes.includes(delegate.address)
         delegate._voted = voted
@@ -33,7 +33,7 @@ function checkUnconfirmedTransactions (context) {
 }
 
 function getRoundDelegates (delegates, height) {
-  let currentRound = round(height)
+  const currentRound = round(height)
   return delegates.filter((delegate, index) => {
     return currentRound === round(height + index + 1)
   })
@@ -98,15 +98,16 @@ export default {
         })
         admApi.getBlocks().then(response => {
           if (response.success) {
-            let lastBlock = response.blocks[0]
-            let blocks = response.blocks.filter(x => x.generatorPublicKey === delegate.publicKey)
-            let time = Date.now()
-            let status = { updatedAt: time }
+            const lastBlock = response.blocks[0]
+            const blocks = response.blocks.filter(x => x.generatorPublicKey === delegate.publicKey)
+            const time = Date.now()
+            const status = { updatedAt: time }
+            let isRoundDelegate = false
             if (blocks.length > 0) {
               status.lastBlock = blocks[0]
               status.blockAt = new Date(((constants.EPOCH + status.lastBlock.timestamp) * 1000))
-              var roundDelegates = getRoundDelegates(nextForgers, lastBlock.height)
-              var isRoundDelegate = roundDelegates.indexOf(delegate.publicKey) !== -1
+              const roundDelegates = getRoundDelegates(nextForgers, lastBlock.height)
+              isRoundDelegate = roundDelegates.indexOf(delegate.publicKey) !== -1
               status.networkRound = round(lastBlock.height)
               status.delegateRound = round(status.lastBlock.height)
               status.awaitingSlot = status.networkRound - status.delegateRound
@@ -131,7 +132,7 @@ export default {
             } else if (!status.blockAt || !status.updatedAt || status.lastBlock === null) {
               // Awaiting status or unprocessed
               status.code = 5
-            // For delegates which not forged a signle block yet (statuses 0,3,5 not apply here)
+            // For delegates which not forged a single block yet (statuses 0,3,5 not apply here)
             } else if (!status.blockAt && status.updatedAt) {
               if (!isRoundDelegate && delegate.missedblocks === 1) {
                 // Missed block in current round
diff --git a/src/store/modules/delegates/mutations.js b/src/store/modules/delegates/mutations.js
index 73f5d2096..c6c981bf5 100644
--- a/src/store/modules/delegates/mutations.js
+++ b/src/store/modules/delegates/mutations.js
@@ -9,7 +9,7 @@ export default {
     state.delegates = {}
   },
   update_delegate (state, payload) {
-    for (let key in payload.params) {
+    for (const key in payload.params) {
       Vue.set(state.delegates[payload.address], key, payload.params[key])
     }
   },
diff --git a/src/store/modules/doge/doge-actions.js b/src/store/modules/doge/doge-actions.js
index 54fb06e48..6f0c6bfb2 100644
--- a/src/store/modules/doge/doge-actions.js
+++ b/src/store/modules/doge/doge-actions.js
@@ -28,7 +28,7 @@ const getOldTransactions = (api, context) => {
       context.commit('areOlderLoading', false)
       context.commit('transactions', result.items)
       if (!result.hasMore) {
-        context.commit('bottom')
+        context.commit('bottom', true)
       }
     },
     error => {
diff --git a/src/store/modules/erc20/erc20-actions.js b/src/store/modules/erc20/erc20-actions.js
index 271fe3784..1175e51b0 100644
--- a/src/store/modules/erc20/erc20-actions.js
+++ b/src/store/modules/erc20/erc20-actions.js
@@ -7,29 +7,30 @@ import createActions from '../eth-base/eth-base-actions'
 
 /** Timestamp of the most recent status update */
 let lastStatusUpdate = 0
-/** Status update interval */
-const STATUS_INTERVAL = 8000
+/** Status update interval is 25 sec: ERC20 balance */
+const STATUS_INTERVAL = 25000
 
 // Setup decoder
 abiDecoder.addABI(Erc20)
 
 const initTransaction = (api, context, ethAddress, amount, increaseFee) => {
-  const contract = api.eth.contract(Erc20).at(context.state.contractAddress)
+  const contract = new api.Contract(Erc20, context.state.contractAddress)
 
   const transaction = {
     from: context.state.address,
     to: context.state.contractAddress,
-    value: api.fromDecimal('0'),
+    value: '0x0',
     // gasLimit: api.fromDecimal(ERC20_TRANSFER_GAS), // Don't take default value, instead calculate with estimateGas(transactionObject)
-    gasPrice: api.fromDecimal(context.getters.gasPrice),
-    data: contract.transfer.getData(ethAddress, ethUtils.toWhole(amount, context.state.decimals))
+    // gasPrice: context.getters.gasPrice, // Set gas price to auto calc
+    // nonce // Let sendTransaction choose it
+    data: contract.methods.transfer(ethAddress, ethUtils.toWhole(amount, context.state.decimals)).encodeABI()
   }
 
-  let gasLimit = api.eth.estimateGas(transaction)
-  gasLimit = increaseFee ? (gasLimit * INCREASE_FEE_MULTIPLIER).toString(16) : gasLimit.toString(16)
-  transaction.gas = '0x' + gasLimit
-
-  return transaction
+  return api.estimateGas(transaction).then(gasLimit => {
+    gasLimit = increaseFee ? gasLimit * INCREASE_FEE_MULTIPLIER : gasLimit
+    transaction.gas = gasLimit
+    return transaction
+  })
 }
 
 const parseTransaction = (context, tx) => {
@@ -51,7 +52,7 @@ const parseTransaction = (context, tx) => {
       blockNumber: tx.blockNumber,
       amount,
       recipientId,
-      gasPrice: tx.gasPrice.toNumber(10)
+      gasPrice: +tx.gasPrice
     }
   }
 
@@ -59,17 +60,16 @@ const parseTransaction = (context, tx) => {
 }
 
 const createSpecificActions = (api, queue) => ({
-  /** Updates crypto balance info */
+  /** Updates ERC20 token balance */
   updateStatus (context) {
     if (!context.state.address) return
 
-    const contract = api.eth.contract(Erc20).at(context.state.contractAddress)
-
-    ethUtils.promisify(contract.balanceOf.call, context.state.address)
+    const contract = new api.Contract(Erc20, context.state.contractAddress)
+    contract.methods.balanceOf(context.state.address).call()
       .then(
-        balance => context.commit('balance', Number(
-          ethUtils.toFraction(balance.toString(10), context.state.decimals)
-        )),
+        balance => {
+          context.commit('balance', Number(ethUtils.toFraction(balance.toString(10), context.state.decimals)))
+        },
         () => { } // Not this time
       )
       .then(() => {
diff --git a/src/store/modules/eth-base/eth-base-actions.js b/src/store/modules/eth-base/eth-base-actions.js
index 102425d19..1f2a145c7 100644
--- a/src/store/modules/eth-base/eth-base-actions.js
+++ b/src/store/modules/eth-base/eth-base-actions.js
@@ -1,11 +1,10 @@
-import Web3 from 'web3'
-import { Transaction } from 'ethereumjs-tx'
-import { toBuffer } from 'ethereumjs-util'
+import Web3Eth from 'web3-eth'
 
 import getEndpointUrl from '../../../lib/getEndpointUrl'
 import * as utils from '../../../lib/eth-utils'
 import { getTransactions } from '../../../lib/eth-index'
 import * as tf from '../../../lib/transactionsFetching'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 /** Interval between attempts to fetch the registered tx details */
 const RETRY_TIMEOUT = 20 * 1000
@@ -13,11 +12,11 @@ const CHUNK_SIZE = 25
 
 export default function createActions (config) {
   const endpoint = getEndpointUrl('ETH')
-  const api = new Web3(new Web3.providers.HttpProvider(endpoint, 10000))
-  const queue = new utils.BatchQueue(() => api.createBatch())
+  const api = new Web3Eth(endpoint)
+  const queue = new utils.BatchQueue(() => new api.BatchRequest())
 
   const {
-    onInit = (() => { }),
+    onInit = () => { },
     initTransaction,
     parseTransaction,
     createSpecificActions
@@ -32,7 +31,7 @@ export default function createActions (config) {
     afterLogin: {
       root: true,
       handler (context, passphrase) {
-        const account = utils.getAccountFromPassphrase(passphrase)
+        const account = utils.getAccountFromPassphrase(passphrase, api)
         context.commit('account', account)
         context.dispatch('updateStatus')
         queue.start()
@@ -58,7 +57,7 @@ export default function createActions (config) {
         const address = context.state.address
 
         if (!address && passphrase) {
-          const account = utils.getAccountFromPassphrase(passphrase)
+          const account = utils.getAccountFromPassphrase(passphrase, api)
           context.commit('account', account)
           onInit(context)
         }
@@ -72,58 +71,65 @@ export default function createActions (config) {
     sendTokens (context, { amount, admAddress, address, comments, increaseFee }) {
       address = address.trim()
       const crypto = context.state.crypto
-      const ethTx = initTransaction(api, context, address, amount, increaseFee)
 
-      return utils.promisify(api.eth.getTransactionCount, context.state.address, 'pending')
-        .then(count => {
-          if (count) ethTx.nonce = count
-
-          const tx = new Transaction(ethTx)
-          tx.sign(toBuffer(context.state.privateKey))
-          const serialized = '0x' + tx.serialize().toString('hex')
-          const hash = api.sha3(serialized, { encoding: 'hex' })
+      return initTransaction(api, context, address, amount, increaseFee).then(ethTx => {
+        return api.accounts.signTransaction(ethTx, context.state.privateKey).then(signedTx => {
+          const txInfo = {
+            signedTx,
+            ethTx
+          }
 
           if (!admAddress) {
-            return serialized
+            return txInfo
           }
-
           const msgPayload = {
             address: admAddress,
             amount,
             comments,
             crypto,
-            hash
+            hash: signedTx.transactionHash
           }
-
-          // Send a special message to indicate that we're performing an ETH transfer
+          // Send a rich ADM message to indicate that we're performing an ETH transfer
           return context.dispatch('sendCryptoTransferMessage', msgPayload, { root: true })
-            .then(success => success ? serialized : Promise.reject(new Error('adm_message')))
+            .then(success => success ? txInfo : Promise.reject(new Error('adm_message')))
         })
-        .then(tx => {
-          return utils.promisify(api.eth.sendRawTransaction, tx).then(
-            hash => ({ hash }),
-            error => ({ error })
+      })
+        .then(txInfo => {
+          return api.sendSignedTransaction(txInfo.signedTx.rawTransaction).then(
+            hash => ({ txInfo, hash }),
+            error => {
+              // Known bug that after Tx sent successfully, this error occurred anyway https://github.com/ethereum/web3.js/issues/3145
+              if (!error.toString().includes('Failed to check for transaction receipt')) {
+                return { txInfo, error }
+              } else {
+                return { txInfo, hash: txInfo.signedTx.transactionHash }
+              }
+            }
           )
         })
-        .then(({ hash, error }) => {
-          if (error) {
-            console.error(`Failed to send ${crypto} transaction`, error)
-            context.commit('transactions', [{ hash, status: 'ERROR' }])
-            throw error
+        .then((sentTxInfo) => {
+          if (sentTxInfo.error) {
+            console.error(`Failed to send ${crypto} transaction`, sentTxInfo.error)
+            context.commit('transactions', [{ hash: sentTxInfo.txInfo.signedTx.transactionHash, status: 'REJECTED' }])
+            throw sentTxInfo.error
           } else {
+            if (!isStringEqualCI(sentTxInfo.hash, sentTxInfo.txInfo.signedTx.transactionHash)) {
+              console.warn(`Something wrong with sent ETH tx, computed hash and sent tx differs: ${sentTxInfo.txInfo.signedTx.transactionHash} and ${sentTxInfo.hash}`)
+            }
+
             context.commit('transactions', [{
-              hash,
-              senderId: ethTx.from,
+              hash: sentTxInfo.hash,
+              senderId: sentTxInfo.txInfo.ethTx.from,
               recipientId: address,
               amount,
-              fee: utils.calculateFee(ethTx.gas, ethTx.gasPrice),
+              fee: utils.calculateFee(sentTxInfo.txInfo.ethTx.gas, sentTxInfo.txInfo.ethTx.gasPrice),
               status: 'PENDING',
               timestamp: Date.now(),
-              gasPrice: ethTx.gasPrice
+              gasPrice: sentTxInfo.txInfo.ethTx.gasPrice
             }])
-            context.dispatch('getTransaction', { hash, isNew: true, direction: 'from', force: true })
+            context.dispatch('getTransaction', { hash: sentTxInfo.hash, isNew: true, direction: 'from', force: true })
 
-            return hash
+            return sentTxInfo.hash
           }
         })
     },
@@ -137,7 +143,7 @@ export default function createActions (config) {
       const transaction = context.state.transactions[payload.hash]
       if (!transaction) return
 
-      const supplier = () => api.eth.getBlock.request(payload.blockNumber, (err, block) => {
+      const supplier = () => api.getBlock.request(payload.blockNumber, (err, block) => {
         if (!err && block) {
           context.commit('transactions', [{
             hash: transaction.hash,
@@ -162,7 +168,7 @@ export default function createActions (config) {
         payload.updateOnly = false
         context.commit('transactions', [{
           hash: payload.hash,
-          timestamp: payload.timestamp,
+          timestamp: (existing && existing.timestamp) || payload.timestamp || Date.now(),
           amount: payload.amount,
           status: 'PENDING',
           direction: payload.direction
@@ -170,9 +176,9 @@ export default function createActions (config) {
       }
 
       const key = 'transaction:' + payload.hash
-      const supplier = () => api.eth.getTransaction.request(payload.hash, (err, tx) => {
+      const supplier = () => api.getTransaction.request(payload.hash, (err, tx) => {
         if (!err && tx && tx.input) {
-          let transaction = parseTransaction(context, tx)
+          const transaction = parseTransaction(context, tx)
           const status = existing ? existing.status : 'REGISTERED'
           if (transaction) {
             context.commit('transactions', [{
@@ -189,23 +195,25 @@ export default function createActions (config) {
         }
 
         const attempt = payload.attempt || 0
-        let retryCount = tf.getPendingTxRetryCount(payload.timestamp || (existing && existing.timestamp), context.state.crypto)
-        let retry = attempt < retryCount
-        let retryTimeout = tf.getPendingTxRetryTimeout(payload.timestamp || (existing && existing.timestamp), context.state.crypto)
+        const retryCount = tf.getPendingTxRetryCount(payload.timestamp || (existing && existing.timestamp), context.state.crypto)
+        const retry = attempt < retryCount
+        const retryTimeout = tf.getPendingTxRetryTimeout(payload.timestamp || (existing && existing.timestamp), context.state.crypto)
 
         if (!retry) {
           // Give up, if transaction could not be found after so many attempts
-          context.commit('transactions', [{ hash: payload.hash, status: 'ERROR' }])
+          context.commit('transactions', [{ hash: payload.hash, status: 'REJECTED' }])
         } else if (!payload.updateOnly) {
           // In case of an error or a pending transaction fetch its details once again later
           // Increment attempt counter, if no transaction was found so far
-          const newPayload = tx ? payload : {
-            ...payload,
-            attempt: attempt + 1,
-            force: true,
-            updateOnly: false,
-            dropStatus: false
-          }
+          const newPayload = tx
+            ? payload
+            : {
+                ...payload,
+                attempt: attempt + 1,
+                force: true,
+                updateOnly: false,
+                dropStatus: false
+              }
 
           setTimeout(() => context.dispatch('getTransaction', newPayload), retryTimeout)
         }
@@ -225,7 +233,7 @@ export default function createActions (config) {
 
       const gasPrice = transaction.gasPrice
 
-      const supplier = () => api.eth.getTransactionReceipt.request(payload.hash, (err, tx) => {
+      const supplier = () => api.getTransactionReceipt.request(payload.hash, (err, tx) => {
         let replay = true
 
         if (!err && tx) {
@@ -236,10 +244,10 @@ export default function createActions (config) {
 
           if (Number(tx.status) === 0) {
             // Status "0x0" means that the transaction has been rejected
-            update.status = 'ERROR'
+            update.status = 'REJECTED'
           } else if (tx.blockNumber) {
             // If blockNumber is not null, the transaction is confirmed
-            update.status = 'SUCCESS'
+            update.status = 'CONFIRMED'
             update.blockNumber = tx.blockNumber
           }
 
@@ -282,6 +290,7 @@ export default function createActions (config) {
         context.state.transactionsCount = 0
         context.state.maxHeight = -1
         context.state.minHeight = Infinity
+        context.commit('bottom', false)
       }
       const { address, maxHeight, contractAddress, decimals } = context.state
       const from = maxHeight > 0 ? maxHeight + 1 : 0
@@ -333,7 +342,7 @@ export default function createActions (config) {
           context.commit('transactions', { transactions: result.items, updateTimestamps: true })
 
           if (!result.items.length) {
-            context.commit('bottom')
+            context.commit('bottom', true)
           }
         },
         error => {
diff --git a/src/store/modules/eth-base/eth-base-mutations.js b/src/store/modules/eth-base/eth-base-mutations.js
index 6273f539d..58acb49d8 100644
--- a/src/store/modules/eth-base/eth-base-mutations.js
+++ b/src/store/modules/eth-base/eth-base-mutations.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
   /** Set ETH balance */
@@ -11,11 +12,12 @@ export default {
     state.address = account.address
     state.publicKey = account.publicKey
     state.privateKey = account.privateKey
+    state.web3Account = account.web3Account
   },
 
   /** Sets a flag, indicating that the oldest transaction has been retrieved for this account */
-  bottom (state) {
-    state.bottomReached = true
+  bottom (state, value) {
+    state.bottomReached = value
   },
 
   /**
@@ -24,8 +26,8 @@ export default {
    * @param {Array<{hash: string, time: number}>} transactions transactions list
    */
   transactions (state, transactions) {
-    if (transactions.updateTimestamps) {
-      var updateTimestamps = transactions.updateTimestamps
+    const updateTimestamps = transactions.updateTimestamps
+    if (updateTimestamps) {
       transactions = transactions.transactions
     }
     let minHeight = Infinity
@@ -38,7 +40,7 @@ export default {
 
       Object.keys(tx).forEach(key => tx[key] === undefined && delete tx[key])
 
-      const direction = tx.recipientId === address ? 'to' : 'from'
+      const direction = isStringEqualCI(tx.recipientId, address) ? 'to' : 'from'
       const newTx = Object.assign(
         { direction, id: tx.hash },
         state.transactions[tx.hash],
@@ -54,7 +56,7 @@ export default {
     })
 
     // Magic here helps to refresh Tx list when browser deletes it
-    let txCount = Object.keys(state.transactions).length
+    const txCount = Object.keys(state.transactions).length
     if (state.transactionsCount < txCount) { // We don't delete transactions, so they can't become in short
       state.transactionsCount = txCount
     }
diff --git a/src/store/modules/eth/actions.js b/src/store/modules/eth/actions.js
index a6edb2ce8..41b528dd2 100644
--- a/src/store/modules/eth/actions.js
+++ b/src/store/modules/eth/actions.js
@@ -1,16 +1,16 @@
 import * as utils from '../../../lib/eth-utils'
 import createActions from '../eth-base/eth-base-actions'
 
-import { ETH_TRANSFER_GAS, ETH_GASPRICE_MULTIPLIER, INCREASE_FEE_MULTIPLIER } from '../../../lib/constants'
+import { ETH_TRANSFER_GAS, INCREASE_FEE_MULTIPLIER } from '../../../lib/constants'
 import { storeCryptoAddress } from '../../../lib/store-crypto-address'
 
 /** Timestamp of the most recent status update */
 let lastStatusUpdate = 0
-/** Status update interval */
-const STATUS_INTERVAL = 8000
+/** Status update interval is 25 sec: ETH balance, gas price, last block height */
+const STATUS_INTERVAL = 25000
 
 /**
- * Stores ETH address to the Adamant KVS if it's not there yet
+ * Stores ETH address to the ADAMANT KVS if it's not there yet
  * @param {*} context
  */
 function storeEthAddress (context) {
@@ -21,16 +21,17 @@ const initTransaction = (api, context, ethAddress, amount, increaseFee) => {
   const transaction = {
     from: context.state.address,
     to: ethAddress,
-    value: api.fromDecimal(utils.toWei(amount)),
+    value: utils.toWei(amount)
     // gas: api.fromDecimal(ETH_TRANSFER_GAS), // Don't take default value, instead calculate with estimateGas(transactionObject)
-    gasPrice: api.fromDecimal(context.getters.gasPrice)
+    // gasPrice: context.getters.gasPrice // Set gas price to auto calc
+    // nonce // Let sendTransaction choose it
   }
 
-  let gasLimit = api.eth.estimateGas(transaction)
-  gasLimit = increaseFee ? (gasLimit * INCREASE_FEE_MULTIPLIER).toString(16) : gasLimit.toString(16)
-  transaction.gas = '0x' + gasLimit
-
-  return transaction
+  return api.estimateGas(transaction).then(gasLimit => {
+    gasLimit = increaseFee ? gasLimit * INCREASE_FEE_MULTIPLIER : gasLimit
+    transaction.gas = gasLimit
+    return transaction
+  })
 }
 
 const parseTransaction = (context, tx) => {
@@ -40,15 +41,15 @@ const parseTransaction = (context, tx) => {
     recipientId: tx.to,
     amount: utils.toEther(tx.value.toString(10)),
     fee: utils.calculateFee(tx.gas, tx.gasPrice.toString(10)),
-    status: tx.blockNumber ? 'SUCCESS' : 'PENDING',
+    status: tx.blockNumber ? 'CONFIRMED' : 'PENDING',
     blockNumber: tx.blockNumber,
-    gasPrice: tx.gasPrice.toNumber(10)
+    gasPrice: +tx.gasPrice
   }
 }
 
 const createSpecificActions = (api, queue) => ({
   /**
-   * Requests ETH account status: balance, gas price, etc.
+   * Requests ETH account status: balance, gas price, last block height
    * @param {*} context Vuex action context
    */
   updateStatus (context) {
@@ -57,29 +58,22 @@ const createSpecificActions = (api, queue) => ({
     const supplier = () => {
       if (!context.state.address) return []
 
-      const block = context.state.blockNumber ? Math.max(0, context.state.blockNumber - 12) : 0
-
       return [
         // Balance
-        api.eth.getBalance.request(context.state.address, block || 'latest', (err, balance) => {
-          if (!err) {
-            context.commit('balance', Number(
-              utils.toEther(balance.toString())
-            ))
-          }
+        api.getBalance.request(context.state.address, 'latest', (err, balance) => {
+          if (!err) context.commit('balance', Number(utils.toEther(balance.toString())))
         }),
         // Current gas price
-        api.eth.getGasPrice.request((err, price) => {
+        api.getGasPrice.request((err, price) => {
           if (!err) {
-            const gasPrice = Math.round(ETH_GASPRICE_MULTIPLIER * price.toNumber())
             context.commit('gasPrice', {
-              gasPrice,
-              fee: +(+utils.calculateFee(ETH_TRANSFER_GAS, gasPrice)).toFixed(7)
+              gasPrice: price, // string type
+              fee: +(+utils.calculateFee(ETH_TRANSFER_GAS, price)).toFixed(8) // number type, in ETH
             })
           }
         }),
         // Current block number
-        api.eth.getBlockNumber.request((err, number) => {
+        api.getBlockNumber.request((err, number) => {
           if (!err) context.commit('blockNumber', number)
         })
       ]
diff --git a/src/store/modules/eth/getters.js b/src/store/modules/eth/getters.js
index 1a8007d22..f7155a46d 100644
--- a/src/store/modules/eth/getters.js
+++ b/src/store/modules/eth/getters.js
@@ -11,5 +11,7 @@ export default {
 
   privateKey: state => state.privateKey,
 
+  web3Account: state => state.web3Account,
+
   ...baseGetters
 }
diff --git a/src/store/modules/lsk-base/lsk-base-actions.js b/src/store/modules/lsk-base/lsk-base-actions.js
index 487a8f5cf..c4737a023 100644
--- a/src/store/modules/lsk-base/lsk-base-actions.js
+++ b/src/store/modules/lsk-base/lsk-base-actions.js
@@ -106,7 +106,7 @@ function createActions (options) {
         ))
         .then(({ hash, error }) => {
           if (error) {
-            context.commit('transactions', [{ hash, status: 'ERROR' }])
+            context.commit('transactions', [{ hash, status: 'REJECTED' }])
             throw error
           } else {
             console.log(`${crypto} transaction has been sent: ${hash}`)
@@ -137,19 +137,19 @@ function createActions (options) {
       if (!api) return
       if (!payload.hash) return
 
-      const existing = context.state.transactions[payload.hash]
+      let existing = context.state.transactions[payload.hash]
       if (existing && !payload.force) return
 
       // Set a stub so far, if the transaction is not in the store yet
-      // if (!existing || existing.status === 'ERROR') {
       if (!existing || payload.dropStatus) {
         payload.updateOnly = false
         context.commit('transactions', [{
           hash: payload.hash,
-          timestamp: payload.timestamp,
+          timestamp: (existing && existing.timestamp) || payload.timestamp || Date.now(),
           amount: payload.amount,
           status: 'PENDING'
         }])
+        existing = context.state.transactions[payload.hash]
       }
 
       let tx = null
@@ -164,7 +164,7 @@ function createActions (options) {
       if (tx) {
         context.commit('transactions', [tx])
         // The transaction has been confirmed, we're done here
-        if (tx.status === 'SUCCESS') return
+        if (tx.status === 'CONFIRMED') return
 
         // If it's not confirmed but is already registered, keep on trying to fetch its details
         retryTimeout = fetchRetryTimeout
@@ -182,7 +182,7 @@ function createActions (options) {
 
       if (!retry) {
         // If we're here, we have abandoned any hope to get the transaction details.
-        context.commit('transactions', [{ hash: payload.hash, status: 'ERROR' }])
+        context.commit('transactions', [{ hash: payload.hash, status: 'REJECTED' }])
       } else if (!payload.updateOnly) {
         // Try to get the details one more time
         const newPayload = {
@@ -217,6 +217,7 @@ function createActions (options) {
         context.state.transactionsCount = 0
         context.state.maxTimestamp = -1
         context.state.minTimestamp = Infinity
+        context.commit('bottom', false)
       }
       if (context.state.maxTimestamp > 0) {
         options.fromTimestamp = context.state.maxTimestamp
@@ -272,7 +273,7 @@ function createActions (options) {
         // Successful but empty response means, that the oldest transaction for the current
         // address has been received already
         if (transactions && transactions.length === 0) {
-          context.commit('bottom')
+          context.commit('bottom', true)
         }
       }, error => {
         context.commit('areOlderLoading', false)
diff --git a/src/store/modules/lsk-base/lsk-base-mutations.js b/src/store/modules/lsk-base/lsk-base-mutations.js
index b4785a396..616c0fac0 100644
--- a/src/store/modules/lsk-base/lsk-base-mutations.js
+++ b/src/store/modules/lsk-base/lsk-base-mutations.js
@@ -17,8 +17,8 @@ export default (initialState) => ({
   },
 
   /** Sets a flag, indicating that the oldest transaction has been retrieved for this account */
-  bottom (state) {
-    state.bottomReached = true
+  bottom (state, value) {
+    state.bottomReached = value
   },
 
   /**
@@ -27,8 +27,8 @@ export default (initialState) => ({
    * @param {Array<{hash: string, time: number}>} transactions transactions list
    */
   transactions (state, transactions) {
-    if (transactions.updateTimestamps) {
-      var updateTimestamps = transactions.updateTimestamps
+    const updateTimestamps = transactions.updateTimestamps
+    if (updateTimestamps) {
       transactions = transactions.transactions
     }
 
@@ -55,7 +55,7 @@ export default (initialState) => ({
     })
 
     // Magic here helps to refresh Tx list when browser deletes it
-    let txCount = Object.keys(state.transactions).length
+    const txCount = Object.keys(state.transactions).length
     if (state.transactionsCount < txCount) { // We don't delete transactions, so they can't become in short
       state.transactionsCount = txCount
     }
diff --git a/src/store/modules/lsk/lsk-actions.js b/src/store/modules/lsk/lsk-actions.js
index 18376b1b2..70d851530 100644
--- a/src/store/modules/lsk/lsk-actions.js
+++ b/src/store/modules/lsk/lsk-actions.js
@@ -37,9 +37,9 @@ const customActions = getApi => ({
    * @param {{hash: string}} payload action payload
    */
   updateTransaction ({ dispatch, getters }, payload) {
-    const tx = getters['transaction'](payload.hash)
+    const tx = getters.transaction(payload.hash)
 
-    if (tx && (tx.status === 'SUCCESS' || tx.status === 'ERROR')) {
+    if (tx && (tx.status === 'CONFIRMED' || tx.status === 'REJECTED')) {
       // If transaction is in one of the final statuses (either succeeded or failed),
       // just update the current height to recalculate its confirmations counter.
       return dispatch('updateHeight')
diff --git a/src/store/modules/partners/partner-actions.js b/src/store/modules/partners/partner-actions.js
index 1317d0922..595cdc32d 100644
--- a/src/store/modules/partners/partner-actions.js
+++ b/src/store/modules/partners/partner-actions.js
@@ -71,7 +71,7 @@ export default {
     return admApi.getStored(key, payload.partner, MAXIMUM_ADDRESSES).then(
       txs => {
         if (txs.length > 0) {
-          let addresses = parseCryptoAddressesKVStxs(txs)
+          const addresses = parseCryptoAddressesKVStxs(txs)
           context.commit('address', { ...payload, crypto, address: addresses.mainAddress })
           if (addresses.addressesCount > 1) {
             context.commit('addresses_inconsistency', { ...payload, crypto, addresses: addresses.storedAddresses })
diff --git a/src/store/modules/partners/partner-mutations.js b/src/store/modules/partners/partner-mutations.js
index 3ac579b53..a6928baf7 100644
--- a/src/store/modules/partners/partner-mutations.js
+++ b/src/store/modules/partners/partner-mutations.js
@@ -14,7 +14,7 @@ export default {
    * @param {{partner: string, displayName: string}} payload partner address and display name
    */
   displayName (state, { partner, displayName }) {
-    if (state.list.hasOwnProperty(partner)) {
+    if (Object.prototype.hasOwnProperty.call(state.list, partner)) {
       state.list[partner].displayName = displayName
     } else {
       // if partner is not in the list, add
diff --git a/src/store/modules/partners/partners-state.js b/src/store/modules/partners/partners-state.js
index 598221141..94197b3d6 100644
--- a/src/store/modules/partners/partners-state.js
+++ b/src/store/modules/partners/partners-state.js
@@ -3,11 +3,12 @@ export default () => {
     lastChange: 0,
     lastUpdate: 0,
     list: {
-      'U15423595369615486571': { displayName: 'chats.virtual.bounty_wallet_title' },
-      'U1835325601873095435': { displayName: 'chats.virtual.bounty_foundation_wallet_title' },
-      'U5149447931090026688': { displayName: 'chats.virtual.exchange_bot_title' },
-      'U380651761819723095': { displayName: 'chats.virtual.donate_bot_title' },
-      'U17840858470710371662': { displayName: 'chats.virtual.bitcoin_bet_title' }
+      U15423595369615486571: { displayName: 'chats.virtual.bounty_wallet_title' },
+      U1835325601873095435: { displayName: 'chats.virtual.bounty_foundation_wallet_title' },
+      U5149447931090026688: { displayName: 'chats.virtual.exchange_bot_title' },
+      U1644771796259136854: { displayName: 'chats.virtual.bounty_bot_title' },
+      U380651761819723095: { displayName: 'chats.virtual.donate_bot_title' },
+      U17840858470710371662: { displayName: 'chats.virtual.bitcoin_bet_title' }
     }
   }
 }
diff --git a/src/store/plugins/indexedDb.js b/src/store/plugins/indexedDb.js
index 99460f0d6..8da7e17a1 100644
--- a/src/store/plugins/indexedDb.js
+++ b/src/store/plugins/indexedDb.js
@@ -6,6 +6,7 @@ import router from '@/router'
 import { Modules, Chats, Security, clearDb } from '@/lib/idb'
 import { restoreState, modules } from '@/lib/idb/state'
 import { Cryptos } from '@/lib/constants'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 const chatModuleMutations = ['setHeight', 'setFulfilled']
 const multipleChatMutations = ['markAllAsRead', 'createEmptyChat', 'createAdamantChats']
@@ -22,7 +23,7 @@ function isModuleMutation (mutation) {
     return false
   }
 
-  const [ moduleName, mutationName ] = split
+  const [moduleName, mutationName] = split
 
   // should module be synchronized with the IDB?
   const isModuleInIDB = modules.includes(moduleName)
@@ -46,8 +47,8 @@ function isChatMutation (mutation) {
  * @returns {Array<{[key]: Function}>}
  */
 function createThrottles () {
-  let interval = 30000
-  let throttles = {}
+  const interval = 30000
+  const throttles = {}
 
   // throttle modules
   modules.forEach(module => {
@@ -86,7 +87,7 @@ const throttles = createThrottles()
 const chatThrottles = {}
 
 function chatThrottle (chatId) {
-  let interval = 10000
+  const interval = 10000
 
   // create throttle wrapper if does not exists
   if (!chatThrottles[chatId]) {
@@ -147,18 +148,18 @@ export default store => {
     // start sync if state has been saved to IDB
     if (state.IDBReady && store.getters['options/isLoginViaPassword']) {
       if (isModuleMutation(mutation.type)) {
-        const [ moduleName ] = mutation.type.split('/')
+        const [moduleName] = mutation.type.split('/')
 
         throttles[moduleName]({
           name: moduleName,
           value: state[moduleName]
         })
       } else if (isChatMutation(mutation.type)) {
-        const [ , mutationName ] = mutation.type.split('/')
+        const [, mutationName] = mutation.type.split('/')
 
         // if mutation affected all chats
         if (multipleChatMutations.includes(mutationName)) {
-          let chats = []
+          const chats = []
           const keys = Object.keys(state.chat.chats)
 
           keys.forEach(key => {
@@ -174,7 +175,7 @@ export default store => {
 
           switch (mutationName) {
             case 'pushMessage':
-              chatId = mutation.payload.message.senderId === mutation.payload.userId
+              chatId = isStringEqualCI(mutation.payload.message.senderId, mutation.payload.userId)
                 ? mutation.payload.message.recipientId
                 : mutation.payload.message.senderId
               break
diff --git a/src/store/plugins/socketsPlugin.js b/src/store/plugins/socketsPlugin.js
index e1a7f007e..92d718468 100644
--- a/src/store/plugins/socketsPlugin.js
+++ b/src/store/plugins/socketsPlugin.js
@@ -1,9 +1,10 @@
 import socketClient from '@/lib/sockets'
 import { decodeChat, getPublicKey } from '@/lib/adamant-api'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 function subscribe (store) {
   socketClient.subscribe('newMessage', transaction => {
-    const promise = (transaction.recipientId === store.state.address)
+    const promise = (isStringEqualCI(transaction.recipientId, store.state.address))
       ? Promise.resolve(transaction.senderPublicKey)
       : getPublicKey(transaction.recipientId)
 
@@ -11,7 +12,10 @@ function subscribe (store) {
       const decoded = transaction.type === 0
         ? transaction
         : decodeChat(transaction, publicKey)
-      // const decoded = decodeChat(transaction, publicKey)
+
+      // All transactions we get via socket are shown in chats, including ADM direct transfers
+      // Currently, we don't update confirmations for direct transfers, see getChats() in adamant-api.js
+      // So we'll update confirmations in getTransactionStatus()
       store.dispatch('chat/pushMessages', [decoded])
     })
   })
diff --git a/src/views/Chat.vue b/src/views/Chat.vue
index 73210aadc..e71859c40 100644
--- a/src/views/Chat.vue
+++ b/src/views/Chat.vue
@@ -1,8 +1,10 @@
 <template>
-  <v-layout row wrap justify-center>
-
+  <v-layout
+    row
+    wrap
+    justify-center
+  >
     <container>
-
       <chat
         :message-text="messageText"
         :partner-id="partnerId"
@@ -18,9 +20,7 @@
       />
 
       <ProgressIndicator :show="!isFulfilled" />
-
     </container>
-
   </v-layout>
 </template>
 
@@ -31,25 +31,35 @@ import ProgressIndicator from '@/components/ProgressIndicator'
 import partnerName from '@/mixins/partnerName'
 
 export default {
-  mixins: [partnerName],
-  computed: {
-    address () {
-      return this.$store.state.address
-    },
-    isFulfilled () {
-      return this.$store.state.chat.isFulfilled
-    }
-  },
   components: {
     ProgressIndicator,
     Chat,
     PartnerInfo
   },
+  mixins: [partnerName],
+  props: {
+    messageText: {
+      default: '',
+      type: String
+    },
+    partnerId: {
+      required: true,
+      type: String
+    }
+  },
   data: () => ({
     show: false,
     contactAddress: '',
     contactName: ''
   }),
+  computed: {
+    address () {
+      return this.$store.state.address
+    },
+    isFulfilled () {
+      return this.$store.state.chat.isFulfilled
+    }
+  },
   methods: {
     /**
      * @param {string} address ADAMANT address
@@ -59,16 +69,6 @@ export default {
       this.contactName = this.getPartnerName(address)
       this.show = true
     }
-  },
-  props: {
-    messageText: {
-      default: '',
-      type: String
-    },
-    partnerId: {
-      required: true,
-      type: String
-    }
   }
 }
 </script>
diff --git a/src/views/Chats.vue b/src/views/Chats.vue
index 1bc1be080..bbaaebd54 100644
--- a/src/views/Chats.vue
+++ b/src/views/Chats.vue
@@ -1,17 +1,33 @@
 <template>
-  <v-layout row wrap justify-center :class="className">
+  <v-layout
+    row
+    wrap
+    justify-center
+    :class="className"
+  >
     <container>
-      <v-layout row wrap>
+      <v-layout
+        row
+        wrap
+      >
         <v-flex xs12>
-
-          <v-list two-line subheader class="transparent">
+          <v-list
+            two-line
+            subheader
+            class="transparent"
+          >
             <v-list-tile
               v-if="isFulfilled"
-              @click="showChatStartDialog = true"
               :class="`${className}__tile`"
+              @click="showChatStartDialog = true"
             >
               <v-list-tile-avatar size="24">
-                <v-icon :class="`${className}__icon`" size="16">mdi-message-outline</v-icon>
+                <v-icon
+                  :class="`${className}__icon`"
+                  size="16"
+                >
+                  mdi-message-outline
+                </v-icon>
               </v-list-tile-avatar>
 
               <div>
@@ -21,7 +37,10 @@
               </div>
             </v-list-tile>
 
-            <transition-group name="messages" v-if="isFulfilled">
+            <transition-group
+              v-if="isFulfilled"
+              name="messages"
+            >
               <chat-preview
                 v-for="transaction in messages"
                 :key="transaction.contactId"
@@ -35,7 +54,6 @@
               />
             </transition-group>
           </v-list>
-
         </v-flex>
 
         <ChatSpinner :value="!isFulfilled" />
@@ -43,8 +61,8 @@
     </container>
 
     <chat-start-dialog
-      :partnerId="partnerId"
       v-model="showChatStartDialog"
+      :partner-id="partnerId"
       @error="onError"
       @start-chat="openChat"
     />
@@ -58,6 +76,19 @@ import ChatSpinner from '@/components/ChatSpinner'
 import scrollPosition from '@/mixins/scrollPosition'
 
 export default {
+  components: {
+    ChatPreview,
+    ChatStartDialog,
+    ChatSpinner
+  },
+  mixins: [scrollPosition],
+  props: {
+    partnerId: { default: undefined, type: String },
+    showNewContact: { default: false, type: Boolean }
+  },
+  data: () => ({
+    showChatStartDialog: false
+  }),
   computed: {
     className: () => 'chats-view',
     isFulfilled () {
@@ -73,9 +104,9 @@ export default {
       return this.$store.state.address
     }
   },
-  data: () => ({
-    showChatStartDialog: false
-  }),
+  mounted () {
+    this.showChatStartDialog = this.showNewContact
+  },
   methods: {
     openChat (partnerId, messageText) {
       this.$router.push({
@@ -91,19 +122,6 @@ export default {
     onError (message) {
       this.$store.dispatch('snackbar/show', { message })
     }
-  },
-  mixins: [scrollPosition],
-  mounted () {
-    this.showChatStartDialog = this.showNewContact
-  },
-  props: {
-    partnerId: { type: String },
-    showNewContact: { default: false, type: Boolean }
-  },
-  components: {
-    ChatPreview,
-    ChatStartDialog,
-    ChatSpinner
   }
 }
 </script>
diff --git a/src/views/ExportKeys.vue b/src/views/ExportKeys.vue
index fa0fd3f3f..061cb91dd 100644
--- a/src/views/ExportKeys.vue
+++ b/src/views/ExportKeys.vue
@@ -6,8 +6,15 @@
       :show-back="true"
       flat
     />
-    <v-container fluid class="px-0">
-      <v-layout row wrap justify-center>
+    <v-container
+      fluid
+      class="px-0"
+    >
+      <v-layout
+        row
+        wrap
+        justify-center
+      >
         <container padding>
           <export-keys-form />
         </container>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 33e5978a5..7354df5af 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,29 +1,38 @@
 <template>
-  <v-layout row wrap justify-center :class="className">
-
+  <v-layout
+    row
+    wrap
+    justify-center
+    :class="className"
+  >
     <container>
-
-      <v-card flat class="transparent white--text" :class="`${className}__card`">
-
+      <v-card
+        flat
+        class="transparent white--text"
+        :class="`${className}__card`"
+      >
         <!-- Wallets -->
-        <v-card :class="`${className}__wallets`" flat>
+        <v-card
+          :class="`${className}__wallets`"
+          flat
+        >
           <v-tabs
+            ref="vtabs"
             v-model="currentWallet"
             grow
-            ref="vtabs"
             show-arrows
           >
             <v-tab
               v-for="wallet in wallets"
-              :href="`#${wallet.cryptoCurrency}`"
               :key="wallet.cryptoCurrency"
+              :href="`#${wallet.cryptoCurrency}`"
               @wheel="onWheel"
             >
               <div>
                 <crypto-icon
+                  slot="icon"
                   :crypto="wallet.cryptoCurrency"
                   size="medium"
-                  slot="icon"
                   :class="`${className}__icon`"
                 />
                 <div>{{ wallet.balance | numberFormat(4) }}</div>
@@ -33,8 +42,8 @@
 
             <v-tab-item
               v-for="wallet in wallets"
-              :value="wallet.cryptoCurrency"
               :key="wallet.cryptoCurrency"
+              :value="wallet.cryptoCurrency"
             >
               <wallet-card
                 :address="wallet.address"
@@ -44,19 +53,16 @@
                 @click:balance="goToTransactions"
               >
                 <crypto-icon
+                  slot="icon"
                   :crypto="wallet.cryptoCurrency"
                   size="large"
-                  slot="icon"
                 />
               </wallet-card>
             </v-tab-item>
           </v-tabs>
         </v-card>
-
       </v-card>
-
     </container>
-
   </v-layout>
 </template>
 
@@ -90,8 +96,9 @@ function scrollIntoView () {
 }
 
 export default {
-  mounted () {
-    this.$refs.vtabs.scrollIntoView = scrollIntoView
+  components: {
+    WalletCard,
+    CryptoIcon
   },
   computed: {
     className: () => 'account-view',
@@ -122,6 +129,9 @@ export default {
       }
     }
   },
+  mounted () {
+    this.$refs.vtabs.scrollIntoView = scrollIntoView
+  },
   methods: {
     goToTransactions (crypto) {
       this.$router.push({
@@ -140,10 +150,6 @@ export default {
 
       if (nextWallet) this.currentWallet = nextWallet.cryptoCurrency
     }
-  },
-  components: {
-    WalletCard,
-    CryptoIcon
   }
 }
 </script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 1bee3377a..c9188733e 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,44 +1,74 @@
 <template>
-  <v-layout row fill-height justify-center :class="className">
-
+  <v-layout
+    row
+    fill-height
+    justify-center
+    :class="className"
+  >
     <container>
-
       <div class="text-xs-right">
         <language-switcher>
-          <v-icon slot="prepend" size="18">mdi-chevron-right</v-icon>
+          <v-icon
+            slot="prepend"
+            size="18"
+          >
+            mdi-chevron-right
+          </v-icon>
         </language-switcher>
       </div>
 
-      <v-card flat color="transparent" class="text-xs-center mt-3">
-        <logo style="width: 300px;"/>
-
-        <h1 :class="`${className}__title`">{{ $t('login.brand_title') }}</h1>
-        <h2 :class="`${className}__subtitle`" class="hidden-sm-and-down mt-3">{{ $t('login.subheader') }}</h2>
+      <v-card
+        flat
+        color="transparent"
+        class="text-xs-center mt-3"
+      >
+        <logo style="width: 300px;" />
+
+        <h1 :class="`${className}__title`">
+          {{ $t('login.brand_title') }}
+        </h1>
+        <h2
+          :class="`${className}__subtitle`"
+          class="hidden-sm-and-down mt-3"
+        >
+          {{ $t('login.subheader') }}
+        </h2>
       </v-card>
 
-      <v-card v-if="!isLoginViaPassword" flat color="transparent" class="text-xs-center mt-3">
+      <v-card
+        v-if="!isLoginViaPassword"
+        flat
+        color="transparent"
+        class="text-xs-center mt-3"
+      >
         <v-layout justify-center>
-          <v-flex xs12 sm8 md8 lg8>
-
+          <v-flex
+            xs12
+            sm8
+            md8
+            lg8
+          >
             <login-form
               ref="loginForm"
               v-model="passphrase"
               @login="onLogin"
               @error="onLoginError"
             />
-
           </v-flex>
         </v-layout>
 
-        <v-layout justify-center class="mt-2">
+        <v-layout
+          justify-center
+          class="mt-2"
+        >
           <v-btn
-            @click="showQrcodeScanner = true"
             :title="$t('login.scan_qr_code_button_tooltip')"
             icon
             flat
             :class="`${className}__icon`"
+            @click="showQrcodeScanner = true"
           >
-            <icon><qr-code-scan-icon/></icon>
+            <icon><qr-code-scan-icon /></icon>
           </v-btn>
 
           <qrcode-capture
@@ -51,32 +81,47 @@
               flat
               :class="`${className}__icon`"
             >
-              <icon><file-icon/></icon>
+              <icon><file-icon /></icon>
             </v-btn>
           </qrcode-capture>
         </v-layout>
       </v-card>
 
-      <v-layout v-if="!isLoginViaPassword" justify-center class="mt-5">
-        <v-flex xs12 sm8 md8 lg8>
-
+      <v-layout
+        v-if="!isLoginViaPassword"
+        justify-center
+        class="mt-5"
+      >
+        <v-flex
+          xs12
+          sm8
+          md8
+          lg8
+        >
           <passphrase-generator
             @copy="onCopyPassphrase"
           />
-
         </v-flex>
       </v-layout>
 
-      <v-card v-if="isLoginViaPassword" flat color="transparent" class="text-xs-center mt-3">
+      <v-card
+        v-if="isLoginViaPassword"
+        flat
+        color="transparent"
+        class="text-xs-center mt-3"
+      >
         <v-layout justify-center>
-          <v-flex xs12 sm8 md8 lg8>
-
+          <v-flex
+            xs12
+            sm8
+            md8
+            lg8
+          >
             <login-password-form
               v-model="password"
               @login="onLogin"
               @error="onLoginError"
             />
-
           </v-flex>
         </v-layout>
       </v-card>
@@ -86,9 +131,7 @@
         v-model="showQrcodeScanner"
         @scan="onScanQrcode"
       />
-
     </container>
-
   </v-layout>
 </template>
 
@@ -106,6 +149,24 @@ import Logo from '@/components/icons/common/Logo'
 import { navigateByURI } from '@/router/navigationGuard'
 
 export default {
+  components: {
+    LanguageSwitcher,
+    PassphraseGenerator,
+    LoginForm,
+    QrcodeScannerDialog,
+    QrcodeCapture,
+    Icon,
+    QrCodeScanIcon,
+    FileIcon,
+    LoginPasswordForm,
+    Logo
+  },
+  data: () => ({
+    passphrase: '',
+    password: '',
+    showQrcodeScanner: false,
+    logo: '/img/adamant-logo-transparent-512x512.png'
+  }),
   computed: {
     className () {
       return 'login-page'
@@ -114,12 +175,6 @@ export default {
       return this.$store.getters['options/isLoginViaPassword']
     }
   },
-  data: () => ({
-    passphrase: '',
-    password: '',
-    showQrcodeScanner: false,
-    logo: '/img/adamant-logo-transparent-512x512.png'
-  }),
   methods: {
     onDetectQrcode (passphrase) {
       this.onScanQrcode(passphrase)
@@ -157,18 +212,6 @@ export default {
       this.passphrase = passphrase
       this.$nextTick(() => this.$refs.loginForm.submit())
     }
-  },
-  components: {
-    LanguageSwitcher,
-    PassphraseGenerator,
-    LoginForm,
-    QrcodeScannerDialog,
-    QrcodeCapture,
-    Icon,
-    QrCodeScanIcon,
-    FileIcon,
-    LoginPasswordForm,
-    Logo
   }
 }
 </script>
diff --git a/src/views/Nodes.vue b/src/views/Nodes.vue
index b51af2d51..7f84cb9f5 100644
--- a/src/views/Nodes.vue
+++ b/src/views/Nodes.vue
@@ -7,11 +7,16 @@
       flat
     />
 
-    <v-container fluid class="pa-0">
-      <v-layout row wrap justify-center>
-
+    <v-container
+      fluid
+      class="pa-0"
+    >
+      <v-layout
+        row
+        wrap
+        justify-center
+      >
         <container padding>
-
           <v-data-table
             :headers="headers"
             :items="nodes"
@@ -20,9 +25,12 @@
             select-all
             hide-actions
           >
-            <template slot="headers" slot-scope="props">
+            <template
+              slot="headers"
+              slot-scope="props"
+            >
               <tr>
-                <th style="width:56px"></th>
+                <th style="width:56px" />
                 <th
                   v-for="header in props.headers"
                   :key="header.text"
@@ -37,7 +45,10 @@
               </tr>
             </template>
 
-            <template slot="items" slot-scope="props">
+            <template
+              slot="items"
+              slot-scope="props"
+            >
               <td class="pr-2">
                 <v-checkbox
                   :input-value="props.item.active"
@@ -45,22 +56,37 @@
                   hide-details
                   color="grey darken-1"
                   @click.native="toggle(props.item)"
-                ></v-checkbox>
+                />
               </td>
-              <td :class="`${className}__body`" class="pl-0 pr-2" style="line-height: 1;">
+              <td
+                :class="`${className}__body`"
+                class="pl-0 pr-2"
+                style="line-height: 1;"
+              >
                 {{ props.item.url }}
-                <span v-if="props.item.version" :class="`${className}__node-version`"><br>{{ 'v' + props.item.version }}</span>
+                <span
+                  v-if="props.item.version"
+                  :class="`${className}__node-version`"
+                ><br>{{ 'v' + props.item.version }}</span>
               </td>
-              <td :class="`${className}__body`" class="pl-0 pr-2">
+              <td
+                :class="`${className}__body`"
+                class="pl-0 pr-2"
+              >
                 <span>
                   {{ getNodeStatus(props.item) }}
                 </span>
                 <v-icon
                   :color="getNodeColor(props.item)"
                   size="small"
-                >mdi-checkbox-blank-circle</v-icon>
+                >
+                  mdi-checkbox-blank-circle
+                </v-icon>
               </td>
-              <td :class="`${className}__body`" class="pl-0 pr-2">
+              <td
+                :class="`${className}__body`"
+                class="pl-0 pr-2"
+              >
                 <v-icon :color="props.item.socketSupport ? 'green' : 'red'">
                   {{ props.item.socketSupport ? 'mdi-check' : 'mdi-close' }}
                 </v-icon>
@@ -69,31 +95,35 @@
           </v-data-table>
 
           <v-checkbox
+            v-model="preferFastestNodeOption"
             :label="$t('nodes.fastest_title')"
             :class="`${className}__checkbox`"
             color="grey darken-1"
-            v-model="preferFastestNodeOption"
           />
-          <div class="a-text-explanation-enlarged">{{ $t('nodes.fastest_tooltip') }}</div>
+          <div class="a-text-explanation-enlarged">
+            {{ $t('nodes.fastest_tooltip') }}
+          </div>
 
           <v-checkbox
+            v-model="useSocketConnection"
             :label="$t('nodes.use_socket_connection')"
             :class="`${className}__checkbox`"
             color="grey darken-1"
-            v-model="useSocketConnection"
           />
-          <div class="a-text-explanation-enlarged">{{ $t('nodes.use_socket_connection_tooltip') }}</div>
+          <div class="a-text-explanation-enlarged">
+            {{ $t('nodes.use_socket_connection_tooltip') }}
+          </div>
 
+          <!-- eslint-disable vue/no-v-html -- Safe internal content -->
           <div
             :class="`${className}__info a-text-regular-enlarged`"
-            v-html="$t('nodes.nodeLabelDescription')"
             class="mt-4"
-          ></div>
+            v-html="$t('nodes.nodeLabelDescription')"
+          />
+          <!-- eslint-enable vue/no-v-html -->
 
           <div>&nbsp;<br>&nbsp;</div>
-
         </container>
-
       </v-layout>
     </v-container>
   </div>
@@ -103,16 +133,32 @@
 import AppToolbarCentered from '@/components/AppToolbarCentered'
 
 export default {
-  mounted () {
-    this.$store.dispatch('nodes/restore')
-
-    this.timer = setInterval(() => {
-      this.$store.dispatch('nodes/updateStatus')
-    }, 10000)
-  },
-  beforeDestroy () {
-    clearInterval(this.timer)
+  components: {
+    AppToolbarCentered
   },
+  data: () => ({
+    pagination: {
+      sortBy: 'name'
+    },
+    headers: [
+      {
+        text: 'nodes.host',
+        value: 'url',
+        align: 'left'
+      },
+      {
+        text: 'nodes.ping',
+        value: 'ping',
+        align: 'left'
+      },
+      {
+        text: 'nodes.socket',
+        value: 'socket',
+        align: 'left'
+      }
+    ],
+    timer: null
+  }),
   computed: {
     className: () => 'nodes-view',
     useSocketConnection: {
@@ -138,29 +184,16 @@ export default {
       return this.$store.getters['nodes/list']
     }
   },
-  data: () => ({
-    pagination: {
-      sortBy: 'name'
-    },
-    headers: [
-      {
-        text: 'nodes.host',
-        value: 'url',
-        align: 'left'
-      },
-      {
-        text: 'nodes.ping',
-        value: 'ping',
-        align: 'left'
-      },
-      {
-        text: 'nodes.socket',
-        value: 'socket',
-        align: 'left'
-      }
-    ],
-    timer: null
-  }),
+  mounted () {
+    this.$store.dispatch('nodes/restore')
+
+    this.timer = setInterval(() => {
+      this.$store.dispatch('nodes/updateStatus')
+    }, 10000)
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
   methods: {
     toggle (node) {
       this.$store.dispatch('nodes/toggle', {
@@ -196,9 +229,6 @@ export default {
 
       return color + ' lighten-1'
     }
-  },
-  components: {
-    AppToolbarCentered
   }
 }
 </script>
diff --git a/src/views/Options.vue b/src/views/Options.vue
index d26858cd1..af4133e69 100644
--- a/src/views/Options.vue
+++ b/src/views/Options.vue
@@ -7,11 +7,16 @@
       flat
     />
 
-    <v-container fluid class="pa-0">
-      <v-layout row wrap justify-center>
-
+    <v-container
+      fluid
+      class="pa-0"
+    >
+      <v-layout
+        row
+        wrap
+        justify-center
+      >
         <container padding>
-
           <!-- General -->
           <h3
             :class="`${className}__title a-text-caption`"
@@ -19,7 +24,11 @@
           >
             {{ $t('options.general_title') }}
           </h3>
-          <v-layout row wrap align-center>
+          <v-layout
+            row
+            wrap
+            align-center
+          >
             <v-flex xs6>
               <v-subheader
                 :class="`${className}__label`"
@@ -28,16 +37,22 @@
                 {{ $t('options.language_label') }}
               </v-subheader>
             </v-flex>
-            <v-flex xs6 class="text-xs-right">
+            <v-flex
+              xs6
+              class="text-xs-right"
+            >
               <language-switcher
                 append-icon="mdi-chevron-down"
               />
             </v-flex>
-            <v-flex xs12 class="mt-2">
+            <v-flex
+              xs12
+              class="mt-2"
+            >
               <v-checkbox
+                v-model="darkTheme"
                 :label="$t('options.dark_theme')"
                 color="grey darken-1"
-                v-model="darkTheme"
               />
             </v-flex>
           </v-layout>
@@ -49,19 +64,31 @@
           >
             {{ $t('options.security_title') }}
           </h3>
-          <v-layout row wrap align-center>
-            <v-flex xs12 a-text-regular-enlarged>
+          <v-layout
+            row
+            wrap
+            align-center
+          >
+            <v-flex
+              xs12
+              a-text-regular-enlarged
+            >
               <v-checkbox
                 :label="$t('options.stay_logged_in')"
                 color="grey darken-1"
                 :input-value="stayLoggedIn"
-                @click="onCheckStayLoggedIn"
                 readonly
+                @click="onCheckStayLoggedIn"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.stay_logged_in_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.stay_logged_in_tooltip') }}
+              </div>
 
-              <password-set-dialog v-model="passwordDialog" @password="onSetPassword" />
+              <password-set-dialog
+                v-model="passwordDialog"
+                @password="onSetPassword"
+              />
             </v-flex>
           </v-layout>
 
@@ -72,35 +99,51 @@
           >
             {{ $t('options.chats_title') }}
           </h3>
-          <v-layout row wrap align-center>
+          <v-layout
+            row
+            wrap
+            align-center
+          >
             <v-flex xs12>
               <v-checkbox
+                v-model="sendMessageOnEnter"
                 :label="$t('options.send_on_enter')"
                 color="grey darken-1"
-                v-model="sendMessageOnEnter"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.send_on_enter_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.send_on_enter_tooltip') }}
+              </div>
             </v-flex>
 
-            <v-flex xs12 class="mt-4">
+            <v-flex
+              xs12
+              class="mt-4"
+            >
               <v-checkbox
+                v-model="formatMessages"
                 :label="$t('options.format_messages')"
                 color="grey darken-1"
-                v-model="formatMessages"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.format_messages_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.format_messages_tooltip') }}
+              </div>
             </v-flex>
 
-            <v-flex xs12 class="mt-4">
+            <v-flex
+              xs12
+              class="mt-4"
+            >
               <v-checkbox
+                v-model="useFullDate"
                 :label="$t('options.use_full_date')"
                 color="grey darken-1"
-                v-model="useFullDate"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.use_full_date_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.use_full_date_tooltip') }}
+              </div>
             </v-flex>
           </v-layout>
 
@@ -111,33 +154,49 @@
           >
             {{ $t('options.notification_title') }}
           </h3>
-          <v-layout row wrap align-center>
+          <v-layout
+            row
+            wrap
+            align-center
+          >
             <v-flex xs12>
               <v-checkbox
+                v-model="allowSoundNotifications"
                 :label="$t('options.enable_sound')"
                 color="grey darken-1"
-                v-model="allowSoundNotifications"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.enable_sound_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.enable_sound_tooltip') }}
+              </div>
             </v-flex>
-            <v-flex xs12 class="mt-4">
+            <v-flex
+              xs12
+              class="mt-4"
+            >
               <v-checkbox
+                v-model="allowTabNotifications"
                 :label="$t('options.enable_bar')"
                 color="grey darken-1"
-                v-model="allowTabNotifications"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.enable_bar_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.enable_bar_tooltip') }}
+              </div>
             </v-flex>
-            <v-flex xs12 class="mt-4">
+            <v-flex
+              xs12
+              class="mt-4"
+            >
               <v-checkbox
+                v-model="allowPushNotifications"
                 :label="$t('options.enable_push')"
                 color="grey darken-1"
-                v-model="allowPushNotifications"
               />
 
-              <div class="a-text-explanation-enlarged">{{ $t('options.enable_push_tooltip') }}</div>
+              <div class="a-text-explanation-enlarged">
+                {{ $t('options.enable_push_tooltip') }}
+              </div>
             </v-flex>
           </v-layout>
 
@@ -148,76 +207,84 @@
           >
             {{ $t('options.actions') }}
           </h3>
-          <v-layout row wrap>
+          <v-layout
+            row
+            wrap
+          >
             <v-flex xs12>
-            <v-list>
-              <v-list-tile @click="$router.push('/options/nodes')">
-                <v-list-tile-content>
-                  <v-list-tile-title  :class="`${className}__list__title`" >
-                    {{ $t('options.nodes_list') }}
-                  </v-list-tile-title>
-                </v-list-tile-content>
-                <div>
-                  <v-list-tile-title :class="`${className}__list__value`">
-                    <v-icon size="20">mdi-chevron-right</v-icon>
-                  </v-list-tile-title>
-                </div>
-              </v-list-tile>
-
-              <v-list-tile @click="$router.push('/options/export-keys')">
-                <v-list-tile-content>
-                  <v-list-tile-title  :class="`${className}__list__title`" >
-                    {{ $t('options.export_keys.title') }}
-                  </v-list-tile-title>
-                </v-list-tile-content>
-                <div>
-                  <v-list-tile-title :class="`${className}__list__value`">
-                    <v-icon size="20">mdi-chevron-right</v-icon>
-                  </v-list-tile-title>
-                </div>
-              </v-list-tile>
-
-              <v-list-tile  @click="$router.push('/votes')">
-                <v-list-tile-content>
-                  <v-list-tile-title :class="`${className}__list__title`" >
-                    {{ $t('options.vote_for_delegates_button') }}
-                  </v-list-tile-title>
-                </v-list-tile-content>
-                <div>
-                  <v-list-tile-title :class="`${className}__value`">
-                    <v-icon size="20">mdi-chevron-right</v-icon>
-                  </v-list-tile-title>
-                </div>
-              </v-list-tile>
-
-              <v-divider/>
-
-              <v-list-tile  @click="logout">
-                <v-list-tile-content>
-                  <v-list-tile-title :class="`${className}__list__title`" >
-                    {{ $t('bottom.exit_button') }}
-                  </v-list-tile-title>
-                </v-list-tile-content>
-                <div>
-                  <v-list-tile-title :class="`${className}__value`">
-                    <v-icon size="20">mdi-logout-variant</v-icon>
-                  </v-list-tile-title>
-                </div>
-              </v-list-tile>
-
-            </v-list>
+              <v-list>
+                <v-list-tile @click="$router.push('/options/nodes')">
+                  <v-list-tile-content>
+                    <v-list-tile-title :class="`${className}__list__title`">
+                      {{ $t('options.nodes_list') }}
+                    </v-list-tile-title>
+                  </v-list-tile-content>
+                  <div>
+                    <v-list-tile-title :class="`${className}__list__value`">
+                      <v-icon size="20">
+                        mdi-chevron-right
+                      </v-icon>
+                    </v-list-tile-title>
+                  </div>
+                </v-list-tile>
+
+                <v-list-tile @click="$router.push('/options/export-keys')">
+                  <v-list-tile-content>
+                    <v-list-tile-title :class="`${className}__list__title`">
+                      {{ $t('options.export_keys.title') }}
+                    </v-list-tile-title>
+                  </v-list-tile-content>
+                  <div>
+                    <v-list-tile-title :class="`${className}__list__value`">
+                      <v-icon size="20">
+                        mdi-chevron-right
+                      </v-icon>
+                    </v-list-tile-title>
+                  </div>
+                </v-list-tile>
+
+                <v-list-tile @click="$router.push('/votes')">
+                  <v-list-tile-content>
+                    <v-list-tile-title :class="`${className}__list__title`">
+                      {{ $t('options.vote_for_delegates_button') }}
+                    </v-list-tile-title>
+                  </v-list-tile-content>
+                  <div>
+                    <v-list-tile-title :class="`${className}__value`">
+                      <v-icon size="20">
+                        mdi-chevron-right
+                      </v-icon>
+                    </v-list-tile-title>
+                  </div>
+                </v-list-tile>
+
+                <v-divider />
+
+                <v-list-tile @click="logout">
+                  <v-list-tile-content>
+                    <v-list-tile-title :class="`${className}__list__title`">
+                      {{ $t('bottom.exit_button') }}
+                    </v-list-tile-title>
+                  </v-list-tile-content>
+                  <div>
+                    <v-list-tile-title :class="`${className}__value`">
+                      <v-icon size="20">
+                        mdi-logout-variant
+                      </v-icon>
+                    </v-list-tile-title>
+                  </div>
+                </v-list-tile>
+              </v-list>
             </v-flex>
           </v-layout>
           <v-layout>
             <div
               :class="`${className}__version_info ml-auto`"
             >
-              {{ $t('options.version') }} {{ this.$root.$options.version }}
+              {{ $t('options.version') }} {{ $root.$options.version }}
             </div>
           </v-layout>
-
         </container>
-
       </v-layout>
     </v-container>
   </div>
@@ -231,6 +298,15 @@ import { clearDb, db as isIDBSupported } from '@/lib/idb'
 import scrollPosition from '@/mixins/scrollPosition'
 
 export default {
+  components: {
+    LanguageSwitcher,
+    AppToolbarCentered,
+    PasswordSetDialog
+  },
+  mixins: [scrollPosition],
+  data: () => ({
+    passwordDialog: false
+  }),
   computed: {
     className: () => 'settings-view',
     stayLoggedIn () {
@@ -317,9 +393,6 @@ export default {
       return this.$store.getters['options/isLoginViaPassword']
     }
   },
-  data: () => ({
-    passwordDialog: false
-  }),
   methods: {
     onSetPassword () {
       this.$store.commit('options/updateOption', {
@@ -369,12 +442,6 @@ export default {
         return Promise.resolve(this.$router.push('/'))
       }
     }
-  },
-  mixins: [scrollPosition],
-  components: {
-    LanguageSwitcher,
-    AppToolbarCentered,
-    PasswordSetDialog
   }
 }
 </script>
diff --git a/src/views/SendFunds.vue b/src/views/SendFunds.vue
index fba5c5b20..09c7222e5 100644
--- a/src/views/SendFunds.vue
+++ b/src/views/SendFunds.vue
@@ -6,11 +6,16 @@
       flat
     />
 
-    <v-container fluid class="px-0">
-      <v-layout row wrap justify-center>
-
+    <v-container
+      fluid
+      class="px-0"
+    >
+      <v-layout
+        row
+        wrap
+        justify-center
+      >
         <container padding>
-
           <send-funds-form
             :crypto-currency="cryptoCurrency"
             :recipient-address="recipientAddress"
@@ -19,9 +24,7 @@
             @send="onSend"
             @error="onError"
           />
-
         </container>
-
       </v-layout>
     </v-container>
   </div>
@@ -36,21 +39,25 @@ import AppToolbarCentered from '@/components/AppToolbarCentered'
 import SendFundsForm from '@/components/SendFundsForm'
 
 export default {
-  created () {
-    this.validateCryptoCurrency()
-    this.validateRecipientAddress()
-    this.validateAmountToSend()
-  },
-  computed: {
-    comeFromChat () {
-      return this.recipientAddress.length > 0
-    }
+  components: {
+    AppToolbarCentered,
+    SendFundsForm
   },
   data: () => ({
     cryptoCurrency: Cryptos.ADM,
     recipientAddress: '',
     amountToSend: undefined
   }),
+  computed: {
+    comeFromChat () {
+      return this.recipientAddress.length > 0
+    }
+  },
+  created () {
+    this.validateCryptoCurrency()
+    this.validateRecipientAddress()
+    this.validateAmountToSend()
+  },
   methods: {
     validateCryptoCurrency () {
       if (
@@ -82,10 +89,6 @@ export default {
     onError (message) {
       this.$store.dispatch('snackbar/show', { message })
     }
-  },
-  components: {
-    AppToolbarCentered,
-    SendFundsForm
   }
 }
 </script>
diff --git a/src/views/Transactions.vue b/src/views/Transactions.vue
index 5fce9e98d..aad6be87d 100644
--- a/src/views/Transactions.vue
+++ b/src/views/Transactions.vue
@@ -6,20 +6,32 @@
       flat
     />
 
-    <v-container fluid class="pa-0">
-      <v-layout row wrap justify-center>
-
-        <v-list-tile style="position: absolute; top: 20px;" v-if="isRecentLoading">
+    <v-container
+      fluid
+      class="pa-0"
+    >
+      <v-layout
+        row
+        wrap
+        justify-center
+      >
+        <v-list-tile
+          v-if="isRecentLoading"
+          style="position: absolute; top: 20px;"
+        >
           <InlineSpinner />
         </v-list-tile>
 
         <container v-if="isFulfilled">
-
-          <v-list v-if="hasTransactions" three-line class="transparent">
+          <v-list
+            v-if="hasTransactions"
+            three-line
+            class="transparent"
+          >
             <transaction-list-item
               v-for="(transaction, i) in transactions"
-              :key="i"
               :id="transaction.id"
+              :key="i"
               :sender-id="sender(transaction)"
               :recipient-id="recipient(transaction)"
               :timestamp="transaction.timestamp || NaN"
@@ -33,12 +45,13 @@
             </v-list-tile>
           </v-list>
 
-          <h3 v-else class="a-text-caption text-xs-center mt-4">
+          <h3
+            v-else
+            class="a-text-caption text-xs-center mt-4"
+          >
             {{ $t('transaction.no_transactions') }}
           </h3>
-
         </container>
-
       </v-layout>
     </v-container>
   </div>
@@ -48,32 +61,33 @@
 import AppToolbarCentered from '@/components/AppToolbarCentered'
 import InlineSpinner from '@/components/InlineSpinner'
 import TransactionListItem from '@/components/TransactionListItem'
-// import scrollPosition from '@/mixins/scrollPosition'
+import { isStringEqualCI } from '@/lib/textHelpers'
 
 export default {
-  beforeDestroy () {
-    window.removeEventListener('scroll', this.onScroll)
-  },
-  mounted () {
-    if (!this.$store.getters['options/isLoginViaPassword'] || this.$store.state.IDBReady) {
-      this.getNewTransactions()
-    }
-
-    window.addEventListener('scroll', this.onScroll)
+  components: {
+    AppToolbarCentered,
+    InlineSpinner,
+    TransactionListItem
   },
-  watch: {
-    '$store.state.IDBReady' () {
-      if (this.$store.state.IDBReady) this.getNewTransactions()
+  props: {
+    crypto: {
+      default: 'ADM',
+      type: String
     }
   },
+  data: () => ({
+    isFulfilled: false,
+    isRejected: false,
+    isUpdating: false
+  }),
   computed: {
     transactions () {
       const transactions = this.$store.getters[`${this.cryptoModule}/sortedTransactions`]
       const address = this.$store.state[this.crypto.toLowerCase()].address
       return transactions.filter(tx => {
         // Filter invalid "fake" transactions (from chat rich message)
-        return tx.hasOwnProperty('amount') && (
-          tx.recipientId === address || tx.senderId === address
+        return Object.prototype.hasOwnProperty.call(tx, 'amount') && (
+          isStringEqualCI(tx.recipientId, address) || isStringEqualCI(tx.senderId, address)
         )
       })
     },
@@ -90,11 +104,21 @@ export default {
       return this.crypto.toLowerCase()
     }
   },
-  data: () => ({
-    isFulfilled: false,
-    isRejected: false,
-    isUpdating: false
-  }),
+  watch: {
+    '$store.state.IDBReady' () {
+      if (this.$store.state.IDBReady) this.getNewTransactions()
+    }
+  },
+  beforeDestroy () {
+    window.removeEventListener('scroll', this.onScroll)
+  },
+  mounted () {
+    if (!this.$store.getters['options/isLoginViaPassword'] || this.$store.state.IDBReady) {
+      this.getNewTransactions()
+    }
+
+    window.addEventListener('scroll', this.onScroll)
+  },
   // mixins: [scrollPosition],
   methods: {
     sender (transaction) {
@@ -152,7 +176,7 @@ export default {
     },
     getNewTransactions () {
       // If we came from Transactions details sreen, do not update transaction list
-      let doNotUpdate = this.$route.meta.previousRoute.params.txId && !this.isFulfilled &&
+      const doNotUpdate = this.$route.meta.previousRoute.params.txId && !this.isFulfilled &&
         // If we don't just refresh Tx details screen
         this.$route.meta.previousPreviousRoute && this.$route.meta.previousPreviousRoute.name
 
@@ -171,17 +195,6 @@ export default {
           })
       }
     }
-  },
-  props: {
-    crypto: {
-      default: 'ADM',
-      type: String
-    }
-  },
-  components: {
-    AppToolbarCentered,
-    InlineSpinner,
-    TransactionListItem
   }
 }
 </script>
diff --git a/src/views/Votes.vue b/src/views/Votes.vue
index 3b858b32b..3958f8eda 100644
--- a/src/views/Votes.vue
+++ b/src/views/Votes.vue
@@ -6,12 +6,20 @@
       flat
     />
 
-    <v-container fluid class="pa-0">
-      <v-layout row wrap justify-center>
-
+    <v-container
+      fluid
+      class="pa-0"
+    >
+      <v-layout
+        row
+        wrap
+        justify-center
+      >
         <container>
-
-          <v-card flat class="transparent">
+          <v-card
+            flat
+            class="transparent"
+          >
             <v-card-title class="pa-0">
               <v-text-field
                 v-model="search"
@@ -24,7 +32,7 @@
               />
             </v-card-title>
 
-            <div :class="`${className}__spacer`"></div>
+            <div :class="`${className}__spacer`" />
 
             <v-data-table
               :headers="headers"
@@ -36,8 +44,14 @@
               must-sort
               item-key="username"
             >
-              <div slot="no-data" class="text-xs-center">
-                <v-layout align-center justify-center>
+              <div
+                slot="no-data"
+                class="text-xs-center"
+              >
+                <v-layout
+                  align-center
+                  justify-center
+                >
                   <v-progress-circular
                     indeterminate
                     color="primary"
@@ -53,34 +67,66 @@
                 </v-layout>
               </div>
 
-              <template slot="headerCell" slot-scope="props">
-                <span :class="`${className}__header`" slot="activator">
+              <template
+                slot="headerCell"
+                slot-scope="props"
+              >
+                <span
+                  slot="activator"
+                  :class="`${className}__header`"
+                >
                   {{ $t(props.header.text) }}
                 </span>
               </template>
 
-              <template slot="items" slot-scope="props">
+              <template
+                slot="items"
+                slot-scope="props"
+              >
                 <td
-                  @click="toggleDetails(props.item, props)"
                   :class="`${className}__body`"
                   class="pr-0"
                   style="cursor:pointer"
-                >{{ props.item.username }}</td>
-                <td :class="`${className}__body`">{{ props.item.rank }}</td>
+                  @click="toggleDetails(props.item, props)"
+                >
+                  {{ props.item.username }}
+                </td>
+                <td :class="`${className}__body`">
+                  {{ props.item.rank }}
+                </td>
                 <td>
-                  <v-icon v-if="props.item._voted" @click="downVote(props.item.address)">mdi-thumb-up</v-icon>
-                  <v-icon v-else @click="upVote(props.item.address)">mdi-thumb-up-outline</v-icon>
+                  <v-icon
+                    v-if="props.item._voted"
+                    @click="downVote(props.item.address)"
+                  >
+                    mdi-thumb-up
+                  </v-icon>
+                  <v-icon
+                    v-else
+                    @click="upVote(props.item.address)"
+                  >
+                    mdi-thumb-up-outline
+                  </v-icon>
                 </td>
               </template>
 
-              <template slot="expand" slot-scope="props">
-                <v-card flat :class="`${className}__expand`">
-
+              <template
+                slot="expand"
+                slot-scope="props"
+              >
+                <v-card
+                  flat
+                  :class="`${className}__expand`"
+                >
                   <v-list :class="`${className}__expand-list`">
                     <v-list-tile :class="`${className}__expand-list-tile`">
                       <v-list-tile-content>
                         <v-list-tile-title class="a-text-active">
-                          <a :href="getExplorerUrl() + props.item.address" target="_blank" rel="noopener">
+                          <a
+                            :href="getExplorerUrl() + props.item.address"
+                            target="_blank"
+                            rel="noopener"
+                          >
                             {{ props.item.address }}
                           </a>
                         </v-list-tile-title>
@@ -89,8 +135,8 @@
 
                     <v-list-tile
                       v-for="(item, i) in delegateDetails"
-                      :class="`${className}__expand-list-tile`"
                       :key="i"
+                      :class="`${className}__expand-list-tile`"
                     >
                       <v-list-tile-content>
                         <v-list-tile-title class="a-text-explanation">
@@ -104,36 +150,49 @@
                       </v-list-tile-content>
                     </v-list-tile>
                   </v-list>
-
                 </v-card>
               </template>
 
-              <v-alert :class="`${className}__alert`" slot="no-results" :value="true" icon="mdi-alert">
+              <v-alert
+                slot="no-results"
+                :class="`${className}__alert`"
+                :value="true"
+                icon="mdi-alert"
+              >
                 Your search for "{{ search }}" found no results.
               </v-alert>
 
               <template slot="footer">
-                <td :class="`${className}__review`" :colspan="headers.length" class="pa-0">
-
-                  <v-layout row wrap align-center justify-space-between>
-                    <pagination v-if="showPagination" v-model="pagination.page" :pages="pages"></pagination>
+                <td
+                  :class="`${className}__review`"
+                  :colspan="headers.length"
+                  class="pa-0"
+                >
+                  <v-layout
+                    row
+                    wrap
+                    align-center
+                    justify-space-between
+                  >
+                    <pagination
+                      v-if="showPagination"
+                      v-model="pagination.page"
+                      :pages="pages"
+                    />
 
                     <v-btn
-                      @click="showConfirmationDialog"
                       :disabled="reviewButtonDisabled"
                       class="a-btn-primary"
+                      @click="showConfirmationDialog"
                     >
                       {{ $t('votes.summary_title') }}
                     </v-btn>
                   </v-layout>
-
                 </td>
               </template>
             </v-data-table>
           </v-card>
-
         </container>
-
       </v-layout>
     </v-container>
 
@@ -148,20 +207,29 @@
           {{ $t('votes.summary_title') }}
         </v-card-title>
 
-        <v-divider :class="`${className}__divider`"></v-divider>
+        <v-divider :class="`${className}__divider`" />
 
-        <v-layout row wrap class="pa-3">
+        <v-layout
+          row
+          wrap
+          class="pa-3"
+        >
           <div :class="`${className}__dialog-summary`">
             {{ $t('votes.upvotes') }}: <strong>{{ numOfUpvotes }}</strong>,&nbsp;
             {{ $t('votes.downvotes') }}: <strong>{{ numOfDownvotes }}</strong>,&nbsp;
             {{ $t('votes.total_new_votes') }}: <strong>{{ numOfUpvotes + numOfDownvotes }} / {{ voteRequestLimit }}</strong>,&nbsp;
             {{ $t('votes.total_votes') }}: <strong>{{ totalVotes }} / {{ delegates.length }}</strong>
           </div>
-          <div :class="`${className}__dialog-info`" v-html="$t('votes.summary_info')"></div>
+          <!-- eslint-disable vue/no-v-html -- Safe internal content -->
+          <div
+            :class="`${className}__dialog-info`"
+            v-html="$t('votes.summary_info')"
+          />
+          <!-- eslint-enable vue/no-v-html -->
         </v-layout>
 
         <v-card-actions>
-          <v-spacer></v-spacer>
+          <v-spacer />
 
           <v-btn
             flat="flat"
@@ -191,11 +259,27 @@ import numberFormat from '@/filters/numberFormat'
 import { explorerUriToOnion } from '@/lib/uri'
 
 export default {
-  mounted () {
-    this.$store.dispatch('delegates/getDelegates', {
-      address: this.$store.state.address
-    })
+  components: {
+    AppToolbarCentered,
+    Pagination
   },
+  data: () => ({
+    voteRequestLimit: 30,
+    search: '',
+    headers: [
+      { text: 'votes.table_head_name', value: 'username' },
+      { text: 'votes.table_head_rank', value: 'rank' },
+      { text: 'votes.table_head_vote', value: '_voted' }
+    ],
+    pagination: {
+      rowsPerPage: 50,
+      sortBy: 'rank',
+      descending: false,
+      page: 1
+    },
+    waitingForConfirmation: false,
+    dialog: false
+  }),
   computed: {
     className: () => 'delegates-view',
     delegates () {
@@ -260,23 +344,11 @@ export default {
       return (this.numOfUpvotes + this.numOfDownvotes) === 0
     }
   },
-  data: () => ({
-    voteRequestLimit: 30,
-    search: '',
-    headers: [
-      { text: 'votes.table_head_name', value: 'username' },
-      { text: 'votes.table_head_rank', value: 'rank' },
-      { text: 'votes.table_head_vote', value: '_voted' }
-    ],
-    pagination: {
-      rowsPerPage: 50,
-      sortBy: 'rank',
-      descending: false,
-      page: 1
-    },
-    waitingForConfirmation: false,
-    dialog: false
-  }),
+  mounted () {
+    this.$store.dispatch('delegates/getDelegates', {
+      address: this.$store.state.address
+    })
+  },
   methods: {
     getExplorerUrl () {
       return explorerUriToOnion('https://explorer.adamant.im/delegate/')
@@ -367,10 +439,6 @@ export default {
     showConfirmationDialog () {
       this.dialog = true
     }
-  },
-  components: {
-    AppToolbarCentered,
-    Pagination
   }
 }
 </script>
diff --git a/src/views/transactions/Transaction.vue b/src/views/transactions/Transaction.vue
index c77c5ee00..3d00ee9ce 100644
--- a/src/views/transactions/Transaction.vue
+++ b/src/views/transactions/Transaction.vue
@@ -1,5 +1,9 @@
 <template>
-  <component :is="transactionComponent" :id="txId" :crypto="crypto" />
+  <component
+    :is="transactionComponent"
+    :id="txId"
+    :crypto="crypto"
+  />
 </template>
 
 <script>
@@ -13,7 +17,14 @@ import { Cryptos, isErc20, isBtcBased, isLskBased } from '../../lib/constants'
 import { getTxUpdateInterval } from '../../lib/transactionsFetching'
 
 export default {
-  name: 'transaction',
+  name: 'Transaction',
+  components: {
+    AdmTransaction,
+    EthTransaction,
+    Erc20Transaction,
+    BtcTransaction,
+    LskTransaction
+  },
   props: {
     crypto: {
       required: true,
@@ -24,12 +35,19 @@ export default {
       type: String
     }
   },
-  components: {
-    AdmTransaction,
-    EthTransaction,
-    Erc20Transaction,
-    BtcTransaction,
-    LskTransaction
+  data () {
+    return {
+      timer: null
+    }
+  },
+  computed: {
+    transactionComponent () {
+      if (this.crypto === Cryptos.ETH) return 'eth-transaction'
+      if (isErc20(this.crypto)) return 'erc20-transaction'
+      if (isBtcBased(this.crypto)) return 'btc-transaction'
+      if (isLskBased(this.crypto)) return 'lsk-transaction'
+      return 'adm-transaction'
+    }
   },
   mounted () {
     this.update()
@@ -44,20 +62,6 @@ export default {
       // Regularly update Tx details with confirmations count, do force — fetch details for existing Tx also
       this.$store.dispatch(this.crypto.toLowerCase() + '/updateTransaction', { hash: this.txId, force: true, updateOnly: true })
     }
-  },
-  computed: {
-    transactionComponent () {
-      if (this.crypto === Cryptos.ETH) return 'eth-transaction'
-      if (isErc20(this.crypto)) return 'erc20-transaction'
-      if (isBtcBased(this.crypto)) return 'btc-transaction'
-      if (isLskBased(this.crypto)) return 'lsk-transaction'
-      return 'adm-transaction'
-    }
-  },
-  data () {
-    return {
-      timer: null
-    }
   }
 }
 </script>
diff --git a/vue.config.js b/vue.config.js
index 648b661ad..944184c9f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,8 +13,8 @@ module.exports = {
           '!**/{report.html,robots.txt,.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.flowconfig,.yarn-metadata.json,.idea,appveyor.yml,.travis.yml,circle.yml,npm-debug.log,.nyc_output,yarn.lock,.yarn-integrity}'
         ],
         protocols: {
-          'name': 'ADAMANT Messenger',
-          'schemes': ['adm']
+          name: 'ADAMANT Messenger',
+          schemes: ['adm']
         },
         win: {
           icon: './build/win/icon.ico'
@@ -33,6 +33,7 @@ module.exports = {
             Terminal: false,
             Type: 'Application'
           },
+          /* eslint-disable no-template-curly-in-string */
           artifactName: 'ADAMANT-Messenger-${version}.${ext}',
           icon: './build/linux/',
           target: ['AppImage']
@@ -53,7 +54,7 @@ module.exports = {
   configureWebpack: {
     plugins: [
       // remove non english bip39 wordlists
-      new webpack.IgnorePlugin(/^\.\/(?!english)/, /bip39\/src\/wordlists$/),
+      new webpack.IgnorePlugin(/^\.\/wordlists\/(?!english)/, /bip39\/src$/),
       // replace `config.json` for different environments
       new webpack.NormalModuleReplacementPlugin(/(.*){ENV}(.*)/, (resource) => {
         const configName = process.env.ADM_CONFIG_FILE