diff --git a/admin_interface/admin.py b/admin_interface/admin.py
index 1ef5f61..178601b 100644
--- a/admin_interface/admin.py
+++ b/admin_interface/admin.py
@@ -110,6 +110,13 @@ class ThemeAdmin(admin.ModelAdmin):
                 'related_modal_close_button_visible',
             )
         }),
+        (_('Form Controls'), {
+            'classes': ('wide', ),
+            'fields': (
+                'form_submit_sticky',
+                'form_pagination_sticky',
+            )
+        }),
         (_('List Filter'), {
             'classes': ('wide', ),
             'fields': (
@@ -121,10 +128,6 @@ class ThemeAdmin(admin.ModelAdmin):
             'classes': ('wide', ),
             'fields': ('recent_actions_visible', )
         }),
-        (_('Action Buttons'), {
-            'classes': ('wide', ),
-            'fields': ('action_buttons_sticky', )
-        }),
     )
 
     save_on_top = True
diff --git a/admin_interface/migrations/0019_theme_action_buttons_sticky.py b/admin_interface/migrations/0019_auto_20210129_2029.py
similarity index 51%
rename from admin_interface/migrations/0019_theme_action_buttons_sticky.py
rename to admin_interface/migrations/0019_auto_20210129_2029.py
index ac1ff9c..ecc4603 100644
--- a/admin_interface/migrations/0019_theme_action_buttons_sticky.py
+++ b/admin_interface/migrations/0019_auto_20210129_2029.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.5 on 2021-01-22 11:04
+# Generated by Django 3.1.5 on 2021-01-29 20:29
 
 from django.db import migrations, models
 
@@ -12,7 +12,12 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='theme',
-            name='action_buttons_sticky',
-            field=models.BooleanField(default=False, verbose_name='sticky position'),
+            name='form_pagination_sticky',
+            field=models.BooleanField(default=False, verbose_name='sticky pagination'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='form_submit_sticky',
+            field=models.BooleanField(default=False, verbose_name='sticky submit'),
         ),
     ]
diff --git a/admin_interface/models.py b/admin_interface/models.py
index dfda57b..69c0624 100644
--- a/admin_interface/models.py
+++ b/admin_interface/models.py
@@ -299,9 +299,13 @@ class Theme(models.Model):
         default=True,
         verbose_name=_('visible'))
 
-    action_buttons_sticky = models.BooleanField(
+    form_submit_sticky = models.BooleanField(
         default=False,
-        verbose_name=_('sticky position'))
+        verbose_name=_('sticky submit'))
+    
+    form_pagination_sticky = models.BooleanField(
+        default=False,
+        verbose_name=_('sticky pagination'))
 
     def set_active(self):
         self.active = True
diff --git a/admin_interface/templates/admin/base_site.html b/admin_interface/templates/admin/base_site.html
index 5fb986d..10ca849 100644
--- a/admin_interface/templates/admin/base_site.html
+++ b/admin_interface/templates/admin/base_site.html
@@ -52,7 +52,8 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% include "admin_interface/related-modal.html" %}
 {% endblock %}
 
-{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% if theme.action_buttons_sticky %} sticky-action-buttons {% endif %}{% endblock %}
+{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{
+theme.name|slugify }}-theme{% endif %}{% if theme.form_submit_sticky %} sticky-submit {% endif %}{% endblock %}
 
 {% block branding %}
 {% get_admin_interface_theme as theme %}
diff --git a/admin_interface/templates/admin_interface/css/admin-interface-fix.css b/admin_interface/templates/admin_interface/css/admin-interface-fix.css
index 0ae88e9..73c7e87 100644
--- a/admin_interface/templates/admin_interface/css/admin-interface-fix.css
+++ b/admin_interface/templates/admin_interface/css/admin-interface-fix.css
@@ -412,11 +412,11 @@ body.admin-interface .paginator a.showall:visited {
     max-width: 100%;
 }
 
-.admin-interface.sticky-action-buttons.change-form:not(.popup) #main > #nav-sidebar + .content {
+.admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content {
     padding-bottom: 4rem;
 }
 
-.admin-interface.sticky-action-buttons.change-form:not(.popup) #main > #nav-sidebar + .content .submit-row {
+.admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content form fieldset + .submit-row {
     width: 100%;
     max-width: calc(100% - 28px);
     bottom: 0;
@@ -463,7 +463,7 @@ body.admin-interface .paginator a.showall:visited {
         max-width: calc(100% - 360px);
     }
 
-    .admin-interface.sticky-action-buttons.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row {
+    .admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row {
         max-width: calc(100% - 388px);
         right: 0;
         bottom: 0;
@@ -557,11 +557,11 @@ body.admin-interface .paginator a.showall:visited {
         margin-top: 5px;
     }
 
-    .admin-interface.sticky-action-buttons.change-form:not(.popup) #main > #nav-sidebar + .content {
+    .admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content {
         padding-bottom: 12rem;
     }
 
-    .admin-interface.sticky-action-buttons.change-form:not(.popup) #main > #nav-sidebar + .content .submit-row {
+    .admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content .submit-row {
         max-width: calc(100% - 20px);
     }
 }
\ No newline at end of file