diff --git a/common/components/Footer/index.jsx b/common/components/Footer/index.jsx
index c378c37a..6a543221 100644
--- a/common/components/Footer/index.jsx
+++ b/common/components/Footer/index.jsx
@@ -1,14 +1,12 @@
-import React, {Component} from 'react'
+import React, {Component} from "react";
+import translate from "translations";
+
 
 export default class Footer extends Component {
     constructor(props) {
         super(props)
     }
 
-    shouldComponentUpdate() {
-        return false
-    }
-
     render() {
         return (
             <footer role="contentinfo" aria-label="footer">
@@ -23,8 +21,8 @@ export default class Footer extends Component {
                                              height="55px" width="auto" alt="Ether Wallet"/>
                                     </a>
                                 </p>
-                                <p><span>Open-Source, client-side tool for easily & securely interacting with the Ethereum network.</span>
-                                    <span>Created by</span>
+                                <p><span>{translate('FOOTER_1')}</span>
+                                    <span>{translate('FOOTER_1b')}</span>
                                     <a aria-label="kvhnuke's github"
                                        href="https://github.com/kvhnuke"
                                        target="_blank">kvhnuke</a> &
@@ -35,7 +33,7 @@ export default class Footer extends Component {
                                 <br/>
                             </div>
                             <div className="col-sm-6 footer-2">
-                                <h5><i aria-hidden="true">💝</i> Donations are always appreciated!</h5>
+                                <h5><i aria-hidden="true">💝</i>{translate('FOOTER_2')}</h5>
                                 <ul>
                                     <li> ETH: <span
                                         className="mono wrap">0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8</span>
@@ -43,8 +41,7 @@ export default class Footer extends Component {
                                     <li> BTC: <span className="mono wrap">1MEWT2SGbqtz6mPCgFcnea8XmWV5Z4Wc6</span></li>
                                 </ul>
 
-                                <h5><i aria-hidden="true">👫</i> You can also support us by supporting our
-                                    blockchain-family.</h5>
+                                <h5><i aria-hidden="true">👫</i>{translate('ADD_Warning_1')}</h5>
                                 <p>Consider using our affiliate links to...</p>
                                 <ul>
                                     <li><a aria-label="Swap Ether or Bitcoin via Bity.com"
@@ -57,15 +54,6 @@ export default class Footer extends Component {
                                         TREZOR</a>
                                     </li>
                                 </ul>
-                                <ul>
-                                    <li>
-                                        {/*<span translate="TranslatorName_1"></span>*/}
-                                        {/*<span translate="TranslatorName_2"></span>*/}
-                                        {/*<span translate="TranslatorName_3"></span>*/}
-                                        {/*<span translate="TranslatorName_4"></span>*/}
-                                        {/*<span translate="TranslatorName_5"></span>*/}
-                                    </li>
-                                </ul>
                             </div>
                             <div className="col-sm-3 footer-3">
                                 <h5><i aria-hidden="true">🌎</i> On the Web</h5>
diff --git a/common/components/Header/components/TabsOptions.jsx b/common/components/Header/components/TabsOptions.jsx
index 5a6ef2f7..45961904 100644
--- a/common/components/Header/components/TabsOptions.jsx
+++ b/common/components/Header/components/TabsOptions.jsx
@@ -1,6 +1,6 @@
-import React, {Component} from 'react';
-import {Link} from 'react-router';
-import translate from 'translations';
+import React, {Component} from "react";
+import {Link} from "react-router";
+import translate from "translations";
 
 const tabs = [
     {
@@ -62,9 +62,7 @@ export default class TabsOptions extends Component {
                             {
                                 tabs.map((object, i) => {
                                         return (
-                                            <li className='nav-item'
-                                                key={i}
-                                                onClick={this.tabClick(i)}>
+                                            <li className='nav-item' key={i} onClick={this.tabClick(i)}>
                                                 <Link to={object.link} key={i}
                                                       aria-label={`nav item: ${translate(object.name)}`}>
                                                     {translate(object.name)}
@@ -80,9 +78,9 @@ export default class TabsOptions extends Component {
                         this.state.showRightArrow &&
                         <a aria-hidden='true'
                            className='nav-arrow-right'
-                           onClick={() => this.scrollRight(100)}
-                           ng-mouseover='scrollHoverIn(false,2);' ng-mouseleave='scrollHoverOut()'>&#187;</a
-                        >}
+                           onClick={() => this.scrollRight(100)}>&#187;</a
+                        >
+                    }
                 </nav>
             </div>
 
diff --git a/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordComponent.jsx b/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordComponent.jsx
index 39fe4f98..5b14007c 100644
--- a/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordComponent.jsx
+++ b/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordComponent.jsx
@@ -4,6 +4,7 @@ import PropTypes from "prop-types";
 import {Field, reduxForm} from "redux-form";
 import GenerateWalletPasswordInputComponent from "./GenerateWalletPasswordInputComponent";
 import LedgerTrezorWarning from "./LedgerTrezorWarning";
+import translate from "translations";
 
 
 // VALIDATORS
@@ -73,7 +74,7 @@ class GenerateWalletPasswordComponent extends Component {
                             !generateWalletFile && (
                                 <div>
                                     <section className="row">
-                                        <h1 aria-live="polite">Generate Wallet</h1>
+                                        <h1 aria-live="polite">{translate('NAV_GenerateWallet')}</h1>
                                         <div className="col-sm-8 col-sm-offset-2">
                                             <h4>Enter a strong password (at least 9 characters)</h4>
                                             <Field
@@ -98,7 +99,7 @@ class GenerateWalletPasswordComponent extends Component {
                         {
                             generateWalletFile && (
                                 <section role="main" className="row">
-                                    <h1>Save your Wallet File. Don't forget your password.</h1>
+                                    <h1>{translate('GEN_Label_2')}</h1>
                                     <br/>
                                     <div className="col-sm-8 col-sm-offset-2">
                                         <div aria-hidden="true" className="account-help-icon"><img