UX: change the user merge button's label and icon.

UX: change the user merge button’s label and icon.

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index adbe7e5..1353ed0 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -686,8 +686,8 @@
     {{/if}}
 
     {{#if model.can_be_merged}}
-      {{d-button label="admin.user.merge.transfer_and_delete"
-                 icon="trash-alt"
+      {{d-button label="admin.user.merge.button"
+                 icon="arrows-alt-h"
                  class="btn-danger"
                  action=(action "promptTargetUser")}}
     {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5c3211a..336a4cf 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4350,7 +4350,7 @@ en:
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Delete User"
         merge:
-          transfer_and_delete: "Transfer & Delete"
+          button: "Merge"
           prompt:
             title: "Transfer & Delete @%{username}"
             description: |

GitHub sha: 0fe8ad13