diff --git a/i18n/locales/en/common.json b/i18n/locales/en/common.json
index b6f6d2f4fe..a873c837a9 100644
--- a/i18n/locales/en/common.json
+++ b/i18n/locales/en/common.json
@@ -63,6 +63,8 @@
   "Confirm (Fee: 1 LSK)": "Confirm (Fee: 1 LSK)",
   "Confirm (Fee: {{fee}} LSK)": "Confirm (Fee: {{fee}} LSK)",
   "Confirm to register your second passphrase on the blockchain.": "Confirm to register your second passphrase on the blockchain.",
+  "Confirm transaction on Ledger Nano S": "Confirm transaction on Ledger Nano S",
+  "Confirm transfer": "Confirm transfer",
   "Confirm vote on Ledger Nano S": "Confirm vote on Ledger Nano S",
   "Confirm your name": "Confirm your name",
   "Confirmation in the next step": "Confirmation in the next step",
diff --git a/jest.config.js b/jest.config.js
index 30ff8e1289..bb6a807186 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -40,8 +40,6 @@ module.exports = {
     'app/src/ipc.js',
     'app/src/ledger.js',
     'src/actions/liskService.js',
-    'src/actions/peers.js', // FollowUp #1515
-    'src/actions/peers.js', // FollowUp #1515
     'src/actions/transactions.js',
     'src/components/account/stories.js',
     'src/components/accountInitialization/index.js',
@@ -57,15 +55,14 @@ module.exports = {
     'src/components/newsFeed/news.js',
     'src/components/passphrase/create/create.js',
     'src/components/passphraseCreation/index.js',
-    'src/components/passphraseSteps/index.js', // FollowUp #1515
-    'src/components/passphraseSteps/index.js', // FollowUp #1515
+    'src/components/passphraseSteps/index.js',
+    'src/components/register/register.js',
+    'src/components/request/specifyRequest.js',
+    'src/components/receive/index.js',
     'src/components/request/index.js',
     'src/components/register/register.js',
     'src/components/resultBox/index.js',
-    'src/components/resultBox/resultBox.js', // FollowUp #1515
-    'src/components/resultBox/resultBox.js', // FollowUp #1515
     'src/components/searchBar/index.js', // Passing in mocha but not in Jest
-    'src/components/send/steps/confirm/confirm.js', // FollowUp #1515
     'src/components/send/steps/form/stories.js',
     'src/components/spinner/stories.js',
     'src/components/toaster/stories.js',
diff --git a/src/actions/peers.js b/src/actions/peers.js
index e40acfe6a9..874d2ff595 100644
--- a/src/actions/peers.js
+++ b/src/actions/peers.js
@@ -10,6 +10,7 @@ import { extractAddress, extractPublicKey } from '../utils/account';
 import { accountLoggedIn, accountLoading, accountLoggedOut } from './account';
 import accountConfig from '../constants/account';
 import settings from '../constants/settings';
+import { loginType } from '../constants/hwConstants';
 
 const peerSet = (data, config) => ({
   data: Object.assign({
@@ -37,7 +38,7 @@ const login = (dispatch, getState, data, config) => { // eslint-disable-line max
       publicKey,
       address,
       network: code || 0,
-      loginType: data.hwInfo ? 1 : 0,
+      loginType: data.hwInfo ? loginType.ledger : loginType.normal,
       peerAddress: data.network.nodes[0],
       hwInfo: data.hwInfo ? data.hwInfo : {},
     };
diff --git a/src/actions/peers.test.js b/src/actions/peers.test.js
index a91588859d..1c61eef3b0 100644
--- a/src/actions/peers.test.js
+++ b/src/actions/peers.test.js
@@ -133,6 +133,15 @@ describe('actions: peers', () => {
       expect(dispatch).to.have.been.calledWith();
     });
 
+    it('dispatch liskAPIClientSet action when hwAccount is logged in ', () => {
+      const network = {
+        testnet: true,
+      };
+
+      liskAPIClientSet({ passphrase, network, hwInfo: {} })(dispatch, getState);
+      expect(dispatch).to.have.been.calledWith(match.hasNested('data.options.nodes', networks.testnet.nodes));
+    });
+
     it('dispatch liskAPIClientSet action even if network.address is undefined', () => {
       liskAPIClientSet({ passphrase, network: {} })(dispatch, getState);
 
diff --git a/src/components/resultBox/resultBox.js b/src/components/resultBox/resultBox.js
index 1380f291c3..ecfa163bbb 100644
--- a/src/components/resultBox/resultBox.js
+++ b/src/components/resultBox/resultBox.js
@@ -18,6 +18,17 @@ class ResultBox extends React.Component {
     return this.props.followedAccounts.find(account => account.address === address) === undefined;
   }
 
+  handleRetryButton() {
+    this.props.transactionFailedClear();
+    this.props.prevStep({
+      success: null,
+      account: this.props.account,
+      recipient: this.props.recipient,
+      amount: this.props.amount,
+      password: { value: '' },
+    });
+  }
+
   render() {
     return (
       <div className={`${styles.resultBox}`}>
@@ -47,7 +58,7 @@ class ResultBox extends React.Component {
           {this.props.success &&
             this.props.recipientId && this.isNotYetFollowed(this.props.recipientId) ?
             <div className={`${grid['col-xs-6']} ${grid['col-sm-6']} ${grid['col-md-5']} ${grid['col-lg-5']}`}>
-              <Button className={`add-follwed-account-button ${styles.addFollowedAccountButton}`}
+              <Button className={`add-to-bookmarks ${styles.addFollowedAccountButton}`}
                 onClick={() => {
                   this.props.nextStep({ address: this.props.recipientId });
                 }}>
diff --git a/src/components/resultBox/resultBox.test.js b/src/components/resultBox/resultBox.test.js
index 016d2b335f..d8efc583ab 100644
--- a/src/components/resultBox/resultBox.test.js
+++ b/src/components/resultBox/resultBox.test.js
@@ -99,14 +99,14 @@ describe('Result Box', () => {
   it('display add follwed account button', () => {
     props = {
       copy: null,
-      title: 'Sorry',
-      body: 'An error occurred while creating the transaction.',
-      success: false,
+      title: 'test',
+      body: 'test',
+      success: true,
       reset: () => {},
       copyToClipboard: () => {},
       t: () => {},
       onMount: spy(),
-      reciepientId: '123L',
+      recipientId: '123L',
       followedAccounts: [{
         address: '1L',
       }],
@@ -117,6 +117,48 @@ describe('Result Box', () => {
 
     wrapper = mount(<ResultBox {...props} />, options);
 
-    expect(wrapper).to.have.descendants('.add-follwed-account-button');
+    expect(wrapper).to.have.descendants('.add-to-bookmarks');
+  });
+
+  it('should go to next step after clicking "Retry"', () => {
+    props = {
+      copy: null,
+      title: 'test',
+      account: { hwInfo: {} },
+      body: 'test',
+      success: false,
+      recipientId: '123',
+      reset: () => {},
+      copyToClipboard: () => {},
+      t: () => {},
+      followedAccounts: ['123'],
+      prevStep: spy(),
+      transactionFailedClear: spy(),
+    };
+    wrapper = mount(<ResultBox {...props} />, options);
+    wrapper.debug();
+    wrapper.find('.add-follwed-account-button').at(0).simulate('click');
+    expect(props.prevStep).to.have.been.calledWith();
+    expect(props.transactionFailedClear).to.have.been.calledWith();
+  });
+
+  it('should go to next step after clicking "Add Bookmark"', () => {
+    props = {
+      copy: null,
+      title: 'test',
+      account: { hwInfo: {} },
+      body: 'test',
+      success: true,
+      recipientId: 455,
+      reset: () => {},
+      copyToClipboard: () => {},
+      t: () => {},
+      followedAccounts: ['123'],
+      nextStep: spy(),
+    };
+    wrapper = mount(<ResultBox {...props} />, options);
+
+    wrapper.find('.add-to-bookmarks').at(0).simulate('click');
+    expect(props.nextStep).to.have.been.calledWith({ address: 455 });
   });
 });
diff --git a/src/components/send/steps/confirm/confirm.js b/src/components/send/steps/confirm/confirm.js
index 668cd8eb42..f3240a3435 100644
--- a/src/components/send/steps/confirm/confirm.js
+++ b/src/components/send/steps/confirm/confirm.js
@@ -105,13 +105,20 @@ class Confirm extends React.Component {
   }
 
   render() {
+    // eslint-disable-next-line
+    const title = this.props.accountInit ?
+      this.props.t('Initialize Lisk ID') :
+      (this.props.account.hwInfo && this.props.account.hwInfo.deviceId ? this.props.t('Confirm transaction on Ledger Nano S') : this.props.t('Confirm transfer'));
     const followedAccount = this.props.followedAccounts
       .find(account => account.address === this.state.recipient.value);
+
     return (
       <div className={`${styles.wrapper} send`}>
-        <header className={styles.headerWrapper}>
-          <h2>{this.props.t('Send LSK')}</h2>
-        </header>
+        <div className={styles.header}>
+          <header className={styles.headerWrapper}>
+            <h2 className='title'>{title}</h2>
+          </header>
+        </div>
         {this.props.accountInit
           ? <div>
             <p>{this.props.t('You will send a small amount of {{fee}} LSK to yourself and therefore initialize your ID.', { fee: fromRawLsk(fees.send) })}</p>
diff --git a/src/components/send/steps/confirm/confirm.test.js b/src/components/send/steps/confirm/confirm.test.js
index 4e15f1d1a6..42209948e0 100644
--- a/src/components/send/steps/confirm/confirm.test.js
+++ b/src/components/send/steps/confirm/confirm.test.js
@@ -65,12 +65,15 @@ describe('Confirm Component', () => {
 
   describe('With account init', () => {
     beforeEach(() => {
-      props.address = '123L';
-      props.amount = 1;
-      props.accountInit = true;
+      const newProps = {
+        ...props,
+        address: '123L',
+        amount: 1,
+        accountInit: true,
+      };
       const store = fakeStore({ account });
 
-      wrapper = mount(<Confirm {...props} />, {
+      wrapper = mount(<Confirm {...newProps} />, {
         context: { store, i18n },
         childContextTypes: {
           store: PropTypes.object.isRequired,
@@ -84,4 +87,38 @@ describe('Confirm Component', () => {
       expect(wrapper.state('amount').value).to.equal(0.1);
     });
   });
+
+  describe('With account hardwareWallet account', () => {
+    it('hardwareWallet account should show correct title "Confirm transaction on Ledger Nano S"', () => {
+      const newProps = {
+        ...props,
+        address: '123L',
+        amount: 1,
+        accountInit: false,
+        account: { ...account, hwInfo: { deviceId: '123123' } },
+        pendingTransactions: [{
+          senderId: account.address,
+          recipientId: '11004588490103196952L',
+        }],
+        failedTransactions: [],
+      };
+
+      const store = fakeStore({ account });
+
+      wrapper = mount(<Confirm {...newProps} />, {
+        context: { store, i18n },
+        childContextTypes: {
+          store: PropTypes.object.isRequired,
+          i18n: PropTypes.object.isRequired,
+        },
+      });
+
+      wrapper.find('.amount input').simulate('change', { target: { value: '1' } });
+      wrapper.find('.recipient input').simulate('change', { target: { value: '11004588490103196952L' } });
+      wrapper.find('.send-button button').simulate('click');
+      wrapper.update();
+
+      expect(wrapper.find('.title').at(0)).to.have.text('Confirm transaction on Ledger Nano S');
+    });
+  });
 });