diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02ee413..a89c4b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,16 +20,18 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="io.github.novacrypto.novawallet">
 
     <application
         android:name=".WalletApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/bips/src/main/java/io/github/novacrypto/mnemonics/NumericTree.kt b/bips/src/main/java/io/github/novacrypto/mnemonics/NumericTree.kt
index c5fd442..3182deb 100644
--- a/bips/src/main/java/io/github/novacrypto/mnemonics/NumericTree.kt
+++ b/bips/src/main/java/io/github/novacrypto/mnemonics/NumericTree.kt
@@ -44,7 +44,7 @@ internal class NumericTree(private val depth: Int = 0) {
     }
 
     fun save(word: String) {
-        internalSave(numberize(word), word)
+        internalSave(word.toKeypadDigits(), word)
     }
 
     private fun internalSave(key: String, wholeWord: String) {
@@ -78,8 +78,8 @@ internal class NumericTree(private val depth: Int = 0) {
         private set
 }
 
-internal fun numberize(word: String): String {
-    val wordNormalized = Normalizer.normalize(word, Normalizer.Form.NFD)
+internal fun String.toKeypadDigits(): String {
+    val wordNormalized = Normalizer.normalize(this, Normalizer.Form.NFD)
     val sb = StringBuilder()
     for (c in wordNormalized.toCharArray()) {
         when (c) {
diff --git a/bips/src/test/java/io/github/novacrypto/mnemonics/NumericEntryFlowTests.kt b/bips/src/test/java/io/github/novacrypto/mnemonics/NumericEntryFlowTests.kt
index da925cc..9853c1b 100644
--- a/bips/src/test/java/io/github/novacrypto/mnemonics/NumericEntryFlowTests.kt
+++ b/bips/src/test/java/io/github/novacrypto/mnemonics/NumericEntryFlowTests.kt
@@ -334,7 +334,7 @@ private fun givenPartialMnemonicInput(mnemonic: String, additional: String = "")
 private fun numberizeAndAccept(englishString: String): String {
     val root = English.INSTANCE.toNumericTree()
     return englishString.split(" ")
-            .map { it to numberize(it) }
+            .map { it to it.toKeypadDigits() }
             .joinToString(",") {
                 it.second + ('a' + root.find(it.second).top3.indexOf(it.first))
             }
diff --git a/bips/src/test/java/io/github/novacrypto/mnemonics/NumericTreeTests.kt b/bips/src/test/java/io/github/novacrypto/mnemonics/NumericTreeTests.kt
index 810878b..c67fa38 100644
--- a/bips/src/test/java/io/github/novacrypto/mnemonics/NumericTreeTests.kt
+++ b/bips/src/test/java/io/github/novacrypto/mnemonics/NumericTreeTests.kt
@@ -103,7 +103,7 @@ class NumericTreeTests {
     private fun findAllWordsAndNoMoreThan3IdenticalSequences(wordList: WordList) {
         val root = wordList.toNumericTree()
         for (word in wordList.toIterable()) {
-            val key = numberize(word)
+            val key = word.toKeypadDigits()
             val node = root.find(key)
             node.words `should contain` word
             node.exactMatches `should contain` word
diff --git a/ideaShared/copyright/GNU_GPLv3.xml b/ideaShared/copyright/GNU_GPLv3.xml
index 7d54ee5..f070b7a 100644
--- a/ideaShared/copyright/GNU_GPLv3.xml
+++ b/ideaShared/copyright/GNU_GPLv3.xml
@@ -1,3 +1,4 @@
+<!--suppress XmlUnboundNsPrefix -->
 <component name="CopyrightManager">
   <copyright>
     <option name="notice" value=" NovaWallet, Cryptocurrency Wallet for Android&#10; Copyright (C) 2018 Alan Evans, NovaCrypto&#10;&#10; This program is free software: you can redistribute it and/or modify&#10; it under the terms of the GNU General Public License as published by&#10; the Free Software Foundation, either version 3 of the License, or&#10; (at your option) any later version.&#10;&#10; This program is distributed in the hope that it will be useful,&#10; but WITHOUT ANY WARRANTY; without even the implied warranty of&#10; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10; GNU General Public License for more details.&#10;&#10; You should have received a copy of the GNU General Public License&#10; along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.&#10;&#10; Original source: https://github.com/NovaCrypto/NovaWallet&#10; You can contact the authors via github issues." />
diff --git a/ideaShared/copyright/profiles_settings.xml b/ideaShared/copyright/profiles_settings.xml
index f48561d..3966d14 100644
--- a/ideaShared/copyright/profiles_settings.xml
+++ b/ideaShared/copyright/profiles_settings.xml
@@ -1,3 +1,4 @@
+<!--suppress XmlUnboundNsPrefix -->
 <component name="CopyrightManager">
   <settings default="GNU GPLv3" />
 </component>
\ No newline at end of file
diff --git a/qrscanner/src/main/res/values/dimens.xml b/qrscanner/src/main/res/values/dimens.xml
deleted file mode 100644
index cb2bc93..0000000
--- a/qrscanner/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~  NovaWallet, Cryptocurrency Wallet for Android
-  ~  Copyright (C) 2018 Alan Evans, NovaCrypto
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  ~  Original source: https://github.com/NovaCrypto/NovaWallet
-  ~  You can contact the authors via github issues.
-  -->
-
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
diff --git a/qrscanner/src/main/res/values/strings.xml b/qrscanner/src/main/res/values/strings.xml
index 04a6a6b..84a0e44 100644
--- a/qrscanner/src/main/res/values/strings.xml
+++ b/qrscanner/src/main/res/values/strings.xml
@@ -20,6 +20,5 @@
   -->
 
 <resources>
-    <string name="app_name">QrScanner</string>
     <string name="title_activity_scan_qr">Scan Qr Code</string>
-</resources>
+</resources>
\ No newline at end of file