diff --git a/src/app/components/header/header.pug b/src/app/components/header/header.pug
index 849b0de6f..52119f6b4 100644
--- a/src/app/components/header/header.pug
+++ b/src/app/components/header/header.pug
@@ -7,19 +7,19 @@ md-content.header(layout='row', layout-align='center center', layout-padding)
     md-button.md-icon-button(ng-click='$mdOpenMenu()')
       i.material-icons more_vert
     md-menu-content(width='2')
+      md-menu-item(ng-if='$root.logged && !$ctrl.account.get().secondSignature')
+        md-button.register-second-passphrase(data-set-second-pass)
+          div(layout='row', flex='')
+            p(flex='') Register second passphrase
+      md-menu-item(ng-if='$root.logged && !$ctrl.account.get().isDelegate')
+        md-button.register-as-delegate(data-delegate-registration)
+          div(layout='row', flex='')
+            p(flex='') Register as delegate 
       md-menu-item
-        md-button(ng-click='$ctrl.signVerify.openSignMessageDialog()')
+        md-button.sign-message(ng-click='$ctrl.signVerify.openSignMessageDialog()')
           div(layout='row', flex='')
             p(flex='') Sign message
       md-menu-item
-        md-button(ng-click='$ctrl.signVerify.openVerifyMessageDialog()')
+        md-button.verify-message(ng-click='$ctrl.signVerify.openVerifyMessageDialog()')
           div(layout='row', flex='')
             p(flex='') Verify message
-      md-menu-item(ng-if='$root.logged && !$ctrl.account.get().secondSignature')
-        md-button(data-set-second-pass)
-          div(layout='row', flex='')
-            p(flex='') Set 2nd passphrase
-      md-menu-item(ng-if='$root.logged && !$ctrl.account.get().isDelegate')
-        md-button(data-delegate-registration)
-          div(layout='row', flex='')
-            p(flex='') Delegate registration
diff --git a/src/spec/spec.js b/src/spec/spec.js
index 7be1d1c2a..a607a4893 100644
--- a/src/spec/spec.js
+++ b/src/spec/spec.js
@@ -228,7 +228,7 @@ function testSignMessage() {
   login(masterAccount);
   waitForElemAndClickIt('header .md-icon-button');
   browser.sleep(1000);
-  waitForElemAndClickIt('md-menu-item .md-button');
+  waitForElemAndClickIt('md-menu-item .md-button.sign-message');
   element(by.css('textarea[name="message"]')).sendKeys(message);
   browser.sleep(1000);
   expect(element(by.css('textarea[name="result"]')).getAttribute('value')).toEqual(result);
@@ -243,7 +243,7 @@ function testVerifyMessage() {
   login(masterAccount);
   waitForElemAndClickIt('header .md-icon-button');
   browser.sleep(1000);
-  waitForElemAndClickIt('md-menu-item:nth-child(2) .md-button');
+  waitForElemAndClickIt('md-menu-item .md-button.verify-message');
   element(by.css('input[name="publicKey"]')).sendKeys(publicKey);
   element(by.css('textarea[name="signature"]')).sendKeys(signature);
   browser.sleep(1000);
@@ -254,7 +254,7 @@ function test2ndPassphrase() {
   login(account2ndPassphraseCandidate);
   waitForElemAndClickIt('header .md-icon-button');
   browser.sleep(1000);
-  waitForElemAndClickIt('md-menu-item:nth-child(3) .md-button');
+  waitForElemAndClickIt('md-menu-item .md-button.register-second-passphrase');
   doPassphraseGenerationProcedure(() => {
     browser.sleep(500);
     checkAlertDialog('Success', 'Your second passphrase was successfully registered.');
@@ -265,7 +265,7 @@ function testDelegateRegistration() {
   login(accountDelegateCandidate);
   waitForElemAndClickIt('header .md-icon-button');
   browser.sleep(1000);
-  waitForElemAndClickIt('md-menu-item:nth-child(4) .md-button');
+  waitForElemAndClickIt('md-menu-item .md-button.register-as-delegate');
   browser.sleep(500);
   element(by.css('md-dialog input[name="delegateName"]')).sendKeys(accountDelegateCandidate.username);
   waitForElemAndClickIt('md-dialog button.md-primary');
@@ -397,11 +397,11 @@ describe('Lisk Nano', () => {
     it('should show balance', testShowBalance);
   });
 
-  describe('Top right menu', () => {
+  fdescribe('Top right menu', () => {
+    it('should allow to register second passphrase', test2ndPassphrase);
+    it('should allow to register as delegate', testDelegateRegistration);
     it('should allow to sign message', testSignMessage);
     it('should allow to verify message', testVerifyMessage);
-    it('should allow to set 2nd passphrase', test2ndPassphrase);
-    it('should allow to register a delegate', testDelegateRegistration);
   });
 
   describe('Send dialog', () => {