diff --git a/app/views/orders/_edit_amount.html.haml b/app/views/orders/_edit_amount.html.haml
index 69d251cd..d8488555 100644
--- a/app/views/orders/_edit_amount.html.haml
+++ b/app/views/orders/_edit_amount.html.haml
@@ -21,9 +21,10 @@
     %td.units_received_cell
       = receive_input_field(form)
       = pkg_helper order_article.article_price, false
-      - if order_article.result_manually_changed?
-        %input{type: :button, value: t('.override', default: 'Override'), class: 'btn btn-small unlocker'}
       / TODO add almost invisible text_field for entering single units
     %td.units_delta
     %td
-      = link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-mini'
+      = link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-small'
+      - if order_article.result_manually_changed?
+        = button_tag nil, class: 'btn btn-small unlocker', title: t('.locked_to_protect_unlock_button') do
+          %i.icon-unlock
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8919ab1d..57642601 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1103,7 +1103,8 @@ en:
     edit:
       title: Edit order
     edit_amount:
-      locked_to_protect_manual_update: The distribution of this article among the ordergroups was changed manually. This field is locked in order to protect those changes.
+      locked_to_protect_manual_update: The distribution of this article among the ordergroups was changed manually. This field is locked in order to protect those changes. To redistribute anyway, press the unlock button and change the amount.
+      locked_to_protect_unlock_button: Press this button to unlock the received field. Any previous manual changes will be overwritten and the article will be redistributed over the ordergroups.
     fax:
       amount: Amount
       articles: Articles