diff --git a/examples/browser/aepp/package.json b/examples/browser/aepp/package.json
index 1705a2f61e..b3440caa5e 100644
--- a/examples/browser/aepp/package.json
+++ b/examples/browser/aepp/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "@aeternity/aepp-calldata": "^1.5.1",
     "@aeternity/aepp-sdk": "file:../../..",
+    "@ledgerhq/hw-transport-webusb": "^6.27.17",
     "buffer": "^6.0.3",
     "core-js": "^3.32.1",
     "tailwindcss": "^2.2.19",
@@ -21,6 +22,9 @@
     "sass": "^1.66.1",
     "sass-loader": "^13.3.2"
   },
+  "peerDependencies": {
+    "webpack": "^5.0.0"
+  },
   "browserslist": [
     "> 1%",
     "last 2 versions",
diff --git a/examples/browser/aepp/src/Connect.vue b/examples/browser/aepp/src/Connect.vue
index ec4d60385c..e81827dbbc 100644
--- a/examples/browser/aepp/src/Connect.vue
+++ b/examples/browser/aepp/src/Connect.vue
@@ -34,6 +34,67 @@
     >
       Cancel detection
     </button>
+
+    <template v-if="walletConnected">
+      <br>
+      <button @click="getAccounts">
+        Get accounts
+      </button>
+      <button @click="subscribeAccounts('subscribe', 'current')">
+        Subscribe current
+      </button>
+      <button @click="subscribeAccounts('unsubscribe', 'current')">
+        Unsubscribe current
+      </button>
+      <button @click="subscribeAccounts('subscribe', 'connected')">
+        Subscribe connected
+      </button>
+      <button @click="subscribeAccounts('unsubscribe', 'connected')">
+        Unsubscribe connected
+      </button>
+
+      <div>
+        <div>RPC Accounts</div>
+        <div>{{ rpcAccounts.map((account) => account.address.slice(0, 8)).join(', ') }}</div>
+      </div>
+    </template>
+  </div>
+
+  <h2>Ledger Hardware Wallet</h2>
+  <div class="group">
+    <template v-if="ledgerStatus">
+      <div>
+        <div>Connection status</div>
+        <div>{{ ledgerStatus }}</div>
+      </div>
+    </template>
+    <button
+      v-else-if="!ledgerAccountFactory"
+      @click="connectLedger"
+    >
+      Connect
+    </button>
+    <template v-else>
+      <button @click="disconnectLedger">
+        Disconnect
+      </button>
+      <button @click="addLedgerAccount">
+        Add Account
+      </button>
+      <button
+        v-if="ledgerAccounts.length > 1"
+        @click="switchLedgerAccount"
+      >
+        Switch Account
+      </button>
+      <button @click="switchNode">
+        Switch Node
+      </button>
+      <div v-if="ledgerAccounts.length">
+        <div>Ledger Accounts</div>
+        <div>{{ ledgerAccounts.map((account) => account.address.slice(0, 8)).join(', ') }}</div>
+      </div>
+    </template>
   </div>
 
   <div class="group">
@@ -58,8 +119,10 @@
 <script>
 import {
   walletDetector, BrowserWindowMessageConnection, RpcConnectionDenyError, RpcRejectedByUserError,
+  WalletConnectorFrame, AccountLedgerFactory,
 } from '@aeternity/aepp-sdk';
 import { mapState } from 'vuex';
+import TransportWebUSB from '@ledgerhq/hw-transport-webusb';
 
 export default {
   data: () => ({
@@ -70,6 +133,10 @@ export default {
     reverseIframeWalletUrl: process.env.VUE_APP_WALLET_URL ?? `http://${location.hostname}:9000`,
     walletInfo: null,
     cancelWalletDetection: null,
+    rpcAccounts: [],
+    ledgerStatus: '',
+    ledgerAccountFactory: null,
+    ledgerAccounts: [],
   }),
   computed: {
     ...mapState(['aeSdk']),
@@ -79,6 +146,54 @@ export default {
     },
   },
   methods: {
+    async connectLedger() {
+      try {
+        this.ledgerStatus = 'Waiting for Ledger response';
+        const transport = await TransportWebUSB.create();
+        this.ledgerAccountFactory = new AccountLedgerFactory(transport);
+      } catch (error) {
+        if (error.name === 'TransportOpenUserCancelled') return;
+        throw error;
+      } finally {
+        this.ledgerStatus = '';
+      }
+    },
+    async disconnectLedger() {
+      this.ledgerAccountFactory = null;
+      this.ledgerAccounts = [];
+      this.$store.commit('setAddress', undefined);
+      if (Object.keys(this.aeSdk.accounts).length) this.aeSdk.removeAccount(this.aeSdk.address);
+    },
+    async addLedgerAccount() {
+      try {
+        this.ledgerStatus = 'Waiting for Ledger response';
+        const idx = this.ledgerAccounts.length;
+        const account = await this.ledgerAccountFactory.initialize(idx);
+        this.ledgerStatus = `Ensure that ${account.address} is displayed on Ledger HW screen`;
+        await this.ledgerAccountFactory.getAddress(idx, true);
+        this.ledgerAccounts.push(account);
+        this.setAccount(this.ledgerAccounts[0]);
+      } catch (error) {
+        if (error.statusCode === 0x6985) return;
+        throw error;
+      } finally {
+        this.ledgerStatus = '';
+      }
+    },
+    switchLedgerAccount() {
+      this.ledgerAccounts.push(this.ledgerAccounts.shift());
+      this.setAccount(this.ledgerAccounts[0]);
+    },
+    async switchNode() {
+      await this.setNode(this.$store.state.networkId === 'ae_mainnet' ? 'ae_uat' : 'ae_mainnet');
+    },
+    async getAccounts() {
+      this.rpcAccounts = await this.walletConnector.getAccounts();
+      if (this.rpcAccounts.length) this.setAccount(this.rpcAccounts[0]);
+    },
+    async subscribeAccounts(type, value) {
+      await this.walletConnector.subscribeAccounts(type, value);
+    },
     async detectWallets() {
       if (this.connectMethod === 'reverse-iframe') {
         this.reverseIframe = document.createElement('iframe');
@@ -93,6 +208,7 @@ export default {
             stopDetection();
             resolve(newWallet.getConnection());
             this.cancelWalletDetection = null;
+            this.walletInfo = newWallet.info;
           }
         });
         this.cancelWalletDetection = () => {
@@ -103,25 +219,43 @@ export default {
         };
       });
     },
+    async setNode(networkId) {
+      const [{ name }] = (await this.aeSdk.getNodesInPool())
+        .filter((node) => node.nodeNetworkId === networkId);
+      this.aeSdk.selectNode(name);
+      this.$store.commit('setNetworkId', networkId);
+    },
+    setAccount(account) {
+      if (Object.keys(this.aeSdk.accounts).length) this.aeSdk.removeAccount(this.aeSdk.address);
+      this.aeSdk.addAccount(account, { select: true });
+      this.$store.commit('setAddress', account.address);
+    },
     async connect() {
       this.walletConnecting = true;
-      this.aeSdk.onDisconnect = () => {
-        this.walletConnected = false;
-        this.walletInfo = null;
-        this.$store.commit('setAddress', undefined);
-        if (this.reverseIframe) this.reverseIframe.remove();
-      };
       try {
         const connection = await this.detectWallets();
         try {
-          this.walletInfo = await this.aeSdk.connectToWallet(connection);
+          this.walletConnector = await WalletConnectorFrame.connect('Simple æpp', connection);
         } catch (error) {
           if (error instanceof RpcConnectionDenyError) connection.disconnect();
           throw error;
         }
+        this.walletConnector.on('disconnect', () => {
+          this.walletConnected = false;
+          this.walletInfo = null;
+          this.rpcAccounts = [];
+          this.$store.commit('setAddress', undefined);
+          if (this.reverseIframe) this.reverseIframe.remove();
+        });
         this.walletConnected = true;
-        const { address: { current } } = await this.aeSdk.subscribeAddress('subscribe', 'connected');
-        this.$store.commit('setAddress', Object.keys(current)[0]);
+
+        this.setNode(this.walletConnector.networkId);
+        this.walletConnector.on('networkIdChange', (networkId) => this.setNode(networkId));
+
+        this.walletConnector.on('accountsChange', (accounts) => {
+          this.rpcAccounts = accounts;
+          if (accounts.length) this.setAccount(accounts[0]);
+        });
       } catch (error) {
         if (
           error.message === 'Wallet detection cancelled'
@@ -134,7 +268,7 @@ export default {
       }
     },
     disconnect() {
-      this.aeSdk.disconnectWallet();
+      this.walletConnector.disconnect();
     },
   },
 };
diff --git a/examples/browser/aepp/src/store.js b/examples/browser/aepp/src/store.js
index 6116d7aa48..e20a9af72f 100644
--- a/examples/browser/aepp/src/store.js
+++ b/examples/browser/aepp/src/store.js
@@ -1,26 +1,18 @@
 import { shallowRef } from 'vue';
 import { createStore } from 'vuex';
-import { AeSdkAepp, Node, CompilerHttp } from '@aeternity/aepp-sdk';
+import { AeSdk, Node, CompilerHttp } from '@aeternity/aepp-sdk';
 
 const store = createStore({
   state: {
     address: undefined,
     networkId: undefined,
-    // AeSdkAepp instance can't be in deep reactive https://github.com/aeternity/aepp-sdk-js/blob/develop/docs/README.md#vue3
-    aeSdk: shallowRef(new AeSdkAepp({
-      name: 'Simple æpp',
+    // AeSdk instance can't be in deep reactive https://github.com/aeternity/aepp-sdk-js/blob/develop/docs/README.md#vue3
+    aeSdk: shallowRef(new AeSdk({
       nodes: [
         { name: 'testnet', instance: new Node('https://testnet.aeternity.io') },
         { name: 'mainnet', instance: new Node('https://mainnet.aeternity.io') },
       ],
       onCompiler: new CompilerHttp('https://v8.compiler.aepps.com'),
-      async onNetworkChange({ networkId }) {
-        const [{ name }] = (await this.getNodesInPool())
-          .filter((node) => node.nodeNetworkId === networkId);
-        this.selectNode(name);
-        store.commit('setNetworkId', networkId);
-      },
-      onAddressChange: ({ current }) => store.commit('setAddress', Object.keys(current)[0]),
     })),
   },
   mutations: {
diff --git a/examples/browser/aepp/src/styles.scss b/examples/browser/aepp/src/styles.scss
index 080d68ea8e..fc001b22ec 100644
--- a/examples/browser/aepp/src/styles.scss
+++ b/examples/browser/aepp/src/styles.scss
@@ -19,7 +19,7 @@ body {
 }
 
 button {
-  @extend .w-40, .p-2, .m-2, .rounded-full, .bg-purple-500, .text-white, .text-xs;
+  @extend .w-44, .p-2, .m-2, .rounded-full, .bg-purple-500, .text-white, .text-xs;
 
   &:disabled {
     @extend .bg-purple-300, .cursor-not-allowed;
diff --git a/examples/browser/aepp/vue.config.js b/examples/browser/aepp/vue.config.js
index 383f082ae8..ee973b9d69 100644
--- a/examples/browser/aepp/vue.config.js
+++ b/examples/browser/aepp/vue.config.js
@@ -1,8 +1,14 @@
 const { defineConfig } = require('@vue/cli-service');
+const webpack = require('webpack');
 
 module.exports = defineConfig({
   publicPath: process.env.PUBLIC_PATH ?? '/',
   devServer: {
     port: 9001,
   },
+  configureWebpack: {
+    plugins: [
+      new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
+    ],
+  },
 });
diff --git a/examples/browser/wallet-iframe/src/styles.scss b/examples/browser/wallet-iframe/src/styles.scss
index 240967783b..2f752654c8 100644
--- a/examples/browser/wallet-iframe/src/styles.scss
+++ b/examples/browser/wallet-iframe/src/styles.scss
@@ -15,7 +15,7 @@ body {
 }
 
 button {
-  @extend .w-40, .p-2, .m-2, .rounded-full, .bg-purple-500, .text-white, .text-xs;
+  @extend .w-44, .p-2, .m-2, .rounded-full, .bg-purple-500, .text-white, .text-xs;
 
   &:disabled {
     @extend .bg-purple-300, .cursor-not-allowed;
diff --git a/examples/browser/wallet-web-extension/src/styles.scss b/examples/browser/wallet-web-extension/src/styles.scss
index 6130689684..32eff37895 100644
--- a/examples/browser/wallet-web-extension/src/styles.scss
+++ b/examples/browser/wallet-web-extension/src/styles.scss
@@ -7,7 +7,7 @@ body {
 }
 
 button {
-  @extend .w-40, .p-2, .m-2, .rounded-full, .bg-purple-500, .text-white, .text-xs;
+  @extend .w-44, .p-2, .m-2, .rounded-full, .bg-purple-500, .text-white, .text-xs;
 
   &:disabled {
     @extend .bg-purple-300, .cursor-not-allowed;
diff --git a/package-lock.json b/package-lock.json
index d2a41f07b7..e9f52fe90c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
         "bs58": "^6.0.0",
         "buffer": "^6.0.3",
         "canonicalize": "^2.0.0",
+        "eventemitter3": "^5.0.1",
         "events": "^3.3.0",
         "isomorphic-ws": "^5.0.0",
         "json-bigint": "^1.0.0",
@@ -7123,6 +7124,11 @@
         "es5-ext": "~0.10.14"
       }
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
diff --git a/package.json b/package.json
index 45ee14266f..18dffa711b 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "bs58": "^6.0.0",
     "buffer": "^6.0.3",
     "canonicalize": "^2.0.0",
+    "eventemitter3": "^5.0.1",
     "events": "^3.3.0",
     "isomorphic-ws": "^5.0.0",
     "json-bigint": "^1.0.0",
diff --git a/src/AeSdkAepp.ts b/src/AeSdkAepp.ts
index 2e461b33b9..6748deb0c8 100644
--- a/src/AeSdkAepp.ts
+++ b/src/AeSdkAepp.ts
@@ -21,6 +21,7 @@ import BrowserConnection from './aepp-wallet-communication/connection/Browser';
 /**
  * RPC handler for AEPP side
  * Contain functionality for wallet interaction and connect it to sdk
+ * @deprecated use WalletConnectorFrame instead
  * @category aepp wallet communication
  */
 export default class AeSdkAepp extends AeSdkBase {
diff --git a/src/aepp-wallet-communication/WalletConnectorFrame.ts b/src/aepp-wallet-communication/WalletConnectorFrame.ts
new file mode 100644
index 0000000000..582725e914
--- /dev/null
+++ b/src/aepp-wallet-communication/WalletConnectorFrame.ts
@@ -0,0 +1,41 @@
+import { Network } from './rpc/types';
+import BrowserConnection from './connection/Browser';
+import WalletConnectorFrameBase from './WalletConnectorFrameBase';
+
+interface EventsNetworkId {
+  networkIdChange: (networkId: string) => void;
+}
+
+/**
+ * Connect to wallet as iframe/web-extension
+ * @category aepp wallet communication
+ */
+export default class WalletConnectorFrame extends WalletConnectorFrameBase<EventsNetworkId> {
+  #networkId = '';
+
+  /**
+   * The last network id reported by wallet
+   */
+  get networkId(): string {
+    return this.#networkId;
+  }
+
+  protected override _updateNetwork(params: Network): void {
+    this.#networkId = params.networkId;
+    this.emit('networkIdChange', this.#networkId);
+  }
+
+  /**
+   * Connect to wallet
+   * @param name - Aepp name
+   * @param connection - Wallet connection object
+   */
+  static async connect(
+    name: string,
+    connection: BrowserConnection,
+  ): Promise<WalletConnectorFrame> {
+    const connector = new WalletConnectorFrame();
+    await WalletConnectorFrame._connect(name, connection, connector, false);
+    return connector;
+  }
+}
diff --git a/src/aepp-wallet-communication/WalletConnectorFrameBase.ts b/src/aepp-wallet-communication/WalletConnectorFrameBase.ts
new file mode 100644
index 0000000000..350b77aaf2
--- /dev/null
+++ b/src/aepp-wallet-communication/WalletConnectorFrameBase.ts
@@ -0,0 +1,119 @@
+import EventEmitter from 'eventemitter3';
+import AccountRpc from '../account/Rpc';
+import { Encoded } from '../utils/encoder';
+import {
+  Accounts, RPC_VERSION, Network, WalletApi, AeppApi,
+} from './rpc/types';
+import RpcClient from './rpc/RpcClient';
+import { METHODS, SUBSCRIPTION_TYPES } from './schema';
+import { NoWalletConnectedError } from '../utils/errors';
+import BrowserConnection from './connection/Browser';
+
+interface EventsBase {
+  accountsChange: (accounts: AccountRpc[]) => void;
+  disconnect: (p: any) => void;
+}
+
+export default abstract class WalletConnectorFrameBase<T extends {}>
+  extends EventEmitter<EventsBase | T> {
+  #rpcClient?: RpcClient<WalletApi, AeppApi>;
+
+  #getRpcClient(): RpcClient<WalletApi, AeppApi> {
+    if (this.#rpcClient == null) throw new NoWalletConnectedError('You are not connected to Wallet');
+    return this.#rpcClient;
+  }
+
+  /**
+   * Is connected to wallet
+   */
+  get isConnected(): boolean {
+    return this.#rpcClient != null;
+  }
+
+  #accounts: AccountRpc[] = [];
+
+  /**
+   * Accounts provided by wallet over subscription
+   */
+  get accounts(): AccountRpc[] {
+    return this.#accounts;
+  }
+
+  protected constructor() {
+    super();
+  }
+
+  protected abstract _updateNetwork(params: Network): void;
+
+  #updateAccounts(params: Accounts): void {
+    const addresses = [...new Set(
+      [...Object.keys(params.current), ...Object.keys(params.connected)],
+    )] as Encoded.AccountAddress[];
+    this.#accounts = addresses.map((address) => new AccountRpc(this.#getRpcClient(), address));
+    this.emit('accountsChange', this.#accounts);
+  }
+
+  static async _connect(
+    name: string,
+    connection: BrowserConnection,
+    connector: WalletConnectorFrameBase<any>,
+    connectNode: boolean,
+  ): Promise<void> {
+    let disconnectParams: any;
+
+    const client = new RpcClient<WalletApi, AeppApi>(
+      connection,
+      () => {
+        connector.#rpcClient = undefined;
+        connector.#accounts = [];
+        connector.emit('disconnect', disconnectParams);
+      },
+      {
+        [METHODS.updateAddress]: connector.#updateAccounts.bind(connector),
+        [METHODS.updateNetwork]: connector._updateNetwork.bind(connector),
+        [METHODS.closeConnection]: (params) => {
+          disconnectParams = params;
+          client.connection.disconnect();
+        },
+        [METHODS.readyToConnect]: () => {},
+      },
+    );
+    connector.#rpcClient = client;
+    const walletInfo = await connector.#rpcClient
+      .request(METHODS.connect, { name, version: RPC_VERSION, connectNode });
+    connector._updateNetwork(walletInfo);
+  }
+
+  /**
+   * Disconnect from wallet
+   */
+  disconnect(): void {
+    const client = this.#getRpcClient();
+    client.notify(METHODS.closeConnection, { reason: 'bye' });
+    client.connection.disconnect();
+  }
+
+  /**
+   * Request accounts from wallet
+   */
+  async getAccounts(): Promise<AccountRpc[]> {
+    const client = this.#getRpcClient();
+    const addresses = await client.request(METHODS.address, undefined);
+    return addresses.map((address) => new AccountRpc(client, address));
+  }
+
+  /**
+   * Subscribe for wallet accounts, get account updates adding handler to `accountsChange` event
+   * @param type - Subscription type
+   * @param value - Should be one of 'current' (the selected account), 'connected' (all)
+   * @returns Accounts from wallet
+   */
+  async subscribeAccounts(
+    type: SUBSCRIPTION_TYPES,
+    value: 'current' | 'connected',
+  ): Promise<AccountRpc[]> {
+    const result = await this.#getRpcClient().request(METHODS.subscribeAddress, { type, value });
+    this.#updateAccounts(result.address);
+    return this.#accounts;
+  }
+}
diff --git a/src/aepp-wallet-communication/WalletConnectorFrameWithNode.ts b/src/aepp-wallet-communication/WalletConnectorFrameWithNode.ts
new file mode 100644
index 0000000000..a5c9986ce9
--- /dev/null
+++ b/src/aepp-wallet-communication/WalletConnectorFrameWithNode.ts
@@ -0,0 +1,45 @@
+import { Network } from './rpc/types';
+import { RpcConnectionError } from '../utils/errors';
+import Node from '../Node';
+import BrowserConnection from './connection/Browser';
+import WalletConnectorFrameBase from './WalletConnectorFrameBase';
+
+interface EventsWithNode {
+  nodeChange: (node: Node) => void;
+}
+
+/**
+ * Connect to wallet as iframe/web-extension, asks wallet to provide node url
+ * In comparison with WalletConnectorFrame, this would work better for decentralized applications
+ * @category aepp wallet communication
+ */
+export default class WalletConnectorFrameWithNode extends WalletConnectorFrameBase<EventsWithNode> {
+  #node: Node = null as unknown as Node;
+
+  /**
+   * The node instance provided by wallet
+   */
+  get node(): Node {
+    return this.#node;
+  }
+
+  protected override _updateNetwork(params: Network): void {
+    if (params.node?.url == null) throw new RpcConnectionError('Missing URLs of the Node');
+    this.#node = new Node(params.node.url);
+    this.emit('nodeChange', this.#node);
+  }
+
+  /**
+   * Connect to wallet
+   * @param name - Aepp name
+   * @param connection - Wallet connection object
+   */
+  static async connect(
+    name: string,
+    connection: BrowserConnection,
+  ): Promise<WalletConnectorFrameWithNode> {
+    const connector = new WalletConnectorFrameWithNode();
+    await super._connect(name, connection, connector, true);
+    return connector;
+  }
+}
diff --git a/src/index-browser.ts b/src/index-browser.ts
index b060954d3b..4dbaa21eee 100644
--- a/src/index-browser.ts
+++ b/src/index-browser.ts
@@ -56,6 +56,8 @@ export { default as AeSdkMethods } from './AeSdkMethods';
 export { default as AeSdkBase } from './AeSdkBase';
 export { default as AeSdk } from './AeSdk';
 export { default as AeSdkAepp } from './AeSdkAepp';
+export { default as WalletConnectorFrame } from './aepp-wallet-communication/WalletConnectorFrame';
+export { default as WalletConnectorFrameWithNode } from './aepp-wallet-communication/WalletConnectorFrameWithNode';
 export { default as AeSdkWallet } from './AeSdkWallet';
 export { default as Node } from './Node';
 export { default as verifyTransaction } from './tx/validator';