diff --git a/src/components/ListItemCircle.vue b/src/components/ListItemCircle.vue
index 68d283e4f..620cc1ec8 100644
--- a/src/components/ListItemCircle.vue
+++ b/src/components/ListItemCircle.vue
@@ -5,13 +5,11 @@
 </template>
 
 <script>
-import { get } from 'lodash-es';
-
 export default {
   computed: {
     hasIcon() {
-      return get(this.$slots.default, '[0].tag', '') === 'svg'
-        && get(this.$slots.default, '[0].data.staticClass', '').includes('icon');
+      return this.$slots.default[0]?.tag === 'svg'
+        && this.$slots.default[0]?.data?.staticClass.includes('icon');
     },
   },
 };
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 2e0e99cf0..99aed1fd0 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -1,5 +1,4 @@
 /* eslint-disable max-classes-per-file */
-import { get } from 'lodash-es';
 import { AENS_DOMAIN } from './constants';
 
 export const toUrl = (url) => new URL((/^\w+:\//.test(url) ? '' : 'http://') + url);
@@ -14,7 +13,7 @@ export const isNotFoundError = (error) => error.statusCode === 404;
 export const isInternalServerError = (error) => [500, 503].includes(error.statusCode);
 
 export const isAccountNotFoundError = (error) => isNotFoundError(error) && (
-  get(error, 'response.body.reason') === 'Account not found'
+  error.response?.body?.reason === 'Account not found'
   || error.message.includes('Account not found')
 );
 
diff --git a/src/pages/mobile/Settings.vue b/src/pages/mobile/Settings.vue
index d2ea82164..aab6b4320 100644
--- a/src/pages/mobile/Settings.vue
+++ b/src/pages/mobile/Settings.vue
@@ -138,7 +138,6 @@
 
 <script>
 import { mapState } from 'vuex';
-import { get } from 'lodash-es';
 import AeCard from '../../components/AeCard.vue';
 import Page from '../../components/Page.vue';
 import Guide from '../../components/Guide.vue';
@@ -181,7 +180,7 @@ export default {
     remoteConnectionsCount: ({ mobile }) => Object
       .entries(mobile.followers).filter(([, f]) => f.connected).length,
     appsAccountAccessCount: ({ apps }) => apps
-      .filter((app) => get(app, 'permissions.accessToAccounts.length', 0)).length,
+      .filter((app) => app.permissions.accessToAccounts.length).length,
     mnemonic: ({ accounts: { hdWallet: { mnemonic } } }) => mnemonic,
     removableAccounts: ({ accounts: { list } }) => list
       .map((account, idx) => ({ ...account, idx }))
diff --git a/src/pages/mobile/SettingsAppList.vue b/src/pages/mobile/SettingsAppList.vue
index 7fc20fdc3..afb7c9cb6 100644
--- a/src/pages/mobile/SettingsAppList.vue
+++ b/src/pages/mobile/SettingsAppList.vue
@@ -29,7 +29,6 @@
 
 <script>
 import { mapState } from 'vuex';
-import { get } from 'lodash-es';
 import Page from '../../components/Page.vue';
 import AeCard from '../../components/AeCard.vue';
 import ListItem from '../../components/ListItem.vue';
@@ -46,7 +45,7 @@ export default {
   computed: mapState({
     apps({ apps }, getters) {
       return apps
-        .filter((app) => get(app, 'permissions.accessToAccounts.length', 0))
+        .filter((app) => app.permissions.accessToAccounts.length)
         .map((app) => {
           const c = app.permissions.accessToAccounts.length;
           return {
diff --git a/src/store/__mocks__/crypto-api.js b/src/store/__mocks__/crypto-api.js
deleted file mode 100644
index cec12c452..000000000
--- a/src/store/__mocks__/crypto-api.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { set } from 'lodash-es';
-
-set(window, 'crypto.getRandomValues', () => {});
diff --git a/src/store/modules/root.js b/src/store/modules/root.js
index 0e3f62d30..fd1ea2780 100644
--- a/src/store/modules/root.js
+++ b/src/store/modules/root.js
@@ -1,9 +1,7 @@
 /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
 
 import Vue from 'vue';
-import {
-  update, mergeWith, isPlainObject, camelCase,
-} from 'lodash-es';
+import { mergeWith, isPlainObject, camelCase } from 'lodash-es';
 import { Node, _Middleware } from '@aeternity/aepp-sdk-next';
 import networksRegistry from '../../lib/networksRegistry';
 import { genRandomBuffer } from '../utils';
@@ -93,15 +91,13 @@ export default {
       state.customNetworks.splice(networkIdx - networksRegistry.length, 1);
     },
     toggleAccessToAccount({ apps }, { appHost, accountAddress }) {
-      if (!getAppByHost(apps, appHost)) apps.push({ host: appHost });
-      const app = getAppByHost(apps, appHost);
-      update(
-        app,
-        'permissions.accessToAccounts',
-        (arr = []) => (arr.includes(accountAddress)
-          ? arr.filter((address) => address !== accountAddress)
-          : [...arr, accountAddress]),
-      );
+      if (!getAppByHost(apps, appHost)) {
+        apps.push({ host: appHost, permissions: { accessToAccounts: [] } });
+      }
+      const { permissions: { accessToAccounts } } = getAppByHost(apps, appHost);
+      const idx = accessToAccounts.indexOf(accountAddress);
+      if (idx === -1) accessToAccounts.push(accountAddress);
+      else accessToAccounts.splice(idx, 1);
     },
     setOnLine(state, onLine) {
       state.onLine = onLine;
diff --git a/src/store/plugins/initSdk.js b/src/store/plugins/initSdk.js
index 66096ee2b..1d8a3b9ce 100644
--- a/src/store/plugins/initSdk.js
+++ b/src/store/plugins/initSdk.js
@@ -1,4 +1,4 @@
-import { get, isEqual } from 'lodash-es';
+import { isEqual } from 'lodash-es';
 import { handleUnknownError } from '../../lib/utils';
 
 export default (store) => {
@@ -18,7 +18,7 @@ export default (store) => {
       }
 
       async #ensureCurrentAccountAccessPure() {
-        const accessToAccounts = get(store.getters.getApp(this.host), 'permissions.accessToAccounts', []);
+        const accessToAccounts = store.getters.getApp(this.host)?.permissions.accessToAccounts ?? [];
         if (accessToAccounts.includes(store.getters['accounts/active'].address)) return;
 
         const controller = new AbortController();
diff --git a/src/store/plugins/ui/appsMetadata.js b/src/store/plugins/ui/appsMetadata.js
index de353172e..5042caacd 100644
--- a/src/store/plugins/ui/appsMetadata.js
+++ b/src/store/plugins/ui/appsMetadata.js
@@ -1,6 +1,5 @@
 /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
 
-import { flatMap } from 'lodash-es';
 import Vue from 'vue';
 import { handleUnknownError } from '../../../lib/utils';
 import { PROTOCOL_DEFAULT } from '../../../lib/constants';
@@ -22,10 +21,9 @@ export default (store) => store.registerModule('appsMetadata', {
         name: manifest.short_name || manifest.name || host,
       };
 
-      const icons = flatMap(
-        manifest.icons || [],
-        ({ sizes = '', ...icon }) => sizes.split(' ').map((size) => ({ ...icon, size })),
-      )
+      const icons = (manifest.icons || [])
+        .map(({ sizes = '', ...icon }) => sizes.split(' ').map((size) => ({ ...icon, size })))
+        .flat()
         .map(({ size, ...icon }) => ({ ...icon, side: Math.max(...size.split('x')) }));
       const icon = icons.reduce((p, i) => {
         if (!p) return i || p;
diff --git a/src/store/plugins/ui/names.js b/src/store/plugins/ui/names.js
index 6ee07be58..6c2d0ac40 100644
--- a/src/store/plugins/ui/names.js
+++ b/src/store/plugins/ui/names.js
@@ -1,5 +1,4 @@
 /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
-import { get } from 'lodash-es';
 import BigNumber from 'bignumber.js';
 import Vue from 'vue';
 import { isAddressValid, produceNameId } from '@aeternity/aepp-sdk-next';
@@ -13,7 +12,7 @@ export default (store) => {
     namespaced: true,
     state: {
       names: {},
-      defaults: get(store.state, 'names.defaults', {}),
+      defaults: store.state.names?.defaults ?? {},
       owned: [],
     },
     getters: {