diff --git a/ReadMe.md b/ReadMe.md
index d6c1fb0be..e875bfc85 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,6 +1,6 @@
 # Android Keepass DX
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/icon.png"> Keepass DX is a material design Keepass Client for manage keys and passwords in crypt database for your android device.
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> Keepass DX is a multi-format KeePass manager for Android devices. The application allows to create keys and passwords in a secure way by integrating with the Android design standards.
 
 ### Features
 
@@ -35,6 +35,7 @@ You can contribute in different ways to help us on our work.
 * Add features by a pull request.
 * Help to translate into your language
 * [Donate](https://www.kunzisoft.com/donation)  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
+* Buy the [Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro) of KeePass DX
 
 <img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen4.jpg" width="220">
 <img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screen5.jpg" width="220">
diff --git a/art/feature_graphic.svg b/art/feature_graphic.svg
index a5d0610a9..1ff81fde6 100644
--- a/art/feature_graphic.svg
+++ b/art/feature_graphic.svg
@@ -7,7 +7,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90"
@@ -30,16 +29,16 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="1055"
+     inkscape:window-height="1023"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="0.53415231"
-     inkscape:cx="437.74925"
-     inkscape:cy="-30.560669"
-     inkscape:window-x="1920"
-     inkscape:window-y="184"
+     inkscape:cx="394.8246"
+     inkscape:cy="205.32711"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
+     inkscape:current-layer="layer3"
      showguides="false"><inkscape:grid
        id="grid4646"
        type="xygrid"
@@ -47,15 +46,7 @@
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><linearGradient
-       inkscape:collect="always"
-       id="linearGradient8997"><stop
-         style="stop-color:#ffffff;stop-opacity:0.10196079"
-         offset="0"
-         id="stop8999" /><stop
-         style="stop-color:#d19f68;stop-opacity:0;"
-         offset="1"
-         id="stop9001" /></linearGradient><marker
+     id="defs6"><marker
        inkscape:stockid="Arrow1Mstart"
        orient="auto"
        refY="0"
@@ -503,17 +494,7 @@
          in2="offset"
          operator="over"
          result="composite2"
-         id="feComposite8977" /></filter><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8997"
-       id="radialGradient9003"
-       cx="21.048733"
-       cy="20.632277"
-       fx="21.048733"
-       fy="20.632277"
-       r="76"
-       gradientTransform="matrix(-0.01177527,2.0143653,-1.9807054,-0.01157852,61.45389,-22.882031)"
-       gradientUnits="userSpaceOnUse" /><filter
+         id="feComposite8977" /></filter><filter
        style="color-interpolation-filters:sRGB"
        inkscape:label="Drop Shadow"
        id="filter4946"><feFlood
@@ -1052,7 +1033,573 @@
          in2="offset"
          in="fbSourceGraphic"
          operator="over"
-         result="composite2" /></filter></defs><g
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter5490-3"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5492-6" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5494-7" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur5496-5" /><feOffset
+         dx="0"
+         dy="-2"
+         result="offset"
+         id="feOffset5498-3" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite5500-5" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter5634-6"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5636-2" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5638-9" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur5640-1" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset5642-2" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite5644-7" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4648-0"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4650-9" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4652-3" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4654-6" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4656-0" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4658-6" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4672-2" /><feFlood
+         id="feFlood4674-6"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4676-1"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4678-8"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4680-7"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4682-9"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4512"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4514" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4516" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4518" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4520" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4522" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4524" /><feFlood
+         id="feFlood4526"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4528"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4530"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4532"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4534"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4536"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4538" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4540" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4542" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4544" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4546" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4548" /><feFlood
+         id="feFlood4550"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4552"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4554"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4556"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4558"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter5490-3-9"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5492-6-7" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5494-7-3" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur5496-5-6" /><feOffset
+         dx="0"
+         dy="-2"
+         result="offset"
+         id="feOffset5498-3-1" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite5500-5-2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter5634-6-9"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5636-2-3" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5638-9-1" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur5640-1-9" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset5642-2-4" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite5644-7-7" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4648-0-8"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4650-9-4" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4652-3-5" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4654-6-0" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4656-0-3" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4658-6-6" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4672-2-1" /><feFlood
+         id="feFlood4674-6-0"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4676-1-6"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4678-8-3"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4680-7-2"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4682-9-0"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4739"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4741" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4743" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4745" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4747" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4749" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4751" /><feFlood
+         id="feFlood4753"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4755"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4757"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4759"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4761"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4763"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4765" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4767" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4769" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4771" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4773" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4775" /><feFlood
+         id="feFlood4777"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4779"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4781"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4783"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4785"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter5634-0"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5636-78" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5638-6" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur5640-8" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset5642-8" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite5644-4" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4648-3"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4650-1" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4652-4" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4654-9" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4656-2" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4658-0" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4672-6" /><feFlood
+         id="feFlood4674-8"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4676-9"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4678-2"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4680-6"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4682-6"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4956"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4958" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4960" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur4962" /><feOffset
+         dx="0"
+         dy="4"
+         result="offset"
+         id="feOffset4964" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="fbSourceGraphic"
+         id="feComposite4966" /><feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix4968" /><feFlood
+         id="feFlood4970"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" /><feComposite
+         id="feComposite4972"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" /><feGaussianBlur
+         id="feGaussianBlur4974"
+         in="composite1"
+         stdDeviation="4"
+         result="blur" /><feOffset
+         id="feOffset4976"
+         dx="0"
+         dy="4"
+         result="offset" /><feComposite
+         id="feComposite4978"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" /></filter><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter5490-2"><feFlood
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5492-7" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite5494-2" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur5496-2" /><feOffset
+         dx="0"
+         dy="-2"
+         result="offset"
+         id="feOffset5498-6" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite5500-1" /></filter></defs><g
      inkscape:groupmode="layer"
      id="layer4"
      inkscape:label="Work"
@@ -1070,17 +1617,9 @@
        id="path5903"
        inkscape:connector-curvature="0" /><path
        style="display:inline;fill:#d97900;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter5466)"
-       d="M 63.126472,234.67265 1090.5782,-205.99251 1096.331,334.77152 Z"
+       d="M 63.126472,232.80052 1090.5782,-207.86464 1096.331,332.89939 Z"
        id="path5383-3"
        inkscape:connector-curvature="0" /><rect
-       style="opacity:1;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5634)"
-       id="rect5432"
-       width="231.03204"
-       height="1105.0569"
-       x="355.91412"
-       y="344.8678"
-       ry="14.515615"
-       transform="matrix(0.67597237,-0.73692696,0.73692696,0.67597237,-39.947457,30.425097)" /><rect
        style="display:inline;opacity:1;fill:#56ba5a;fill-opacity:1;stroke:none;stroke-width:1.47840464;stroke-opacity:0;filter:url(#filter5514)"
        id="rect5432-6"
        width="417.66861"
@@ -1096,91 +1635,108 @@
        x="318.59161"
        y="-292.94644"
        ry="12"
-       transform="matrix(0.86565431,-0.5006422,0.5000815,0.86597834,-393.67257,63.946596)" /><path
-       style="fill:#fb8c00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter5490)"
-       d="M 98.948311,259.88315 1126.4,-180.78201 l 5.7528,540.76403 z"
-       id="path5383"
-       inkscape:connector-curvature="0" /><g
-       id="g5386"
-       transform="matrix(0.8549182,0,0,0.8549182,1730.2131,40.376542)"><rect
-         ry="12"
-         y="19.999998"
-         x="20"
-         height="152"
-         width="152"
-         id="rect4960-6"
-         style="opacity:1;fill:#43a047;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter6016-3)" /><path
-         inkscape:connector-curvature="0"
-         id="rect5026-2"
-         d="m 31.999995,18.999999 c -6.648,0 -12,5.352 -12,12 l 0,1 c 0,-6.648 5.352,-12 12,-12 l 128.000005,0 c 6.64799,0 12,5.352 12,12 l 0,-1 c 0,-6.648 -5.35201,-12 -12,-12 l -128.000005,0 z"
-         style="opacity:1;fill:#43a047;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-         id="rect5031-6"
-         d="m 19.999995,160 0,1 c 0,6.648 5.352,12 12,12 L 160,173 c 6.64799,0 12,-5.352 12,-12 l 0,-1 c 0,6.648 -5.35201,12 -12,12 l -128.000005,0 c -6.648,0 -12,-5.352 -12,-12 z"
-         style="opacity:1;fill:#43a047;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" /><path
-         style="opacity:1;fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 32,18.999999 c -6.648,0 -12,5.352 -12,12 l 0,1 c 0,-6.648 5.352,-12 12,-12 l 128,0 c 6.64799,0 12,5.352 12,12 l 0,-1 c 0,-6.648 -5.35201,-12 -12,-12 l -128,0 z"
-         id="path4896"
-         inkscape:connector-curvature="0" /><path
-         inkscape:connector-curvature="0"
-         style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 19.999995,160 0,1 c 0,6.648 5.352,12 12,12 L 160,173 c 6.64799,0 12,-5.352 12,-12 l 0,-1 c 0,6.648 -5.35201,12 -12,12 l -128.000005,0 c -6.648,0 -12,-5.352 -12,-12 z"
-         id="path4898" /><path
-         inkscape:connector-curvature="0"
-         id="rect8981"
-         d="m 32,19 c -6.648,0 -12,5.352 -12,12 l 0,1 0,128 0,1 c 0,6.648 5.352,12 12,12 l 128,0 c 6.64799,0 12,-5.352 12,-12 l 0,-1 0,-128 0,-1 c 0,-6.648 -5.35201,-12 -12,-12 L 32,19 Z"
-         style="opacity:1;fill:url(#radialGradient9003);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-         inkscape:connector-curvature="0"
-         style="fill:#eaeaea;fill-opacity:1;filter:url(#filter6016-3)"
-         d="M 132.76953,51.91602 48.171875,136.59766 48,148 59.400391,147.82813 71.240234,136 84,136 l 0,-12 12,0 0,-12.73438 34.01172,-33.97656 A 8,8 0 0 1 128,72 a 8,8 0 0 1 8,-8 8,8 0 0 1 5.29688,2.01367 l 2.7871,-2.7832 -11.31445,-11.31445 z"
-         id="path4972" /><path
-         style="fill:#c6c6c6;fill-opacity:1;filter:url(#filter6016-3)"
-         d="M 48,52 48.171875,63.40137 132.59863,147.82812 144,148 143.82812,136.59863 59.401367,52.17188 Z"
-         id="path4974"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" /><path
-         style="fill:#eaeaea;fill-opacity:1;filter:url(#filter6016-3)"
-         d="m 125.39454,44.00195 a 27,27 0 0 0 -19.48634,7.90625 27,27 0 0 0 0,38.1836 27,27 0 0 0 38.1836,0 27,27 0 0 0 0,-38.1836 27,27 0 0 0 -18.69726,-7.90625 z M 136,64 a 8,8 0 0 1 8,8 8,8 0 0 1 -8,8 8,8 0 0 1 -8,-8 8,8 0 0 1 8,-8 z"
-         id="path4976"
-         inkscape:connector-curvature="0" /></g><rect
-       style="display:inline;opacity:1;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5502-5)"
-       id="rect5432-7-1"
-       width="68.034462"
-       height="913.54602"
-       x="318.59161"
-       y="-292.94644"
-       ry="12"
-       transform="matrix(0.86565431,-0.5006422,0.5000815,0.86597834,-682.85838,159.92802)" /><rect
-       style="display:inline;opacity:1;fill:#303030;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5634-2)"
-       id="rect5432-0"
-       width="231.03204"
-       height="1105.0569"
-       x="355.91412"
-       y="344.8678"
-       ry="14.515615"
-       transform="matrix(0.63645567,-0.77131328,0.77131328,0.63645567,-1703.1773,-56.376267)" /><rect
-       style="display:inline;opacity:1;fill:#303030;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5502)"
+       transform="matrix(0.86565431,-0.5006422,0.5000815,0.86597834,-393.67257,63.946596)" /><rect
+       style="display:inline;opacity:1;fill:#454545;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5502)"
        id="rect5432-7"
        width="68.034462"
        height="913.54602"
        x="318.59161"
        y="-292.94644"
        ry="12"
-       transform="matrix(0.32338759,-0.18758001,0.50916267,0.88182525,-179.55872,-77.943319)" /><flowRoot
-       transform="translate(-243.57781,-133.25939)"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4648)"
-       id="flowRoot4617"
+       transform="matrix(0.32338759,-0.18758001,0.50916267,0.88182525,-179.55872,-77.943319)" /></g><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="KeePass DX Pro"
+     style="display:none"><rect
+       style="display:inline;opacity:1;fill:#494949;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5634-6-9)"
+       id="rect5432-2"
+       width="231.03204"
+       height="1105.0569"
+       x="355.91412"
+       y="344.8678"
+       ry="14.515615"
+       transform="matrix(0.67597237,-0.73692696,0.73692696,0.67597237,42.608,314.08336)" /><flowRoot
+       transform="translate(-303.77948,174.7365)"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4648-0-8)"
+       id="flowRoot4617-2"
        xml:space="preserve"><flowRegion
-         id="flowRegion4619"><rect
+         id="flowRegion4619-3"><rect
            style="fill:#e3e3e3;fill-opacity:1"
            y="18.139557"
            x="463.32736"
            height="214.45438"
            width="894.88367"
-           id="rect4621" /></flowRegion><flowPara
+           id="rect4621-7" /></flowRegion><flowPara
          style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:90px;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Semi-Bold';fill:#e3e3e3;fill-opacity:1"
-         id="flowPara4623">KeePass DX</flowPara></flowRoot><path
-       style="opacity:1;fill:#fb8c00;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter4636)"
-       d="M 611.00781 216.72266 L 611.00781 283.23242 L 626.48633 283.23242 C 636.56633 283.23242 642.59609 282.24297 647.99609 279.54297 C 658.25609 274.50297 664.28711 263.52133 664.28711 250.11133 C 664.28711 237.51133 659.06688 227.07219 649.79688 221.49219 C 644.57688 218.34219 636.6568 216.72266 626.2168 216.72266 L 611.00781 216.72266 z M 668.26758 216.72266 L 691.12695 250.11133 L 668.26758 283.23242 L 682.9375 283.23242 L 698.41602 260.28125 L 714.34766 283.23242 L 728.65625 283.23242 L 705.61719 250.11133 L 715.87109 235.25 L 707.13477 227.23438 L 698.41602 239.94141 L 682.9375 216.72266 L 668.26758 216.72266 z M 623.33789 228.51172 L 625.76758 228.51172 C 633.59758 228.51172 637.82727 229.23289 641.69727 231.21289 C 647.99727 234.45289 651.86719 241.56133 651.86719 250.11133 C 651.86719 258.12133 648.17633 265.23266 642.23633 268.47266 C 638.54633 270.54266 633.41711 271.44141 626.03711 271.44141 L 623.33789 271.44141 L 623.33789 228.51172 z M 560.26953 232.20312 C 550.99953 232.20312 543.70898 238.86211 543.70898 247.41211 C 543.70898 254.70211 547.67031 258.84187 557.57031 262.17188 C 562.16031 263.70187 562.5193 263.88141 563.7793 264.69141 C 565.2193 265.59141 566.0293 266.9425 566.0293 268.5625 C 566.0293 271.3525 563.68891 273.42188 560.62891 273.42188 C 557.11891 273.42188 555.13875 271.62258 553.96875 267.39258 L 541.91016 267.39258 C 542.45016 272.25258 543.26023 274.77266 545.24023 277.47266 C 548.48023 281.79266 554.14969 284.40234 560.17969 284.40234 C 570.16969 284.40234 578 276.93258 578 267.39258 C 578 263.07258 576.38031 259.47297 573.32031 257.04297 C 571.43031 255.42297 568.45867 254.1625 564.13867 252.8125 C 559.27867 251.2825 559.27938 251.28219 558.10938 250.74219 C 556.48937 250.02219 555.67969 248.85211 555.67969 247.41211 C 555.67969 244.98211 557.65953 243.18164 560.26953 243.18164 C 562.78953 243.18164 564.40922 244.53258 564.94922 247.14258 L 576.65039 247.14258 C 576.47039 242.91258 575.47883 240.39141 573.04883 237.69141 C 569.89883 234.18141 565.21953 232.20312 560.26953 232.20312 z M 524.98828 232.72656 L 505.62305 253.83984 C 507.55126 257.41632 511.48522 259.97397 518.01953 262.17188 C 522.60953 263.70187 522.96852 263.88141 524.22852 264.69141 C 525.66852 265.59141 526.47852 266.9425 526.47852 268.5625 C 526.47852 271.3525 524.13812 273.42188 521.07812 273.42188 C 517.56813 273.42188 515.58797 271.62258 514.41797 267.39258 L 502.35938 267.39258 C 502.89937 272.25258 503.70945 274.77266 505.68945 277.47266 C 508.92945 281.79266 514.59891 284.40234 520.62891 284.40234 C 530.61891 284.40234 538.44922 276.93258 538.44922 267.39258 C 538.44922 263.07258 536.82953 259.47297 533.76953 257.04297 C 531.87953 255.42297 528.90789 254.1625 524.58789 252.8125 C 519.72789 251.2825 519.72859 251.28219 518.55859 250.74219 C 516.93859 250.02219 516.12891 248.85211 516.12891 247.41211 C 516.12891 244.98211 518.10875 243.18164 520.71875 243.18164 C 523.23875 243.18164 524.85844 244.53258 525.39844 247.14258 L 537.09961 247.14258 C 536.91961 242.91258 535.92805 240.39141 533.49805 237.69141 C 531.2769 235.21642 528.28912 233.52235 524.98828 232.72656 z M 496.58398 263.69336 L 480.34766 281.39258 C 482.169 280.22325 483.88897 278.69516 485.60547 276.75195 L 485.60547 283.23242 L 496.58398 283.23242 L 496.58398 263.69336 z "
-       transform="translate(0,-308)"
-       id="rect4625" /></g></svg>
\ No newline at end of file
+         id="flowPara4623-5">KeePass</flowPara></flowRoot><flowRoot
+       xml:space="preserve"
+       id="flowRoot4491"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#47ad49;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4648-0-8)"
+       transform="translate(228.22052,174.7365)"><flowRegion
+         id="flowRegion4493"><rect
+           id="rect4495"
+           width="894.88367"
+           height="214.45438"
+           x="463.32736"
+           y="18.139557"
+           style="fill:#47ad49;fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4497"
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:90px;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Semi-Bold';fill:#47ad49;fill-opacity:1">Pro</flowPara></flowRoot><flowRoot
+       xml:space="preserve"
+       id="flowRoot4501-9"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fb8c00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4648-0-8)"
+       transform="translate(78.22052,174.7365)"><flowRegion
+         id="flowRegion4503-2"><rect
+           id="rect4505-2"
+           width="894.88367"
+           height="214.45438"
+           x="463.32736"
+           y="18.139557"
+           style="fill:#fb8c00;fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4507-8"
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:90px;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Semi-Bold';fill:#fb8c00;fill-opacity:1">DX</flowPara></flowRoot></g><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="KeePass DX"
+     style="display:inline"><rect
+       style="display:inline;opacity:1;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter5634-0)"
+       id="rect5432-4"
+       width="231.03204"
+       height="1105.0569"
+       x="355.91412"
+       y="344.8678"
+       ry="14.515615"
+       transform="matrix(0.67597237,-0.73692696,0.73692696,0.67597237,92.814956,343.76137)" /><flowRoot
+       transform="translate(-209.73627,176.33264)"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4648-3)"
+       id="flowRoot4617-9"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4619-5"><rect
+           style="fill:#e3e3e3;fill-opacity:1"
+           y="18.139557"
+           x="463.32736"
+           height="214.45438"
+           width="894.88367"
+           id="rect4621-0" /></flowRegion><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:90px;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Semi-Bold';fill:#e3e3e3;fill-opacity:1"
+         id="flowPara4623-4">KeePass</flowPara></flowRoot><flowRoot
+       xml:space="preserve"
+       id="flowRoot4501-8"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fb8c00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4648-3)"
+       transform="translate(172.26373,176.33264)"><flowRegion
+         id="flowRegion4503-7"><rect
+           id="rect4505-1"
+           width="894.88367"
+           height="214.45438"
+           x="463.32736"
+           y="18.139557"
+           style="fill:#fb8c00;fill-opacity:1" /></flowRegion><flowPara
+         id="flowPara4507-7"
+         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:90px;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Semi-Bold';fill:#fb8c00;fill-opacity:1">DX</flowPara></flowRoot></g><g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Orange"><path
+       style="display:inline;fill:#fb8c00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter5490-2)"
+       d="m 111.71787,587.90961 1027.45173,-440.66515 5.7528,540.76402 z"
+       id="path5383"
+       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/art/icon.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/icon.png
rename to art/icon.png
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 1d1dee8ea..153a3d17c 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +1,2 @@
 json_key_file "./../Integration/Google_Play_Android_Developer.json" # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name "com.kunzisoft.keepass.free" # e.g. com.krausefx.app
+package_name "com.kunzisoft.keepass.free"
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4b46a551b..87e302bca 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -17,8 +17,8 @@ platform :android do
     gradle(task: "test")
   end
 
-  desc "Build a new Free Beta version"
-  lane :build_beta_free do |options|
+  desc "Build a new Beta version"
+  lane :build_beta do |options|
     gradle(
       task: "assemble",
       flavor: "free",
@@ -31,10 +31,6 @@ platform :android do
         "android.injected.signing.key.password" => options[:keypass],
       }
     )
-  end
-
-desc "Build a new Pro Beta version"
-  lane :build_beta_pro do |options|
     gradle(
       task: "assemble",
       flavor: "pro",
@@ -49,30 +45,24 @@ desc "Build a new Pro Beta version"
     )
   end
 
-  desc "Deploy a new Free Beta version to the Google Play"
-  lane :deploy_beta_google_free do
-    upload_to_play_store(
-      track: "beta",
-      skip_upload_metadata: "false",
-      skip_upload_images: "true",
-      skip_upload_screenshots: "false",
-      apk: "./app/build/outputs/apk/free_google/release/app-free-release.apk",
-      validate_only: "false",
-    )
-    gradle(
-      task: 'clean'
-    )
-  end
-
   desc "Deploy a new Pro Beta version to the Google Play"
   lane :deploy_beta_google_pro do
     upload_to_play_store(
       track: "beta",
       skip_upload_metadata: "true",
-      skip_upload_images: "true",
+      skip_upload_images: "false",
       skip_upload_screenshots: "true",
-      apk: "./app/build/outputs/apk/free_google/release/app-pro-release.apk",
-      validate_only: "false",
+      apk: "./app/build/outputs/apk/free/release/app-free-release.apk",
+      validate_only: "true",
+    )
+#    sh("cp", "-a", "./pro/.", "./")
+    upload_to_play_store(
+      track: "beta",
+      skip_upload_metadata: "true",
+      skip_upload_images: "false",
+      skip_upload_screenshots: "true",
+      apk: "./app/build/outputs/apk/pro/release/app-pro-release.apk",
+      validate_only: "true",
     )
     gradle(
       task: 'clean'
diff --git a/fastlane/README.md b/fastlane/README.md
index cb9980f8a..202314d83 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -16,12 +16,12 @@ fastlane android tests
 Runs all the tests
 ### android build_beta_free
 ```
-fastlane android build_beta_free
+fastlane android build_beta_free storefile:"" storepass:"" keyalias:"" keypass:""
 ```
 Build a new Free Beta version
 ### android build_beta_pro
 ```
-fastlane android build_beta_pro
+fastlane android build_beta_pro storefile:"" storepass:"" keyalias:"" keypass:""
 ```
 Build a new Pro Beta version
 ### android deploy_beta_google_free
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 4363f331b..43130b1bb 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,16 +1,18 @@
-Multi-format KeePass manager, the application allows to create keys and passwords in a secure way by integrating perfectly with the Android design standards.
+<b>Multi-format KeePass password manager</b>, the application allows to save and use passwords, keys and digital identities in a secure way by integrating the Android design standards.
 
-Features :
- * Create database files / entries and groups
- * Support for .kdb and .kdbx files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm
- * Compatible with the majority of alternative programs (KeePass, KeePassX, KeePass XC...)
- * Allows fast copy of fields and opening of URI / URL
- * Fingerprint for fast unlocking
- * Material design with themes
- * AutoFill and Integration
- * Precise management of settings
+<b>Features</b> :
+ - Create database files / entries and groups
+ - Support for .kdb and .kdbx files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm
+ - Compatible with the majority of alternative programs (KeePass, KeePassX, KeePass XC...)
+ - Allows fast copy of fields and opening of URI / URL
+ - Fingerprint for fast unlocking
+ - Material design with themes
+ - AutoFill and Integration
+ - Precise management of settings
 
-Keepass DX is opensource and ad-free. 
-You can donate for a better service and a quick development of your features.
+Keepass DX is <b>opensource</b> and <b>ad-free</b>. 
 
-Any issue : https://github.com/Kunzisoft/KeePassDX/issues
+You can donate or buy the <a href="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro">pro version</a>
+for a better service and a quick development of your features.
+
+Any issue : <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index 85db1282f..e3d6214ad 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 511a64011..ebb3fb08e 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-KeePass deluxe to manage your passwords in a secure way
\ No newline at end of file
+KeePass Deluxe, secure and open source password manager
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index 3ca1a2bf1..837c9d48a 100644
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -1,16 +1,18 @@
-Gestionnaire KeePass multiformats, l'application permet de créer des clés et mots de passe de manière sécurisée en s'intégrant parfaitement aux normes de design Android.
+<b>Gestionnaire de mots de passe KeePass multiformats</b>, l'application permet d'enregistrer et d'utiliser de manière sécurisée les mots de passe, les clés et les identités numériques en intégrant les standards de conception Android.
 
-Fonctionnalités :
- * Création de bases de données / entrées et groupes
- * Support des fichiers .kdb et .kdbx (version 1 à 4) avec algorithme AES - Twofish - ChaCha20 - Argon2
- * Compatible avec la majorité des programmes alternatifs (KeePass, KeePassX, KeePass XC...)
- * Permet la copie rapide de champs et l'ouverture d'URI /URL
- * Empreintes digitales pour un déblocage rapide des bases
- * Material design avec thèmes
- * Remplissage automatique de champs
- * Gestion précise des paramètres
+<b>Fonctionnalités</b> :
+ - Création de bases de données / entrées et groupes
+ - Support des fichiers .kdb et .kdbx (version 1 à 4) avec algorithme AES - Twofish - ChaCha20 - Argon2
+ - Compatible avec la majorité des programmes alternatifs (KeePass, KeePassX, KeePass XC...)
+ - Permet la copie rapide de champs et l'ouverture d'URI /URL
+ - Empreintes digitales pour un déblocage rapide des bases
+ - Material design avec thèmes
+ - Remplissage automatique de champs
+ - Gestion précise des paramètres
 
-Keepass DX est opensource et sans publicité. 
-Vous pouvez faire un don pour un meilleur service et un développement rapide de vos fonctionnalités.
+Keepass DX est <b>opensource</b> et <b>sans publicité</b>. 
 
-Vous avez un bug : https://github.com/Kunzisoft/KeePassDX/issues
+Vous pouvez faire un don ou acheter la <a href="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro">version pro</a>
+pour un meilleur service et un développement rapide de vos fonctionnalités.
+
+Vous avez un bug : <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
index 1195f1afc..771fc3fad 100644
--- a/fastlane/metadata/android/fr-FR/short_description.txt
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
@@ -1 +1 @@
-KeePass deluxe pour gérer vos mots de passe de façon sécurisée
\ No newline at end of file
+KeePass Deluxe, gestionnaire de mots de passe sécurisé et open source
diff --git a/fastlane/pro/Appfile b/fastlane/pro/Appfile
new file mode 100644
index 000000000..2ef869d21
--- /dev/null
+++ b/fastlane/pro/Appfile
@@ -0,0 +1,2 @@
+json_key_file "./../Integration/Google_Play_Android_Developer.json" # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name "com.kunzisoft.keepass.pro"
diff --git a/fastlane/pro/metadata/android/en-US/full_description.txt b/fastlane/pro/metadata/android/en-US/full_description.txt
new file mode 100644
index 000000000..4802031f0
--- /dev/null
+++ b/fastlane/pro/metadata/android/en-US/full_description.txt
@@ -0,0 +1,22 @@
+<b>Multi-format KeePass password manager</b>, the application allows to save and use passwords, keys and digital identities in a secure way by integrating the Android design standards.
+
+This pro version adds <b>new features</b> to the free version but above all, you encourage <b>faster development</b>, <b>better service</b>, and you contribute to the creation of <b>open source softwares without advertising</b>.
+
+<b>Features</b> :
+ - Create database files / entries and groups
+ - Support for .kdb and .kdbx files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm
+ - Compatible with the majority of alternative programs (KeePass, KeePassX, KeePass XC...)
+ - Allows fast copy of fields and opening of URI / URL
+ - Fingerprint for fast unlocking
+ - Material design with themes
+ - AutoFill and Integration
+ - Precise management of settings
+
+<b>Pro Features</b> :
+ - Access to custom themes (including the classic deep black theme)
+ - Access to material design icon packs
+ - Deleting donation buttons
+
+Keepass DX is <b>opensource</b> and <b>ad-free</b>.
+
+Any issue : <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>
diff --git a/fastlane/pro/metadata/android/en-US/images/featureGraphic.png b/fastlane/pro/metadata/android/en-US/images/featureGraphic.png
new file mode 100644
index 000000000..2aabace67
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen0.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen0.jpg
new file mode 100644
index 000000000..0507bcab2
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen0.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen1.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen1.jpg
new file mode 100644
index 000000000..d1d3ee124
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen1.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen2.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen2.jpg
new file mode 100644
index 000000000..e46f7ea34
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen2.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen3.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen3.jpg
new file mode 100644
index 000000000..6ebcf6497
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen3.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen4.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen4.jpg
new file mode 100644
index 000000000..74dfdf705
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen4.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen5.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen5.jpg
new file mode 100644
index 000000000..c4369d43b
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen5.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen6.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen6.jpg
new file mode 100644
index 000000000..4ca7d621e
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen6.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen7.jpg b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen7.jpg
new file mode 100644
index 000000000..ef0c60260
Binary files /dev/null and b/fastlane/pro/metadata/android/en-US/images/phoneScreenshots/screen7.jpg differ
diff --git a/fastlane/pro/metadata/android/en-US/short_description.txt b/fastlane/pro/metadata/android/en-US/short_description.txt
new file mode 100644
index 000000000..8ce3b5d00
--- /dev/null
+++ b/fastlane/pro/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Pro version of KeePass Deluxe, secure and open source password manager
diff --git a/fastlane/pro/metadata/android/en-US/title.txt b/fastlane/pro/metadata/android/en-US/title.txt
new file mode 100644
index 000000000..5f0462ba7
--- /dev/null
+++ b/fastlane/pro/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+KeePass DX Pro
diff --git a/fastlane/pro/metadata/android/fr-FR/full_description.txt b/fastlane/pro/metadata/android/fr-FR/full_description.txt
new file mode 100644
index 000000000..2892cf17e
--- /dev/null
+++ b/fastlane/pro/metadata/android/fr-FR/full_description.txt
@@ -0,0 +1,23 @@
+<b>Gestionnaire de mots de passe KeePass multiformats</b>, l'application permet d'enregistrer et d'utiliser de manière sécurisée les mots de passe, les clés et les identités numériques en intégrant les standards de conception Android.
+
+Cette version pro ajoute <b>de nouvelles fonctionnalités</b> à la version gratuite mais surtout, vous encouragez <b>un développement plus rapide</b>, <b>un meilleur service</b> et vous contribuez à la création de <b>logiciels open source sans publicité</b>.
+
+<b>Fonctionnalités</b> :
+ - Création de bases de données / entrées et groupes
+ - Support des fichiers .kdb et .kdbx (version 1 à 4) avec algorithme AES - Twofish - ChaCha20 - Argon2
+ - Compatible avec la majorité des programmes alternatifs (KeePass, KeePassX, KeePass XC...)
+ - Permet la copie rapide de champs et l'ouverture d'URI /URL
+ - Empreintes digitales pour un déblocage rapide des bases
+ - Material design avec thèmes
+ - Remplissage automatique de champs
+ - Gestion précise des paramètres
+
+<b>Fonctionnalités Pro</b> :
+ - Accès aux thèmes personnalisés (y compris le thème noir profond classique)
+ - Accès aux packs d'icônes material design
+ - Suppression des boutons de don
+
+Keepass DX est <b>opensource</b> et <b>sans publicité</b>.
+
+Vous avez un bug : <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>
+
diff --git a/fastlane/pro/metadata/android/fr-FR/short_description.txt b/fastlane/pro/metadata/android/fr-FR/short_description.txt
new file mode 100644
index 000000000..29c09ae81
--- /dev/null
+++ b/fastlane/pro/metadata/android/fr-FR/short_description.txt
@@ -0,0 +1 @@
+Version pro de KeePass deluxe, gestionnaire de mots de passe sécurisé et open source