diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100755
index a11777c..0000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/images/logo-64x64.png b/public/images/logo-64x64.png
new file mode 100644
index 0000000..72237d8
Binary files /dev/null and b/public/images/logo-64x64.png differ
diff --git a/public/index.html b/public/index.html
index 7e738bb..a6aa4d1 100755
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/images/logo-64x64.png" />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, shrink-to-fit=no"
diff --git a/public/manifest.json b/public/manifest.json
index 54665e4..82bf05e 100755
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -3,7 +3,7 @@
   "name": "Daypay POS",
   "icons": [
     {
-      "src": "favicon.ico",
+      "src": "/images/logo-64x64.png",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     }
diff --git a/src/App.js b/src/App.js
index aa256a3..9d65106 100755
--- a/src/App.js
+++ b/src/App.js
@@ -7,18 +7,17 @@ import './theme/bulma.css'; // load bulma
 import './localization'; // load i18n
 import apolloClient from './utils/apolloClient';
 import theme, { GlobalStyle } from './theme'; // load custom theme
+import config from './config';
 import EthereumHDWallet from './class/ethereum/EthereumHDWallet';
 import { Error404, Dashboard, Test } from './pages';
 
-const posAddress = '0xd18a54f89603Fe4301b29EF6a8ab11b9Ba24f139';
-
 class App extends Component {
   componentDidMount() {
     this.init();
   }
 
   async init() {
-    this.wallet = new EthereumHDWallet(false, posAddress);
+    this.wallet = new EthereumHDWallet(false, config.posAddress);
     await this.wallet.setWeb3();
     await this.wallet.fetchBalance();
     await this.wallet.getNetworkID();
diff --git a/src/config/index.js b/src/config/index.js
index 4373c82..8689161 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,5 +1,5 @@
 export default {
-  DEV_MOVE: true,
+  debug: process.env.NODE_ENV === 'development',
   ENABLE_LOGS: true,
   APP_VERSION: '0.2.12-b2',
   siteName: 'Dexpay',
@@ -7,7 +7,7 @@ export default {
   logo: '',
   fbAppID: '',
   twitter: '',
-  posAddress: '0xB599Ac9d4892f44fEAc6bec3314Ef58432Ae3c79',
+  posAddress: '0xd18a54f89603Fe4301b29EF6a8ab11b9Ba24f139',
 
   currency: {
     symbol: '€',
diff --git a/src/index.js b/src/index.js
index 96ef6e9..eeec861 100755
--- a/src/index.js
+++ b/src/index.js
@@ -2,11 +2,14 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 
 import App from './App';
+import config from './config';
 import * as serviceWorker from './utils/serviceWorker';
 
 ReactDOM.render(<App />, document.getElementById('root'));
 
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
 // Learn more about service workers: http://bit.ly/CRA-PWA
-serviceWorker.unregister();
+if (config.debug) {
+  serviceWorker.unregister();
+} else {
+  serviceWorker.register();
+}
