diff --git a/templates/themes/app/parts/cookie_control.html.twig b/templates/themes/app/parts/cookie_control.html.twig
index 1cfa957c2..489efbb3d 100644
--- a/templates/themes/app/parts/cookie_control.html.twig
+++ b/templates/themes/app/parts/cookie_control.html.twig
@@ -20,8 +20,8 @@
                       {% endif %}
                     </a>
                     <button id="ng-cc-accept" class="btn btn-primary">
-                        {% if not cookie_policy.fields.ribbon_button_label.empty %}
-                            {{ ng_render_field(cookie_policy.fields.ribbon_button_label) }}
+                        {% if not cookie_policy.fields.ribbon_button_accept_all_label.empty %}
+                            {{ ng_render_field(cookie_policy.fields.ribbon_button_accept_all_label) }}
                         {% endif %}
                     </button>
                 </div>
@@ -47,9 +47,11 @@
                     </li>
                 </ul>
                 <div class="ng-cc-optional-actions clearfix">
-                  <button id="ng-cc-optional-save" class="btn btn-outline-primary">
-                    {{ 'ngsite.layout.cookie_settings.save'|trans }}
-                  </button>
+                    <button id="ng-cc-optional-save" class="btn btn-outline-primary">
+                        {% if not cookie_policy.fields.ribbon_button_save_label.empty %}
+                            {{ ng_render_field(cookie_policy.fields.ribbon_button_save_label) }}
+                        {% endif %}
+                    </button>
               </div>
             </div>
         </div>
diff --git a/translations/messages.de.yaml b/translations/messages.de.yaml
index a5c6bc053..93e35e351 100644
--- a/translations/messages.de.yaml
+++ b/translations/messages.de.yaml
@@ -5,7 +5,6 @@ ngsite.layout.site_frontpage: "%site_name% Titelseite"
 ngsite.layout.meta_generator: "Ibexa-Plattform, unterstützt von Netgen"
 ngsite.layout.powered_by: "Unterstützt durch"
 ngsite.layout.cookie_settings: "Cookie Einstellungen"
-ngsite.layout.cookie_settings.save: "Einstellungen speichern"
 ngsite.layout.cookie_settings.accepted: "Akzeptiert"
 ngsite.layout.cookie_settings.not_accepted: "Nicht akzeptiert"
 ngsite.layout.sponsored: 'Gesponsert'
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index fa05b815f..b0a148e8e 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -5,7 +5,6 @@ ngsite.layout.site_frontpage: "%site_name% front page"
 ngsite.layout.meta_generator: "Ibexa DXP powered by Netgen"
 ngsite.layout.powered_by: "Powered by"
 ngsite.layout.cookie_settings: "Cookie settings"
-ngsite.layout.cookie_settings.save: "Save settings"
 ngsite.layout.cookie_settings.accepted: "Accepted"
 ngsite.layout.cookie_settings.not_accepted: "Not accepted"
 ngsite.layout.sponsored: 'Sponsored'