diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
index d215ac875..a2f0fcdec 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
@@ -372,7 +372,7 @@ public class EntryActivity extends LockingHideActivity {
 		super.onCreateOptionsMenu(menu);
 		
 		MenuInflater inflater = getMenuInflater();
-        MenuUtil.donationMenuInflater(inflater, menu);
+        MenuUtil.contributionMenuInflater(inflater, menu);
 		inflater.inflate(R.menu.entry, menu);
 		inflater.inflate(R.menu.database_lock, menu);
 
@@ -415,8 +415,8 @@ public class EntryActivity extends LockingHideActivity {
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch ( item.getItemId() ) {
-            case R.id.menu_donate:
-                return MenuUtil.onDonationItemSelected(this);
+            case R.id.menu_contribute:
+                return MenuUtil.onContributionItemSelected(this);
 
             case R.id.menu_toggle_pass:
                 mShowPassword = !mShowPassword;
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
index a7d52f3e5..332f58636 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
@@ -447,15 +447,15 @@ public class EntryEditActivity extends LockingHideActivity
 		super.onCreateOptionsMenu(menu);
 		
 		MenuInflater inflater = getMenuInflater();
-		MenuUtil.donationMenuInflater(inflater, menu);
+		MenuUtil.contributionMenuInflater(inflater, menu);
 		
 		return true;
 	}
 	
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch ( item.getItemId() ) {
-			case R.id.menu_donate:
-				return MenuUtil.onDonationItemSelected(this);
+			case R.id.menu_contribute:
+				return MenuUtil.onContributionItemSelected(this);
 
 			case android.R.id.home:
 				finish();
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java
index 01b25f8ef..94af4bdac 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java
@@ -177,7 +177,7 @@ public abstract class ListNodesActivity extends LockingActivity
 		super.onCreateOptionsMenu(menu);
 		
 		MenuInflater inflater = getMenuInflater();
-		MenuUtil.donationMenuInflater(inflater, menu);
+		MenuUtil.contributionMenuInflater(inflater, menu);
 		inflater.inflate(R.menu.tree, menu);
 		inflater.inflate(R.menu.default_menu, menu);
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/dialogs/ProFeatureDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/ProFeatureDialogFragment.java
index 5784fa7ca..2e590731c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/dialogs/ProFeatureDialogFragment.java
+++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/ProFeatureDialogFragment.java
@@ -60,7 +60,7 @@ public class ProFeatureDialogFragment extends DialogFragment {
             stringBuilder.append(Html.fromHtml(getString(R.string.html_text_donation)));
             builder.setPositiveButton(R.string.contribute, (dialog, id) -> {
                 try {
-                    Util.gotoUrl(getContext(), R.string.donate_url);
+                    Util.gotoUrl(getContext(), R.string.contribution_url);
                 } catch (ActivityNotFoundException e) {
                     Toast.makeText(getContext(), R.string.error_failed_to_launch_link, Toast.LENGTH_LONG).show();
                 }
diff --git a/app/src/main/java/com/kunzisoft/keepass/dialogs/UnderDevelopmentFeatureDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/UnderDevelopmentFeatureDialogFragment.java
index 3df67586f..658b7ce43 100644
--- a/app/src/main/java/com/kunzisoft/keepass/dialogs/UnderDevelopmentFeatureDialogFragment.java
+++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/UnderDevelopmentFeatureDialogFragment.java
@@ -44,31 +44,41 @@ public class UnderDevelopmentFeatureDialogFragment extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
         SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
-        stringBuilder.append(Html.fromHtml(getString(R.string.html_text_dev_feature))).append("\n\n");
         if (BuildConfig.CLOSED_STORE) {
-            stringBuilder.append(Html.fromHtml(getString(R.string.html_text_dev_feature_buy_pro))).append(" ")
-            .append(Html.fromHtml(getString(R.string.html_text_dev_feature_encourage)));
-            builder.setPositiveButton(R.string.download, (dialog, id) -> {
-                try {
-                    Util.gotoUrl(getContext(), R.string.app_pro_url);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(getContext(), R.string.error_failed_to_launch_link, Toast.LENGTH_LONG).show();
-                }
-            });
+            if (BuildConfig.FULL_VERSION) {
+                stringBuilder.append(Html.fromHtml(getString(R.string.html_text_dev_feature_thanks))).append("\n\n")
+                        .append(Html.fromHtml(getString(R.string.html_rose))).append("\n\n")
+                        .append(Html.fromHtml(getString(R.string.html_text_dev_feature_work_hard))).append("\n")
+                        .append(Html.fromHtml(getString(R.string.html_text_dev_feature_upgrade))).append(" ");
+                builder.setPositiveButton(android.R.string.ok, (dialog, id) -> dismiss());
+            } else {
+                stringBuilder.append(Html.fromHtml(getString(R.string.html_text_dev_feature))).append("\n\n")
+                        .append(Html.fromHtml(getString(R.string.html_text_dev_feature_buy_pro))).append("\n")
+                        .append(Html.fromHtml(getString(R.string.html_text_dev_feature_encourage)));
+                builder.setPositiveButton(R.string.download, (dialog, id) -> {
+                    try {
+                        Util.gotoUrl(getContext(), R.string.app_pro_url);
+                    } catch (ActivityNotFoundException e) {
+                        Toast.makeText(getContext(), R.string.error_failed_to_launch_link, Toast.LENGTH_LONG).show();
+                    }
+                });
+                builder.setNegativeButton(android.R.string.cancel, (dialog, id) -> dismiss());
+            }
         }
         else {
-            stringBuilder.append(Html.fromHtml(getString(R.string.html_text_dev_feature_contibute))).append(" ")
-            .append(Html.fromHtml(getString(R.string.html_text_dev_feature_encourage)));
+            stringBuilder.append(Html.fromHtml(getString(R.string.html_text_dev_feature))).append("\n\n")
+                    .append(Html.fromHtml(getString(R.string.html_text_dev_feature_contibute))).append(" ")
+                    .append(Html.fromHtml(getString(R.string.html_text_dev_feature_encourage)));
             builder.setPositiveButton(R.string.contribute, (dialog, id) -> {
                 try {
-                    Util.gotoUrl(getContext(), R.string.donate_url);
+                    Util.gotoUrl(getContext(), R.string.contribution_url);
                 } catch (ActivityNotFoundException e) {
                     Toast.makeText(getContext(), R.string.error_failed_to_launch_link, Toast.LENGTH_LONG).show();
                 }
             });
+            builder.setNegativeButton(android.R.string.cancel, (dialog, id) -> dismiss());
         }
         builder.setMessage(stringBuilder);
-        builder.setNegativeButton(android.R.string.cancel, (dialog, id) -> dismiss());
         // Create the AlertDialog object and return it
         return builder.create();
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/search/SearchResultsActivity.java b/app/src/main/java/com/kunzisoft/keepass/search/SearchResultsActivity.java
index 74b000a64..f18e2f32d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/search/SearchResultsActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/search/SearchResultsActivity.java
@@ -86,7 +86,7 @@ public class SearchResultsActivity extends ListNodesActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
 
         MenuInflater inflater = getMenuInflater();
-        MenuUtil.donationMenuInflater(inflater, menu);
+        MenuUtil.contributionMenuInflater(inflater, menu);
         inflater.inflate(R.menu.tree, menu);
         inflater.inflate(R.menu.default_menu, menu);
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java b/app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java
index bcbe76662..eb372fd91 100644
--- a/app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java
@@ -21,49 +21,33 @@ package com.kunzisoft.keepass.utils;
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.getkeepsafe.taptargetview.TapTarget;
 import com.kunzisoft.keepass.BuildConfig;
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.activities.AboutActivity;
 import com.kunzisoft.keepass.settings.SettingsActivity;
 import com.kunzisoft.keepass.stylish.StylishActivity;
 
-import java.util.List;
-
 
 public class MenuUtil {
 
-    public static void donationMenuInflater(MenuInflater inflater, Menu menu) {
+    public static void contributionMenuInflater(MenuInflater inflater, Menu menu) {
         if(!(BuildConfig.FULL_VERSION && BuildConfig.CLOSED_STORE))
-            inflater.inflate(R.menu.donation, menu);
-    }
-
-    public static void addDonationTapTargetIfAllowed(List<TapTarget> tapTargets,
-                                                     Toolbar toolbar,
-                                                     String title,
-                                                     String summary) {
-        if (!(BuildConfig.FULL_VERSION && BuildConfig.CLOSED_STORE)) {
-            tapTargets.add(TapTarget.forToolbarMenuItem(toolbar,
-                    R.id.menu_donate,
-                    title,
-                    summary));
-        }
+            inflater.inflate(R.menu.contribution, menu);
     }
 
     public static void defaultMenuInflater(MenuInflater inflater, Menu menu) {
-        donationMenuInflater(inflater, menu);
+        contributionMenuInflater(inflater, menu);
         inflater.inflate(R.menu.default_menu, menu);
     }
 
-    public static boolean onDonationItemSelected(StylishActivity activity) {
+    public static boolean onContributionItemSelected(StylishActivity activity) {
         try {
-            Util.gotoUrl(activity, R.string.donate_url);
+            Util.gotoUrl(activity, R.string.contribution_url);
         } catch (ActivityNotFoundException e) {
             Toast.makeText(activity, R.string.error_failed_to_launch_link, Toast.LENGTH_LONG).show();
             return false;
@@ -80,8 +64,8 @@ public class MenuUtil {
      */
     public static boolean onDefaultMenuOptionsItemSelected(StylishActivity activity, MenuItem item, boolean checkLock) {
         switch (item.getItemId()) {
-            case R.id.menu_donate:
-                return onDonationItemSelected(activity);
+            case R.id.menu_contribute:
+                return onContributionItemSelected(activity);
 
             case R.id.menu_app_settings:
                 // To avoid flickering when launch settings in a LockingActivity
diff --git a/app/src/main/res/menu/donation.xml b/app/src/main/res/menu/contribution.xml
similarity index 92%
rename from app/src/main/res/menu/donation.xml
rename to app/src/main/res/menu/contribution.xml
index bd98d914a..e88088e07 100644
--- a/app/src/main/res/menu/donation.xml
+++ b/app/src/main/res/menu/contribution.xml
@@ -19,9 +19,9 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menu_donate"
+    <item android:id="@+id/menu_contribute"
         android:icon="@drawable/ic_heart_white_24dp"
-        android:title="@string/menu_donate"
+        android:title="@string/contribute"
         android:orderInCategory="95"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7e1872799..891acfcb4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -298,6 +298,9 @@
     <string name="html_text_dev_feature_buy_pro">En achetant la version &lt;strong&gt;pro&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_contibute">En &lt;strong&gt;contribuant&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_encourage">vous encouragez les développeurs à créer de &lt;strong&gt;nouvelles fonctionnalités&lt;/strong&gt; et à &lt;strong&gt;résoudre des bugs&lt;/strong&gt; en fonction de vos remarques.</string>
+    <string name="html_text_dev_feature_thanks">Merci beaucoup pour votre contribution.</string>
+    <string name="html_text_dev_feature_work_hard">Nous travaillons dur pour sortir cette fonctionnalité rapidement.</string>
+    <string name="html_text_dev_feature_upgrade">N\'oubliez pas de garder votre application à jour.</string>
 
     <string name="download">Télécharger</string>
     <string name="contribute">Contribuer</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 3887f6a53..c5bef6725 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -22,13 +22,15 @@
 
     <string name="app_pro_url" translatable="false">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</string>
     <string name="clipboard_error_url" translatable="false">http://code.google.com/p/android/issues/detail?id=35732</string>
-    <string name="donate_url" translatable="false">https://www.kunzisoft.com/donation</string>
+    <string name="contribution_url" translatable="false">https://www.kunzisoft.com/donation?project=keepassdx</string>
     <string name="homepage" translatable="false">https://www.kunzisoft.com/KeepassDX/</string>
     <string name="issues" translatable="false">https://github.com/Kunzisoft/KeePassDX/issues</string>
     <string name="filemanager_play_store" translatable="false">https://play.google.com/store/apps/details?id=org.openintents.filemanager</string>
     <string name="filemanager_f_droid" translatable="false">https://f-droid.org/packages/org.openintents.filemanager/</string>
     <string name="field_references_url" translatable="false">https://keepass.info/help/base/fieldrefs.html</string>
 
+    <string name="html_rose">--,--`--,{@</string>
+
     <!--  Password generator -->
     <string name="password_length_key" translatable="false">password_length_key</string>
     <string name="min_password_length" translatable="false">1</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 142d60dbc..5c0f738c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -302,6 +302,9 @@
     <string name="html_text_dev_feature_buy_pro">By buying the &lt;strong&gt;pro&lt;/strong&gt; version,</string>
     <string name="html_text_dev_feature_contibute">By &lt;strong&gt;contributing&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_encourage">you\'re encouraging developers to create &lt;strong&gt;new features&lt;/strong&gt; and to &lt;strong&gt;fix bugs&lt;/strong&gt; according to your remarks.</string>
+    <string name="html_text_dev_feature_thanks">Thanks a lot for your contribution.</string>
+    <string name="html_text_dev_feature_work_hard">We are working hard to release this feature quickly.</string>
+    <string name="html_text_dev_feature_upgrade">Do not forget to keep your application up to date.</string>
 
     <string name="download">Download</string>
     <string name="contribute">Contribute</string>