diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/Contents.json b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/Contents.json
similarity index 77%
rename from Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/Contents.json
rename to Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/Contents.json
index 2762fc2b1..c36c70f55 100644
--- a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/Contents.json
@@ -1,23 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "reveal_password_button.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "reveal_password_button@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "reveal_password_button@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
-}
\ No newline at end of file
+}
diff --git a/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button.png b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button.png
new file mode 100644
index 000000000..b1c176d8e
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button.png differ
diff --git a/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@2x.png b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@2x.png
new file mode 100644
index 000000000..25c0f9e44
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@3x.png b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@3x.png
new file mode 100644
index 000000000..1bb741161
Binary files /dev/null and b/Riot/Assets/Images.xcassets/Common/reveal_password_button.imageset/reveal_password_button@3x.png differ
diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button.png b/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button.png
deleted file mode 100644
index eafa300c8..000000000
Binary files a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button.png and /dev/null differ
diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@2x.png b/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@2x.png
deleted file mode 100644
index 3e9307b0f..000000000
Binary files a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@2x.png and /dev/null differ
diff --git a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@3x.png b/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@3x.png
deleted file mode 100644
index 31f4c088d..000000000
Binary files a/Riot/Assets/Images.xcassets/KeyBackup/reveal_password_button.imageset/reveal_password_button@3x.png and /dev/null differ