diff --git a/djangocms_content_expiry/monkeypatch/admin.py b/djangocms_content_expiry/monkeypatch/admin.py
index fa65e20..8fab367 100644
--- a/djangocms_content_expiry/monkeypatch/admin.py
+++ b/djangocms_content_expiry/monkeypatch/admin.py
@@ -66,9 +66,9 @@ def get_list_display(func):
     Register the compliance number field with the Versioning Admin
     """
     def inner(self, request):
-        list_display = func(self, request)
+        list_display = list(func(self, request))
         created_by_index = list_display.index('created_by')
-        return list_display[:created_by_index] + ('compliance_number',) + list_display[created_by_index:]
+        return list_display[:created_by_index] + ['compliance_number'] + list_display[created_by_index:]
 
     return inner
 
diff --git a/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html b/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html
index 2db6c3b..ed0aa51 100644
--- a/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html
+++ b/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html
@@ -1,5 +1,5 @@
 {% load static i18n %}
 
-<a class="btn cms-versioning-action-btn related-widget-wrapper-link" data-popup="yes" id="additional_content_settings_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}">
+<a class="btn cms-action-btn related-widget-wrapper-link" data-popup="yes" id="additional_content_settings_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}">
     <img src="{% static 'djangocms_content_expiry/svg/file.svg' %}">
 </a>
diff --git a/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html b/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html
index 4d25f19..6047472 100644
--- a/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html
+++ b/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html
@@ -1,2 +1,2 @@
 {% load static i18n %}
-<a class="btn cms-moderation-action-btn js-moderation-action related-widget-wrapper-link cms-versioning-action-btn" data-popup="yes" id="change_content_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/file.svg' %}" /></span></a>
+<a class="btn cms-moderation-action-btn js-moderation-action related-widget-wrapper-link cms-action-btn" data-popup="yes" id="change_content_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/file.svg' %}" /></span></a>