diff --git a/corehq/apps/app_execution/forms.py b/corehq/apps/app_execution/forms.py
index 317500f3c30e..7e6e40f0d1db 100644
--- a/corehq/apps/app_execution/forms.py
+++ b/corehq/apps/app_execution/forms.py
@@ -57,7 +57,6 @@ def __init__(self, request, *args, **kwargs):
         if self.instance.id:
             self.fields["username"].initial = self.instance.django_user.username
         self.helper = hqcrispy.HQFormHelper()
-        self.helper.form_class = "form-horizontal"
 
         fields = [
             "name",
diff --git a/corehq/apps/commtrack/forms.py b/corehq/apps/commtrack/forms.py
index 1a046e636136..f5b22eca8c73 100644
--- a/corehq/apps/commtrack/forms.py
+++ b/corehq/apps/commtrack/forms.py
@@ -4,22 +4,22 @@
 from django.utils.translation import gettext_lazy
 from django.utils.html import format_html
 
-from crispy_forms.bootstrap import PrependedText, StrictButton
-from crispy_forms.helper import FormHelper
+from crispy_forms.bootstrap import StrictButton
 from crispy_forms.layout import Fieldset, Layout
 
 from corehq.apps.consumption.shortcuts import (
     get_default_monthly_consumption,
     set_default_consumption_for_product,
 )
-from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
+from corehq.apps.hqwebapp.crispy import FormActions, HQFormHelper
 from corehq.apps.products.models import SQLProduct
 
 
 class CommTrackSettingsForm(forms.Form):
-    use_auto_emergency_levels = forms.BooleanField(label='', required=False, widget=BootstrapCheckboxInput(
-        inline_label=gettext_lazy("Use default emergency levels")
-    ))
+    use_auto_emergency_levels = forms.BooleanField(
+        label=gettext_lazy("Use default emergency levels"),
+        required=False,
+    )
 
     stock_emergency_level = forms.DecimalField(
         label=gettext_lazy("Emergency Level (months)"), required=False)
@@ -28,22 +28,25 @@ class CommTrackSettingsForm(forms.Form):
     stock_overstock_threshold = forms.DecimalField(
         label=gettext_lazy("Overstock Level (months)"), required=False)
 
-    use_auto_consumption = forms.BooleanField(label='', required=False, widget=BootstrapCheckboxInput(
-        inline_label=gettext_lazy("Use automatic consumption calculation")
-    ))
+    use_auto_consumption = forms.BooleanField(
+        label=gettext_lazy("Use automatic consumption calculation"),
+        required=False,
+    )
     consumption_min_transactions = forms.IntegerField(
         label=gettext_lazy("Minimum Transactions (Count)"), required=False)
     consumption_min_window = forms.IntegerField(
         label=gettext_lazy("Minimum Window for Calculation (Days)"), required=False)
     consumption_optimal_window = forms.IntegerField(
         label=gettext_lazy("Optimal Window for Calculation (Days)"), required=False)
-    individual_consumption_defaults = forms.BooleanField(label='', required=False, widget=BootstrapCheckboxInput(
-        inline_label=gettext_lazy("Configure consumption defaults individually by supply point")
-    ))
+    individual_consumption_defaults = forms.BooleanField(
+        label=gettext_lazy("Configure consumption defaults individually by supply point"),
+        required=False,
+    )
 
-    sync_consumption_fixtures = forms.BooleanField(label='', required=False, widget=BootstrapCheckboxInput(
-        inline_label=gettext_lazy("Sync consumption fixtures")
-    ))
+    sync_consumption_fixtures = forms.BooleanField(
+        label=gettext_lazy("Sync consumption fixtures"),
+        required=False,
+    )
 
     def clean(self):
         cleaned_data = super(CommTrackSettingsForm, self).clean()
@@ -66,8 +69,7 @@ def clean(self):
 
     def __init__(self, *args, **kwargs):
         domain = kwargs.pop('domain')
-        self.helper = FormHelper()
-        self.helper.label_class = 'form-label'
+        self.helper = HQFormHelper()
 
         self.helper.layout = Layout(
             Fieldset(
@@ -78,20 +80,22 @@ def __init__(self, *args, **kwargs):
             ),
             Fieldset(
                 _('Consumption Settings'),
-                PrependedText('use_auto_consumption', ''),
+                'use_auto_consumption',
                 'consumption_min_transactions',
                 'consumption_min_window',
                 'consumption_optimal_window',
-                PrependedText('individual_consumption_defaults', ''),
+                'individual_consumption_defaults',
             ),
             Fieldset(
                 _('Phone Settings'),
-                PrependedText('sync_consumption_fixtures', ''),
+                'sync_consumption_fixtures',
             ),
-            StrictButton(
-                _("Submit"),
-                type="submit",
-                css_class='btn-primary',
+            FormActions(
+                StrictButton(
+                    _("Submit"),
+                    type="submit",
+                    css_class='btn-primary',
+                )
             )
         )
 
@@ -112,9 +116,8 @@ class ConsumptionForm(forms.Form):
     def __init__(self, domain, *args, **kwargs):
         self.domain = domain
         super(ConsumptionForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
+        self.helper = HQFormHelper()
         self.helper.form_tag = False
-        self.helper.label_class = 'form-label'
 
         layout = []
         products = SQLProduct.active_objects.filter(domain=domain)
diff --git a/corehq/apps/commtrack/templates/commtrack/manage/default_consumption.html b/corehq/apps/commtrack/templates/commtrack/manage/default_consumption.html
index 8e56d4a4dbb4..d183ea909e4b 100644
--- a/corehq/apps/commtrack/templates/commtrack/manage/default_consumption.html
+++ b/corehq/apps/commtrack/templates/commtrack/manage/default_consumption.html
@@ -21,8 +21,12 @@
       <legend>{% trans 'Edit Default Monthly Consumption' %}</legend>
       {% crispy form %}
     </fieldset>
-    <button type="submit" class="btn btn-primary">
-      {% trans "Update Default Consumption Info" %}
-    </button>
+    <div class="form-actions row">
+      <div class="field-control">
+        <button type="submit" class="btn btn-primary">
+          {% trans "Update Default Consumption Info" %}
+        </button>
+      </div>
+    </div>
   </form>
 {% endblock %}
diff --git a/corehq/apps/domain/forms.py b/corehq/apps/domain/forms.py
index c24ecc4f92d9..51a61cafbc61 100644
--- a/corehq/apps/domain/forms.py
+++ b/corehq/apps/domain/forms.py
@@ -1273,7 +1273,6 @@ def __init__(self, domain, can_edit_eula, *args, user, **kwargs):
             )
 
         self.helper = hqcrispy.HQFormHelper()
-        self.helper.form_class = "form-horizontal"
         self.helper.layout = crispy.Layout(
             crispy.Fieldset(
                 _("Basic Information"),
diff --git a/corehq/apps/email/forms.py b/corehq/apps/email/forms.py
index ab42b4439117..dfe05200fb1e 100644
--- a/corehq/apps/email/forms.py
+++ b/corehq/apps/email/forms.py
@@ -115,12 +115,14 @@ def helper(self):
             hqcrispy.CheckboxField('use_tracking_headers'),
             crispy.Field('sns_secret'),
             crispy.Field('ses_config_set_name'),
-            twbscrispy.StrictButton(
-                _("Saved"),
-                type="submit",
-                css_class="btn-primary disable-on-submit",
-                data_bind="text: buttonText, enable: isFormChanged",
-            ),
+            hqcrispy.FormActions(
+                twbscrispy.StrictButton(
+                    _("Saved"),
+                    type="submit",
+                    css_class="btn-primary disable-on-submit",
+                    data_bind="text: buttonText, enable: isFormChanged",
+                ),
+            )
         )
         return helper
 
diff --git a/corehq/apps/enterprise/forms.py b/corehq/apps/enterprise/forms.py
index 4a36701cd3ff..a196e79555ae 100644
--- a/corehq/apps/enterprise/forms.py
+++ b/corehq/apps/enterprise/forms.py
@@ -7,9 +7,9 @@
 
 from crispy_forms import layout as crispy
 from crispy_forms.bootstrap import PrependedText, StrictButton
-from crispy_forms.helper import FormHelper
 
 from corehq.apps.accounting.utils import domain_has_privilege
+from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.apps.export.models.export_settings import ExportFileType
 from corehq.privileges import DEFAULT_EXPORT_SETTINGS
@@ -131,16 +131,15 @@ def __init__(self, *args, **kwargs):
             kwargs['initial'].update(self.export_settings.as_dict())
 
         super(EnterpriseSettingsForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper(self)
+        self.helper = hqcrispy.HQFormHelper(self)
         self.helper.form_id = 'enterprise-settings-form'
         self.helper.form_action = reverse("edit_enterprise_settings", args=[self.domain])
-        self.helper.label_class = 'form-label'
         self.helper.layout = crispy.Layout(
             crispy.Fieldset(
                 _("Edit Enterprise Settings"),
-                PrependedText('restrict_domain_creation', ''),
+                hqcrispy.CheckboxField('restrict_domain_creation'),
                 crispy.Div(
-                    PrependedText('restrict_signup', '', data_bind='checked: restrictSignup'),
+                    hqcrispy.CheckboxField('restrict_signup', data_bind='checked: restrictSignup'),
                 ),
                 crispy.Div(
                     crispy.Field('restrict_signup_message'),
@@ -157,29 +156,31 @@ def __init__(self, *args, **kwargs):
                         crispy.Div(
                             crispy.Field('forms_filetype'),
                         ),
-                        PrependedText('forms_auto_convert', ''),
-                        PrependedText('forms_auto_format_cells', ''),
-                        PrependedText('forms_expand_checkbox', ''),
+                        hqcrispy.CheckboxField('forms_auto_convert'),
+                        hqcrispy.CheckboxField('forms_auto_format_cells'),
+                        hqcrispy.CheckboxField('forms_expand_checkbox'),
                     ),
                     crispy.Fieldset(
                         _("Edit Default Case Export Settings"),
                         crispy.Div(
                             crispy.Field('cases_filetype')
                         ),
-                        PrependedText('cases_auto_convert', ''),
+                        hqcrispy.CheckboxField('cases_auto_convert'),
                     ),
                     crispy.Fieldset(
                         _("Edit Default OData Export Settings"),
-                        PrependedText('odata_expand_checkbox', ''),
+                        hqcrispy.CheckboxField('odata_expand_checkbox'),
                     ),
                 )
             )
 
         self.helper.layout.append(
-            StrictButton(
-                _("Update Enterprise Settings"),
-                type="submit",
-                css_class='btn-primary',
+            hqcrispy.FormActions(
+                StrictButton(
+                    _("Update Enterprise Settings"),
+                    type="submit",
+                    css_class='btn-primary',
+                )
             )
         )
 
@@ -286,9 +287,8 @@ def __init__(self, *args, **kwargs):
         }
 
         super().__init__(*args, **kwargs)
-        self.helper = FormHelper(self)
+        self.helper = hqcrispy.HQFormHelper(self)
         self.helper.form_id = 'emw-settings-form'
-        self.helper.label_class = 'form-label'
         self.helper.layout = crispy.Layout(
             crispy.Fieldset(
                 _("Manage Mobile Workers"),
@@ -298,10 +298,12 @@ def __init__(self, *args, **kwargs):
                 ),
                 PrependedText('allow_custom_deactivation', ''),
             ),
-            StrictButton(
-                _("Update Settings"),
-                type="submit",
-                css_class='btn-primary',
+            hqcrispy.FormActions(
+                StrictButton(
+                    _("Update Settings"),
+                    type="submit",
+                    css_class='btn-primary',
+                )
             )
         )
 
diff --git a/corehq/apps/export/forms.py b/corehq/apps/export/forms.py
index 00d81a5cf988..255b43db9536 100644
--- a/corehq/apps/export/forms.py
+++ b/corehq/apps/export/forms.py
@@ -8,7 +8,7 @@
 
 import dateutil
 from crispy_forms import layout as crispy
-from crispy_forms.helper import FormHelper
+from corehq.apps.hqwebapp import crispy as hqcrispy
 from crispy_forms.bootstrap import StrictButton
 
 from corehq import privileges
@@ -1078,7 +1078,7 @@ class DatasourceExportDownloadForm(forms.Form):
 
     def __init__(self, domain, *args, **kwargs):
         super(DatasourceExportDownloadForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
+        self.helper = HQFormHelper()
 
         self.fields['data_source'].choices = self.domain_datasources(domain)
 
@@ -1094,11 +1094,13 @@ def __init__(self, domain, *args, **kwargs):
                     data_bind='visible: haveDatasources'
                 ),
             ),
-            StrictButton(
-                _("Download Data Export Tool query file"),
-                type="submit",
-                css_class="btn-primary",
-                data_bind="enable: haveDatasources"
+            hqcrispy.FormActions(
+                StrictButton(
+                    _("Download Data Export Tool query file"),
+                    type="submit",
+                    css_class="btn-primary",
+                    data_bind="enable: haveDatasources"
+                ),
             ),
         )
 
diff --git a/corehq/apps/hqwebapp/crispy.py b/corehq/apps/hqwebapp/crispy.py
index fceb944f7fa9..f86d05b17762 100644
--- a/corehq/apps/hqwebapp/crispy.py
+++ b/corehq/apps/hqwebapp/crispy.py
@@ -1,4 +1,3 @@
-import re
 from contextlib import contextmanager
 from django.forms.widgets import DateTimeInput
 from django.template.loader import render_to_string
@@ -13,11 +12,9 @@
 from crispy_forms.layout import LayoutObject
 from crispy_forms.utils import flatatt, get_template_pack, render_field
 
-CSS_LABEL_CLASS = 'col-xs-12 col-sm-4 col-md-4 col-lg-2'
-CSS_LABEL_CLASS_BOOTSTRAP5 = 'col-xs-12 col-sm-4 col-md-4 col-lg-3'
-CSS_FIELD_CLASS = 'col-xs-12 col-sm-8 col-md-8 col-lg-6'
-CSS_FIELD_CLASS_BOOTSTRAP5 = 'col-xs-12 col-sm-8 col-md-8 col-lg-9'
-CSS_ACTION_CLASS = CSS_FIELD_CLASS + ' col-sm-offset-4 col-md-offset-4 col-lg-offset-2'
+CSS_LABEL_CLASS = 'field-label'
+CSS_FIELD_CLASS = 'field-control'
+CSS_ACTION_CLASS = CSS_FIELD_CLASS
 
 
 class HQFormHelper(FormHelper):
@@ -28,13 +25,7 @@ class HQFormHelper(FormHelper):
     def __init__(self, *args, **kwargs):
         super(HQFormHelper, self).__init__(*args, **kwargs)
         from corehq.apps.hqwebapp.utils.bootstrap import get_bootstrap_version, BOOTSTRAP_5
-        bootstrap_version = get_bootstrap_version()
-        use_bootstrap5 = bootstrap_version == BOOTSTRAP_5
-        if use_bootstrap5:
-            self.label_class = CSS_LABEL_CLASS_BOOTSTRAP5
-            self.field_class = CSS_FIELD_CLASS_BOOTSTRAP5
-            self.use_bootstrap5 = use_bootstrap5
-            self.form_class = 'form'
+        self.use_bootstrap5 = get_bootstrap_version() == BOOTSTRAP_5
 
         if 'autocomplete' not in self.attrs:
             self.attrs.update({
@@ -76,15 +67,7 @@ class ErrorsOnlyField(Field):
 
 
 def get_form_action_class():
-    """This is only valid for bootstrap 5"""
-    return CSS_LABEL_CLASS_BOOTSTRAP5.replace('col', 'offset') + ' ' + CSS_FIELD_CLASS_BOOTSTRAP5
-
-
-def _get_offsets(context):
-    label_class = context.get('label_class', '')
-    use_bootstrap5 = context.get('use_bootstrap5')
-    return (label_class.replace('col', 'offset') if use_bootstrap5
-            else re.sub(r'(xs|sm|md|lg)-', r'\g<1>-offset-', label_class))
+    return CSS_FIELD_CLASS
 
 
 class FormActions(OriginalFormActions):
@@ -102,11 +85,9 @@ def render(self, form, context, template_pack=None, **kwargs):
                 template_pack=template_pack,
             )
         fields_html = mark_safe(fields_html)  # nosec: just concatenated safe fields
-        offsets = _get_offsets(context)
         context.update({
             'formactions': self,
             'fields_output': fields_html,
-            'offsets': offsets,
             'field_class': context.get('field_class', '')
         })
         return render_to_string(self.template, context.flatten())
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/includes/extensions.less b/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/includes/extensions.less
new file mode 100644
index 000000000000..80394fb674dc
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/includes/extensions.less
@@ -0,0 +1,16 @@
+.field-label {
+  &:extend(.col-xs-12, .col-sm-4, .col-md-4, .col-lg-2);
+}
+
+.field-label + .field-control {
+  &:extend(.col-xs-12, .col-sm-8, .col-md-8, .col-lg-6);
+}
+
+:not(.field-label) + .field-control,
+.form-actions > .field-control:first-child,
+.form-group > .field-control:first-child {
+  &:extend(
+    .col-sm-offset-4, .col-md-offset-4, .col-lg-offset-2,
+    .col-xs-12, .col-sm-8, .col-md-8, .col-lg-6
+  );
+}
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/less/bootstrap.less b/corehq/apps/hqwebapp/static/hqwebapp/less/bootstrap.less
index 29e6b786ecdd..f801d1b4b988 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/less/bootstrap.less
+++ b/corehq/apps/hqwebapp/static/hqwebapp/less/bootstrap.less
@@ -9,6 +9,7 @@
 // Core variables and mixins
 @import "_hq/includes/variables.less";
 @import "_hq/includes/mixins.less";
+@import "_hq/includes/extensions.less";
 
 // Reset and dependencies
 @import "../../../../../../node_modules/bootstrap/less/normalize.less";
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_forms.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_forms.scss
index 481acf947bd2..2f7aef91a69d 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_forms.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_forms.scss
@@ -1,3 +1,16 @@
+.field-label {
+  @extend .col-form-label, .col-12, .col-sm-4, .col-md-3, .col-lg-2;
+}
+
+.field-label + .field-control {
+  @extend .col-12, .col-sm-8, .col-md-9, .col-lg-10;
+}
+
+:not(.field-label) + .field-control,
+.row > .field-control:first-child {
+  @extend .offset-sm-4, .offset-md-3, .offset-lg-2;
+}
+
 .row > div > .form-check:first-child,
 .row > div > .input-group > .form-check:first-child {
   padding-top: add($input-padding-y, $input-border-width);
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap3/form_actions.html b/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap3/form_actions.html
index 00f51a85d933..1849503aa48d 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap3/form_actions.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap3/form_actions.html
@@ -1,5 +1,5 @@
 <div {% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %} class="form-actions">
-    <div class="{{ offsets }} controls {{ field_class }}">
+    <div class="controls {{ field_class }}">
         {{ fields_output }}
     </div>
 </div>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap5/form_actions.html b/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap5/form_actions.html
index fe52406f6134..1c56acebb3e6 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap5/form_actions.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/crispy/bootstrap5/form_actions.html
@@ -1,5 +1,5 @@
 <div class="form-actions{% if 'form-horizontal' in form_class %} row{% endif %}" {% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %}>
-  <div class="{{ offsets }} {{ field_class }}">
+  <div class="{{ field_class }}">
     {{ fields_output }}
   </div>
 </div>
diff --git a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
index 70533be19c8f..c17a36543abc 100644
--- a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
+++ b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
@@ -246,19 +246,13 @@ def can_use_restore_as(request):
 
 @register.simple_tag
 def css_label_class():
-    from corehq.apps.hqwebapp.crispy import CSS_LABEL_CLASS, CSS_LABEL_CLASS_BOOTSTRAP5
-    from corehq.apps.hqwebapp.utils.bootstrap import get_bootstrap_version, BOOTSTRAP_5
-    if get_bootstrap_version() == BOOTSTRAP_5:
-        return CSS_LABEL_CLASS_BOOTSTRAP5
+    from corehq.apps.hqwebapp.crispy import CSS_LABEL_CLASS
     return CSS_LABEL_CLASS
 
 
 @register.simple_tag
 def css_field_class():
-    from corehq.apps.hqwebapp.crispy import CSS_FIELD_CLASS, CSS_FIELD_CLASS_BOOTSTRAP5
-    from corehq.apps.hqwebapp.utils.bootstrap import get_bootstrap_version, BOOTSTRAP_5
-    if get_bootstrap_version() == BOOTSTRAP_5:
-        return CSS_FIELD_CLASS_BOOTSTRAP5
+    from corehq.apps.hqwebapp.crispy import CSS_FIELD_CLASS
     return CSS_FIELD_CLASS
 
 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/crispy/form_actions.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/crispy/form_actions.html.diff.txt
index ffe8bfd29c8e..c719c0d4debd 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/crispy/form_actions.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/crispy/form_actions.html.diff.txt
@@ -2,11 +2,11 @@
 +++ 
 @@ -1,5 +1,5 @@
 -<div {% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %} class="form-actions">
--    <div class="{{ offsets }} controls {{ field_class }}">
+-    <div class="controls {{ field_class }}">
 -        {{ fields_output }}
 -    </div>
 +<div class="form-actions{% if 'form-horizontal' in form_class %} row{% endif %}" {% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %}>
-+  <div class="{{ offsets }} {{ field_class }}">
++  <div class="{{ field_class }}">
 +    {{ fields_output }}
 +  </div>
  </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt
index 920cf155f13e..d123abd6edd2 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt
@@ -1,20 +1,19 @@
 --- 
 +++ 
-@@ -1,356 +1,7 @@
+@@ -1,356 +1,20 @@
 -// FORM ACTIONS from TWBS 2
 -// ------------
 -
 -[ng\:cloak],[ng-cloak],.ng-cloak{
 -  display:none !important
--}
--
++.field-label {
++  @extend .col-form-label, .col-12, .col-sm-4, .col-md-3, .col-lg-2;
+ }
+ 
 -.form-actions {
 -  padding: (@line-height-base * @font-size-base - 1px) 0px @line-height-base * @font-size-base;
 -  margin-top: @line-height-base * 1em;
-+.row > div > .form-check:first-child,
-+.row > div > .input-group > .form-check:first-child {
-+  padding-top: add($input-padding-y, $input-border-width);
-   margin-bottom: 0;
+-  margin-bottom: 0;
 -  background-color: @navbar-default-bg;
 -  border-top: 1px solid @legend-border-color;
 -  .border-bottom-radius(@border-radius-base);
@@ -31,12 +30,17 @@
 -      margin-left: 0;
 -    }
 -  }
--}
--
++.field-label + .field-control {
++  @extend .col-12, .col-sm-8, .col-md-9, .col-lg-10;
+ }
+ 
 -.form-horizontal .control-label {
 -  text-align: left;     // override bootstrap
--}
--
++:not(.field-label) + .field-control,
++.row > .field-control:first-child {
++  @extend .offset-sm-4, .offset-md-3, .offset-lg-2;
+ }
+ 
 -legend .subtext {
 -  font-size: .8em;
 -  color: lighten(@cc-text, 40%);
@@ -357,10 +361,14 @@
 -
 -.controls-text {
 -  padding-top: 7px;
++.row > div > .form-check:first-child,
++.row > div > .input-group > .form-check:first-child {
++  padding-top: add($input-padding-y, $input-border-width);
++  margin-bottom: 0;
  }
  
  .form-hide-actions .form-actions {
-@@ -361,21 +12,34 @@
+@@ -361,21 +25,34 @@
    .validationMessage {
      display: block;
      padding-top: 8px;
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/crispy.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/crispy.md
index d0a43896efe3..0bc4db071091 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/crispy.md
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/crispy.md
@@ -6,9 +6,6 @@ section</a> of the style guide.
 
 A few useful things to know about crispy forms in Bootstrap 5:
 
-* Checkboxes, typically based on a `BooleanField`, need to be updated to use the `BootstrapCheckboxInput` as their
-`widget`, as shown in <a href="https://www.commcarehq.org/styleguide/b5/organisms/forms/#crispy-forms-simple"
-target="_blank">this style guide example</a>.
 * As described in <a href="https://www.commcarehq.org/styleguide/b5/organisms/forms/#crispy-forms-simple"
 target="_blank">this section of the style guide</a>, best practice is to use one of HQ's standard helper classes
 for layout. Doing so means you can delete <code>form_class</code>, <code>label_class</code>,
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md
index 7b6ac9575df2..b16cdcaa9098 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md
@@ -1,10 +1,10 @@
 `form-group` has been dropped. Use grid utilities instead.
 
-Since we are opting for vertical forms (where the label is directly above the field), take the following actions:
+Take the following actions:
 * Remove the `div` wrapper from the `form-group`'s first child, which contains the field's label.
-* Remove the column classes (`col-lg-2`, etc.) from the `form-group`'s first child, usually a `<label>`,
-which contains the field's label. Most often, this will leave the label with just the `form-label` class.
-* Remove the column classes (`col-lg-2`, etc.) from the `form-group`'s second child, which contains the field
-control (the actual input, which will often use the `form-control` class).  Frequently, this will leave the `<div>`
-without any other classes. If so, and if it has no other attributes, it can be removed.
-* Replace `form-group` with `mb-3`.
+* Replace the column classes (`col-lg-2`, etc.) from the `form-group`'s first child, usually a `<label>`,
+with the `field-label` class. If the first child is a control container such as form actions, do not add
+`field-label`, and instead apply the next step to the first child.
+* Replace the column classes (`col-lg-2`, etc.) of the `form-group`'s second child with `field-control`.
+This `div` should contain the field control (the actual input, which will often use the `form-control` class).
+* Replace `form-group` with `row mb-3`.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md
index 2863565f0e6b..1b1a074f134c 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md
@@ -22,11 +22,13 @@ Previously:
 Now:
 ```
     <div class="row mb-3">
-      <label for="id_error_input" class="form-label">
+      <label for="id_error_input" class="form-label field-label">
         Error Input
       </label>
-      <input type="text" name="error_input" class="form-control is-invalid" id="id_error_input" />
-      <div class='invalid-feedback'>This is an error message.</div>
+      <div class="field-control">
+        <input type="text" name="error_input" class="form-control is-invalid" id="id_error_input" />
+        <div class='invalid-feedback'>This is an error message.</div>
+      </div>
     </div>
 ```
 
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md
index 2750b719c6ea..8f634729276c 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md
@@ -22,11 +22,13 @@ Previously:
 Now:
 ```
     <div class="row mb-3">
-      <label for="id_happy_input" class="form-label">
+      <label for="id_happy_input" class="form-label field-label">
         Happy Input
       </label>
-      <input type="text" name="happy_input" class="form-control is-valid" id="id_happy_input" />
-      <div class='valid-feedback'>Look at what a good job you did.</div>
+      <div class="field-control">
+        <input type="text" name="happy_input" class="form-control is-valid" id="id_happy_input" />
+        <div class='valid-feedback'>Look at what a good job you did.</div>
+      </div>
     </div>
 ```
 
diff --git a/corehq/apps/integration/forms.py b/corehq/apps/integration/forms.py
index 49f4358244db..721d8a259f0f 100644
--- a/corehq/apps/integration/forms.py
+++ b/corehq/apps/integration/forms.py
@@ -2,13 +2,11 @@
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy, gettext_noop
 
-from crispy_forms.bootstrap import PrependedText
 from crispy_forms import layout as crispy
 from crispy_forms.layout import Submit
 from memoized import memoized
 
 from corehq.apps.hqwebapp import crispy as hqcrispy
-from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.apps.integration.models import (
     DialerSettings,
     HmacCalloutSettings,
@@ -19,11 +17,8 @@
 
 class DialerSettingsForm(forms.ModelForm):
     is_enabled = forms.BooleanField(
-        label="",
+        label=_("Enable AWS Connect Dialer"),
         required=False,
-        widget=BootstrapCheckboxInput(
-            inline_label=_("Enable AWS Connect Dialer"),
-        ),
     )
     aws_instance_id = forms.CharField(
         label=_('AWS Instance ID'),
@@ -56,7 +51,7 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            PrependedText('is_enabled', ""),
+            crispy.Field('is_enabled'),
             crispy.Div(
                 crispy.Field('aws_instance_id'),
             ),
@@ -66,8 +61,10 @@ def __init__(self, data, *args, **kwargs):
             crispy.Div(
                 crispy.Field('dialer_page_subheader'),
             ),
-            crispy.ButtonHolder(
-                Submit('submit', _("Update"))
+            hqcrispy.FormActions(
+                crispy.ButtonHolder(
+                    Submit('submit', _("Update"))
+                )
             )
         )
 
@@ -98,11 +95,8 @@ def save(self):
 
 class GaenOtpServerSettingsForm(forms.ModelForm):
     is_enabled = forms.BooleanField(
-        label="",
+        label=gettext_lazy("Enable GAEN OTP server integration"),
         required=False,
-        widget=BootstrapCheckboxInput(
-            inline_label=gettext_lazy("Enable GAEN OTP server integration"),
-        ),
     )
 
     server_type = forms.CharField(
@@ -139,7 +133,7 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            PrependedText('is_enabled', ""),
+            crispy.Field('is_enabled'),
             crispy.Div(
                 crispy.Field('server_type'),
             ),
@@ -149,8 +143,10 @@ def __init__(self, data, *args, **kwargs):
             crispy.Div(
                 crispy.Field('auth_token'),
             ),
-            crispy.ButtonHolder(
-                Submit('submit', _("Update"))
+            hqcrispy.FormActions(
+                crispy.ButtonHolder(
+                    Submit('submit', _("Update"))
+                )
             )
         )
 
@@ -181,11 +177,8 @@ def save(self):
 
 class HmacCalloutSettingsForm(forms.ModelForm):
     is_enabled = forms.BooleanField(
-        label="",
+        label=_("Enable in Web Apps"),
         required=False,
-        widget=BootstrapCheckboxInput(
-            inline_label=_("Enable in Web Apps"),
-        ),
     )
     destination_url = forms.CharField(
         label=_('External Callout URL'),
@@ -218,7 +211,7 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            PrependedText('is_enabled', ""),
+            crispy.Field('is_enabled'),
             crispy.Div(
                 crispy.Field('destination_url'),
             ),
@@ -228,8 +221,10 @@ def __init__(self, data, *args, **kwargs):
             crispy.Div(
                 crispy.Field('api_secret'),
             ),
-            crispy.ButtonHolder(
-                Submit('submit', _("Update"))
+            hqcrispy.FormActions(
+                crispy.ButtonHolder(
+                    Submit('submit', _("Update"))
+                )
             )
         )
 
@@ -260,11 +255,8 @@ def save(self):
 
 class SimprintsIntegrationForm(forms.Form):
     is_enabled = forms.BooleanField(
-        label="",
+        label=gettext_noop("Enable Simprints Integration"),
         required=False,
-        widget=BootstrapCheckboxInput(
-            inline_label=gettext_noop("Enable Simprints Integration"),
-        ),
     )
     project_id = forms.CharField(
         label=gettext_noop("Project ID"),
@@ -286,15 +278,17 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            PrependedText('is_enabled', "", data_bind="checked: isEnabled"),
+            crispy.Field('is_enabled', data_bind="checked: isEnabled"),
             crispy.Div(
                 crispy.Field('project_id', data_bind="value: projectId"),
                 crispy.Field('user_id', data_bind="value: userId"),
                 crispy.Field('module_id', data_bind="value: moduleId"),
                 data_bind="visible: isEnabled"
             ),
-            crispy.ButtonHolder(
-                Submit('submit', gettext_lazy("Update"))
+            hqcrispy.FormActions(
+                crispy.ButtonHolder(
+                    Submit('submit', gettext_lazy("Update"))
+                )
             )
         )
 
diff --git a/corehq/apps/locations/forms.py b/corehq/apps/locations/forms.py
index 908a2bd89426..dfd30b37b3e5 100644
--- a/corehq/apps/locations/forms.py
+++ b/corehq/apps/locations/forms.py
@@ -412,8 +412,10 @@ def __init__(self, request, domain_object, location, *args, **kwargs):
                 _("Specify Workers at this Location"),
                 crispy.Field('selected_ids'),
             ),
-            crispy.ButtonHolder(
-                Submit('submit', gettext_lazy("Update Location Membership"))
+            hqcrispy.FormActions(
+                crispy.ButtonHolder(
+                    Submit('submit', gettext_lazy("Update Location Membership"))
+                )
             )
         )
 
@@ -567,12 +569,14 @@ def __init__(self, *args, **kwargs):
                 ),
                 crispy.Field('location_status_active',),
             ),
-            StrictButton(
-                _("Download Locations"),
-                type="submit",
-                css_class="btn btn-primary",
-                data_bind="html: buttonHTML",
-            ),
+            hqcrispy.FormActions(
+                StrictButton(
+                    _("Download Locations"),
+                    type="submit",
+                    css_class="btn btn-primary",
+                    data_bind="html: buttonHTML",
+                ),
+            )
         )
 
     def clean_location_id(self):
diff --git a/corehq/apps/notifications/forms.py b/corehq/apps/notifications/forms.py
index eaf8f38cf050..2aef01f6100d 100644
--- a/corehq/apps/notifications/forms.py
+++ b/corehq/apps/notifications/forms.py
@@ -54,19 +54,21 @@ def __init__(self, *args, **kwargs):
             crispy.Field('content'),
             crispy.Field('url'),
             crispy.Field('type'),
-            twbscrispy.PrependedText('domain_specific', ''),
+            hqcrispy.CheckboxField('domain_specific'),
             crispy.Field('domains'),
-            twbscrispy.StrictButton(
-                _("Submit Information"),
-                type="submit",
-                css_class="btn btn-primary",
-                name="submit",
-            ),
-            hqcrispy.LinkButton(
-                _("Cancel"),
-                reverse(ManageNotificationView.urlname),
-                css_class="btn btn-outline-primary",
-                name="cancel",
+            hqcrispy.FormActions(
+                twbscrispy.StrictButton(
+                    _("Submit Information"),
+                    type="submit",
+                    css_class="btn btn-primary",
+                    name="submit",
+                ),
+                hqcrispy.LinkButton(
+                    _("Cancel"),
+                    reverse(ManageNotificationView.urlname),
+                    css_class="btn btn-outline-primary",
+                    name="cancel",
+                ),
             ),
         )
 
diff --git a/corehq/apps/products/forms.py b/corehq/apps/products/forms.py
index f9bbef38aa86..8f9065c25f57 100644
--- a/corehq/apps/products/forms.py
+++ b/corehq/apps/products/forms.py
@@ -3,10 +3,10 @@
 from django import forms
 from django.utils.translation import gettext_noop
 
-from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout
 
 from corehq.apps.commtrack.util import all_sms_codes
+from corehq.apps.hqwebapp.crispy import HQFormHelper
 from corehq.apps.products.models import SQLProduct
 from corehq.apps.programs.models import Program
 
@@ -42,9 +42,8 @@ def __init__(self, product, *args, **kwargs):
         kwargs['initial']['code'] = self.product.code
 
         super(ProductForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
+        self.helper = HQFormHelper()
         self.helper.form_tag = False
-        self.helper.label_class = 'form-label'
 
         programs = Program.by_domain(self.product.domain)
         self.fields['program_id'].choices = tuple((prog.get_id, prog.name) for prog in programs)
diff --git a/corehq/apps/products/templates/products/manage/product.html b/corehq/apps/products/templates/products/manage/product.html
index 81788fea6bc2..5da6f8138906 100644
--- a/corehq/apps/products/templates/products/manage/product.html
+++ b/corehq/apps/products/templates/products/manage/product.html
@@ -14,12 +14,16 @@
       {% crispy data_fields_form %}
     {% endif %}
 
-    <button type="submit" class="btn btn-primary">
-      {% if product.get_id %}
-        {% trans 'Update Product' %}
-      {% else %}
-        {% trans 'Create Product' %}
-      {% endif %}
-    </button>
+    <div class="form-actions row">
+      <div class="field-control">
+        <button type="submit" class="btn btn-primary">
+          {% if product.get_id %}
+            {% trans 'Update Product' %}
+          {% else %}
+            {% trans 'Create Product' %}
+          {% endif %}
+        </button>
+      </div>
+    </div>
   </form>
 {% endblock %}
diff --git a/corehq/apps/programs/forms.py b/corehq/apps/programs/forms.py
index a0d6620b6827..d9050074b64a 100644
--- a/corehq/apps/programs/forms.py
+++ b/corehq/apps/programs/forms.py
@@ -2,8 +2,8 @@
 from django.utils.translation import gettext as _
 
 from crispy_forms import layout as crispy
-from crispy_forms.helper import FormHelper
 
+from corehq.apps.hqwebapp.crispy import HQFormHelper
 from corehq.apps.programs.models import Program
 
 
@@ -15,9 +15,8 @@ def __init__(self, program, *args, **kwargs):
 
         kwargs['initial'] = self.program._doc
         super(ProgramForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
+        self.helper = HQFormHelper()
         self.helper.form_tag = False
-        self.helper.label_class = 'form-label'
 
         # don't let users rename the uncategorized
         # program
diff --git a/corehq/apps/reminders/forms.py b/corehq/apps/reminders/forms.py
index d5c7a3261aa2..9cae4683004b 100644
--- a/corehq/apps/reminders/forms.py
+++ b/corehq/apps/reminders/forms.py
@@ -13,7 +13,6 @@
 from crispy_forms import bootstrap as twbscrispy
 from crispy_forms import layout as crispy
 from crispy_forms.bootstrap import InlineField
-from crispy_forms.helper import FormHelper
 from dateutil.parser import parse
 from memoized import memoized
 
@@ -23,7 +22,6 @@
 from corehq.apps.app_manager.dbaccessors import get_app
 from corehq.apps.groups.models import Group
 from corehq.apps.hqwebapp import crispy as hqcrispy
-from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.apps.reminders.util import DotExpandedDict, get_form_list, split_combined_id
 from corehq.apps.sms.models import Keyword
 
@@ -129,12 +127,9 @@ class KeywordForm(Form):
     keyword = CharField(label=gettext_noop("Keyword"))
     description = TrimmedCharField(label=gettext_noop("Description"))
     override_open_sessions = BooleanField(
-        label="",
+        label=gettext_lazy("Override open SMS Surveys"),
         required=False,
         initial=False,
-        widget=BootstrapCheckboxInput(
-            inline_label=gettext_lazy("Override open SMS Surveys"),
-        ),
     )
     allow_keyword_use_by = ChoiceField(
         required=False,
@@ -190,10 +185,7 @@ class KeywordForm(Form):
     )
     use_custom_delimiter = BooleanField(
         required=False,
-        label="",
-        widget=BootstrapCheckboxInput(
-            inline_label=gettext_lazy("Use Custom Delimiter"),
-        ),
+        label=gettext_lazy("Use Custom Delimiter"),
     )
     delimiter = TrimmedCharField(
         required=False,
@@ -201,17 +193,11 @@ class KeywordForm(Form):
     )
     use_named_args_separator = BooleanField(
         required=False,
-        label="",
-        widget=BootstrapCheckboxInput(
-            inline_label=gettext_lazy("Use Joining Character"),
-        ),
+        label=gettext_lazy("Use Joining Character"),
     )
     use_named_args = BooleanField(
         required=False,
-        label="",
-        widget=BootstrapCheckboxInput(
-            inline_label=gettext_lazy("Use Named Answers"),
-        ),
+        label=gettext_lazy("Use Named Answers"),
     )
     named_args_separator = TrimmedCharField(
         required=False,
@@ -251,9 +237,7 @@ def __init__(self, *args, **kwargs):
         self.fields['structured_sms_app_and_form_unique_id'].disabled = self.readonly
 
         from corehq.apps.reminders.views import KeywordsListView
-        self.helper = FormHelper()
-        self.helper.form_class = "form"
-        self.helper.label_class = "form-label"
+        self.helper = hqcrispy.HQFormHelper()
 
         layout_fields = [
             crispy.Fieldset(
@@ -280,20 +264,18 @@ def __init__(self, *args, **kwargs):
                         data_bind="value: structuredSmsAppAndFormUniqueId",
                         css_class="hqwebapp-select2",
                     ),
-                    twbscrispy.PrependedText('use_custom_delimiter', '',
-                                             data_bind="checked: useCustomDelimiter, "
-                                                       "click: updateExampleStructuredSMS"),
+                    crispy.Field('use_custom_delimiter',
+                                 data_bind="checked: useCustomDelimiter, click: updateExampleStructuredSMS"),
                     InlineField(
                         'delimiter',
                         data_bind="value: delimiter, "
                                   "valueUpdate: 'afterkeydown', "
                                   "event: {keyup: updateExampleStructuredSMS},"
                                   "visible: useCustomDelimiter",
-                        css_class="mb-3",
+                        css_class=hqcrispy.CSS_FIELD_CLASS,
                     ),
-                    twbscrispy.PrependedText('use_named_args', '',
-                                             data_bind="checked: useNamedArgs, "
-                                                       "click: updateExampleStructuredSMS"),
+                    crispy.Field('use_named_args',
+                                 data_bind="checked: useNamedArgs, click: updateExampleStructuredSMS"),
                     hqcrispy.ErrorsOnlyField('named_args'),
                     crispy.Div(
                         data_bind="template: {"
@@ -301,13 +283,13 @@ def __init__(self, *args, **kwargs):
                                   " data: $data"
                                   "}, "
                                   "visible: useNamedArgs",
-                        css_class="mb-3",
+                        css_class=hqcrispy.CSS_FIELD_CLASS,
                     ),
                     crispy.Div(
                         crispy.Div(
                             InlineField(
-                                twbscrispy.PrependedText(
-                                    'use_named_args_separator', '',
+                                crispy.Field(
+                                    'use_named_args_separator',
                                     data_bind="checked: useNamedArgsSeparator, "
                                               "click: updateExampleStructuredSMS"
                                 ),
@@ -322,16 +304,16 @@ def __init__(self, *args, **kwargs):
                                           "event: {keyup: updateExampleStructuredSMS},"
                                           "visible: useJoiningCharacter",
                             ),
+                            css_class=hqcrispy.CSS_FIELD_CLASS,
                         ),
                         data_bind="visible: useNamedArgs",
-                        css_class="mb-3",
                     ),
                     hqcrispy.B3MultiField(
                         _("Example Structured Message"),
                         crispy.HTML('<span class="font-monospace badge rounded-pill bg-secondary" '
                                     'data-bind="text: exampleStructuredSms">'
                                     '</pre>'),
-                        css_class="mb-3",
+                        css_class=hqcrispy.CSS_FIELD_CLASS,
                     ),
                     disabled=self.readonly,
                 ),
@@ -400,21 +382,23 @@ def __init__(self, *args, **kwargs):
             ),
             crispy.Fieldset(
                 _("Advanced Options"),
-                twbscrispy.PrependedText(
-                    'override_open_sessions', '',
+                crispy.Field(
+                    'override_open_sessions',
                     data_bind="checked: overrideOpenSessions",
                 ),
                 'allow_keyword_use_by',
                 disabled=self.readonly,
             ),
-            twbscrispy.StrictButton(
-                _("Save"),
-                css_class='btn-primary',
-                type='submit',
-                disabled=self.readonly,
-            ),
-            crispy.HTML('<a href="%s" class="btn btn-outline-primary">%s</a>'
-                        % (reverse(KeywordsListView.urlname, args=[self.domain]), _("Cancel")))
+            hqcrispy.FormActions(
+                twbscrispy.StrictButton(
+                    _("Save"),
+                    css_class='btn-primary',
+                    type='submit',
+                    disabled=self.readonly,
+                ),
+                crispy.HTML('<a href="%s" class="btn btn-outline-primary">%s</a>'
+                            % (reverse(KeywordsListView.urlname, args=[self.domain]), _("Cancel")))
+            )
         ])
         self.helper.layout = crispy.Layout(*layout_fields)
 
diff --git a/corehq/apps/settings/forms.py b/corehq/apps/settings/forms.py
index 0c3012be0be8..e4fd51ddffdb 100644
--- a/corehq/apps/settings/forms.py
+++ b/corehq/apps/settings/forms.py
@@ -43,8 +43,7 @@ class HQPasswordChangeForm(PasswordChangeForm):
     def __init__(self, user, *args, **kwargs):
 
         super(HQPasswordChangeForm, self).__init__(user, *args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_class = 'form'
+        self.helper = HQFormHelper()
         self.helper.layout = crispy.Layout(
             crispy.Fieldset(
                 _('Specify New Password'),
@@ -54,11 +53,13 @@ def __init__(self, user, *args, **kwargs):
                     data_bind="value: password, valueUpdate: 'input'",
                 ),
                 'new_password2',
-                twbscrispy.StrictButton(
-                    _('Change Password'),
-                    css_class='btn-primary',
-                    type='submit',
-                    data_bind="enable: passwordSufficient(), click: submitCheck"
+                hqcrispy.FormActions(
+                    twbscrispy.StrictButton(
+                        _('Change Password'),
+                        css_class='btn-primary',
+                        type='submit',
+                        data_bind="enable: passwordSufficient(), click: submitCheck"
+                    ),
                 ),
                 css_class='check-password',
             )
@@ -306,10 +307,12 @@ def __init__(self, *args, user_domains=None, max_allowed_expiration_days=None, t
                 crispy.Field('ip_allowlist'),
                 crispy.Field('expiration_date', css_class='date-picker'),
             ),
-            StrictButton(
-                format_html('<i class="fa fa-plus"></i> {}', _("Generate New API Key")),
-                css_class='btn btn-primary',
-                type='submit'
+            hqcrispy.FormActions(
+                StrictButton(
+                    format_html('<i class="fa fa-plus"></i> {}', _("Generate New API Key")),
+                    css_class='btn btn-primary',
+                    type='submit'
+                )
             )
         )
 
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/basic_form.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/basic_form.html
index b8141230cc9d..3adca1f544b0 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/basic_form.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/basic_form.html
@@ -4,15 +4,10 @@
   <fieldset>
     <legend>Basic Information</legend>
     <div class="row mb-3">
-      <!-- Generally, it is best practice to use the {% css_label_class %}
-           template tag below instead of the col-* classes -->
-      <label for="id_first_name"
-             class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+      <label for="id_first_name" class="field-label">
         First Name
       </label>
-      <!-- Generally, it is best practice to use the {% css_field_class %}
-           template tag below instead of the col-* classes -->
-      <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+      <div class="field-control">
         <input type="text"
                name="first_name"
                class="form-control"
@@ -21,11 +16,10 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="id_favorite_color"
-             class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+      <label for="id_favorite_color" class="field-label">
         Favorite Color
       </label>
-      <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+      <div class="field-control">
         <select name="favorite_color"
                 class="form-select hqwebapp-select2"
                 id="id_favorite_color">
@@ -36,11 +30,10 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="id_hopes"
-             class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+      <label for="id_hopes" class="field-label">
         Hopes and Dreams
       </label>
-      <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+      <div class="field-control">
         <textarea name="hopes"
                   class="form-control vertical-resize"
                   id="id_hopes"></textarea>
@@ -48,9 +41,7 @@
     </div>
   </fieldset>
   <div class="form-actions row">
-    <!-- Generally, it is best practice to use the {% css_action_class %}
-         template tag below instead of offset-* and col-* -->
-    <div class="offset-xs-12 offset-sm-4 offset-md-4 offset-lg-3 col-xs-12 col-sm-8 col-md-8 col-lg-9">
+    <div class="field-control">
       <button class="btn btn btn-primary" type="submit">Save</button>
       <a href="#" class="btn btn-outline-primary">Cancel</a>
     </div>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/checkbox_horizontal_form.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/checkbox_horizontal_form.html
index 7b7d95eb7344..a8c27c522f49 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/checkbox_horizontal_form.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/checkbox_horizontal_form.html
@@ -1,17 +1,17 @@
 <form>
   <div class="mb-3 row">
-    <label for="height-input" class="col-sm-3 col-form-label">
+    <label for="height-input" class="field-label">
       Height (cm)
     </label>
-    <div class="col-sm-9">
+    <div class="field-control">
       <input type="text" id="height-input" name="height" class="form-control" />
     </div>
   </div>
   <div class="mb-3 row">
-    <label class="col-sm-3 col-form-label">
+    <label class="field-label">
       Smoking status
     </label>
-    <div class="col-sm-9">
+    <div class="field-control">
       <div class="form-check">
         <input class="form-check-input"
                type="checkbox"
@@ -26,10 +26,10 @@
     </div>
   </div>
   <div class="mb-3 row">
-    <label for="heartRate-input" class="col-sm-3 col-form-label">
+    <label for="heartRate-input" class="field-label">
       Heart Rate (bpm)
     </label>
-    <div class="col-sm-9">
+    <div class="field-control">
       <input type="text" id="heartRate-input" name="heartRate" class="form-control" />
     </div>
   </div>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/disabled_fields.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/disabled_fields.html
index ebe5a899bb3e..f453ea0ba52a 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/disabled_fields.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/disabled_fields.html
@@ -3,11 +3,10 @@
     Examples of Disabled Fields
   </legend>
   <div class="row mb-3">
-    <label for="id_first_name_dis"
-           class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+    <label for="id_first_name_dis" class="field-label">
       First Name
     </label>
-    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+    <div class="field-control">
       <input type="text"
              name="first_name_dis"
              value="Jon"
@@ -19,11 +18,10 @@
     </div>
   </div>
   <div class="row mb-3">
-    <label for="id_favorite_color_dis"
-           class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+    <label for="id_favorite_color_dis" class="field-label">
       Favorite Color
     </label>
-    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+    <div class="field-control">
       <select name="favorite_color_dis"
               class="form-select hqwebapp-select2"
               id="id_favorite_color_dis"
@@ -36,11 +34,10 @@
     </div>
   </div>
   <div class="row mb-3">
-    <label for="id_hopes_dis"
-           class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+    <label for="id_hopes_dis" class="field-label">
       Hopes and Dreams
     </label>
-    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+    <div class="field-control">
       <textarea name="hopes_dis"
                 class="form-control vertical-resize"
                 id="id_hopes_dis"
@@ -54,11 +51,10 @@
     Examples of Readonly Fields
   </legend>
   <div class="row mb-3">
-    <label for="id_first_name_ro"
-           class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+    <label for="id_first_name_ro" class="field-label">
       First Name
     </label>
-    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+    <div class="field-control">
       <input type="text"
              name="first_name_ro"
              value="Jon"
@@ -70,11 +66,10 @@
     </div>
   </div>
   <div class="row mb-3">
-    <label for="id_hopes_ro"
-           class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+    <label for="id_hopes_ro" class="field-label">
       Hopes and Dreams
     </label>
-    <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+    <div class="field-control">
       <textarea name="hopes_ro"
                 id="id_hopes_ro"
                 class="form-control-plaintext"
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_invalid.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_invalid.html
index 287bad8b1ebe..c17f6c600f84 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_invalid.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_invalid.html
@@ -1,9 +1,8 @@
 <div class="row mb-3">
-  <label for="id_first_name"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_first_name" class="field-label">
     Full Name
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
 
     <!-- this is how an invalid input is marked with the is-invalid class -->
     <input class="form-control is-invalid"
@@ -23,11 +22,10 @@
   </div>
 </div>
 <div class="row mb-3">
-  <label for="id_favorite_color"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_favorite_color" class="field-label">
     Favorite Color
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
     <select name="favorite_color"
             class="form-select hqwebapp-select2 is-invalid"
             id="id_favorite_color">
@@ -41,11 +39,10 @@
   </div>
 </div>
 <div class="row mb-3">
-  <label for="id_hopes"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_hopes" class="field-label">
     Hopes and Dreams
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
     <textarea name="hopes"
               class="form-control vertical-resize is-invalid"
               id="id_hopes"></textarea>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_valid.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_valid.html
index 3110e9d9b7c6..4d8030c4d83e 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_valid.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/form_valid.html
@@ -1,9 +1,8 @@
 <div class="row mb-3">
-  <label for="id_first_name"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_first_name" class="field-label">
     Full Name
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
 
     <!-- this is how a valid input is marked with the is-valid class -->
     <input class="form-control is-valid"
@@ -22,11 +21,10 @@
   </div>
 </div>
 <div class="row mb-3">
-  <label for="id_favorite_color"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_favorite_color" class="field-label">
     Favorite Color
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
     <select name="favorite_color"
             class="form-select hqwebapp-select2 is-valid"
             id="id_favorite_color">
@@ -40,11 +38,10 @@
   </div>
 </div>
 <div class="row mb-3">
-  <label for="id_hopes"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_hopes" class="field-label">
     Hopes and Dreams
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
     <textarea name="hopes"
               class="form-control vertical-resize is-valid"
               id="id_hopes">Traveling to the stars...</textarea>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/placeholder_help_text.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/placeholder_help_text.html
index f5ceb293d9c3..77b81fba0d4f 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/placeholder_help_text.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/placeholder_help_text.html
@@ -1,9 +1,8 @@
 <div class="row mb-3">
-  <label for="id_email"
-         class="col-form-label col-xs-12 col-sm-4 col-md-4 col-lg-3">
+  <label for="id_email" class="field-label">
     Email
   </label>
-  <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
+  <div class="field-control">
     <!-- note the placeholder attribute has a suggested value filled in that will disappear when you type -->
     <input placeholder="name@example.com"
            type="email"
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/forms.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/forms.html
index 604b659a84b0..43d6336dc849 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/forms.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/organisms/forms.html
@@ -60,9 +60,16 @@ <h2 id="overview">Overview</h2>
     Different parts of HQ use these two approaches, and you should always consider existing context
     when deciding whether to use Crispy Forms or HTML.
   </p>
+  <p>
+    Form layouts are responsive. On wide screens, labels are arranged in a column to the left and input fields are
+    arranged in a wider column to the right. In Bootstrap 5 this is referred to as
+    <a href="https://getbootstrap.com/docs/5.0/forms/layout/#horizontal-form">horizontal form</a> layout. On
+    narrow screens such as mobile devices, the layout automatically collapses to a single column with each label
+    above its corresponding input control.
+  </p>
   <p>
     The benefit of Crispy Forms, and why you should opt for using it over bespoke HTML whenever possible,
-    is that the HTML for each form component is controlled by templates. From HTML is often affected
+    is that the HTML for each form component is controlled by templates. Form HTML is often affected
     during a front-end migration (like Bootstrap). If a bespoke HTML form was used, that HTML needs
     to be re-examined everywhere.
     However, for forms using Crispy Forms, the relevant HTML only has to be changed once in the templates,
diff --git a/corehq/apps/users/forms.py b/corehq/apps/users/forms.py
index dad316a36dd2..dd6e96039dfd 100644
--- a/corehq/apps/users/forms.py
+++ b/corehq/apps/users/forms.py
@@ -34,7 +34,7 @@
     EnterprisePermissions,
 )
 from corehq.apps.hqwebapp import crispy as hqcrispy
-from corehq.apps.hqwebapp.crispy import HQModalFormHelper
+from corehq.apps.hqwebapp.crispy import HQFormHelper, HQModalFormHelper
 from corehq.apps.hqwebapp.utils.translation import format_html_lazy
 from corehq.apps.hqwebapp.widgets import BootstrapSwitchInput, Select2Ajax, SelectToggle
 from corehq.apps.locations.models import SQLLocation
@@ -356,7 +356,7 @@ def __init__(self, *args, **kwargs):
 
         self.fields['language'].label = gettext_lazy("My Language")
 
-        self.new_helper = FormHelper()
+        self.new_helper = HQFormHelper()
         self.new_helper.form_method = 'POST'
         self.new_helper.attrs = {
             'name': 'user_information',
@@ -393,10 +393,12 @@ def __init__(self, *args, **kwargs):
                 gettext_lazy("Basic"),
                 *basic_fields
             ),
-            twbscrispy.StrictButton(
-                gettext_lazy("Update My Information"),
-                type='submit',
-                css_class='btn-primary',
+            hqcrispy.FormActions(
+                twbscrispy.StrictButton(
+                    gettext_lazy("Update My Information"),
+                    type='submit',
+                    css_class='btn-primary',
+                )
             )
         )
 
@@ -961,14 +963,15 @@ def __init__(self, group_api_url, *args, **kwargs):
         super(GroupMembershipForm, self).__init__(*args, **kwargs)
         self.fields['selected_ids'].widget.set_url(group_api_url)
 
-        self.helper = FormHelper()
-        self.helper.label_class = 'form-label'
+        self.helper = HQFormHelper()
         self.helper.form_tag = False
 
         self.helper.layout = crispy.Layout(
             crispy.Field('selected_ids'),
-            crispy.ButtonHolder(
-                Submit('submit', _('Update'))
+            hqcrispy.FormActions(
+                crispy.ButtonHolder(
+                    Submit('submit', _('Update'))
+                )
             )
         )
 
@@ -1412,18 +1415,19 @@ class AddPhoneNumberForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super(AddPhoneNumberForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_class = 'form'
+        self.helper = HQFormHelper()
         self.helper.layout = crispy.Layout(
             Fieldset(
                 _('Add a Phone Number'),
                 'form_type',
                 twbscrispy.PrependedText('phone_number', '+', type='tel', pattern=r'\d+')
             ),
-            StrictButton(
-                _('Add Number'),
-                css_class='btn-primary disable-on-submit',
-                type='submit',
+            hqcrispy.FormActions(
+                StrictButton(
+                    _('Add Number'),
+                    css_class='btn-primary disable-on-submit',
+                    type='submit',
+                )
             )
         )
         self.fields['phone_number'].label = gettext_lazy('Phone number')
diff --git a/corehq/motech/dhis2/forms.py b/corehq/motech/dhis2/forms.py
index 2377b2233c4f..49942dd05300 100644
--- a/corehq/motech/dhis2/forms.py
+++ b/corehq/motech/dhis2/forms.py
@@ -132,18 +132,20 @@ def __init__(self, domain, *args, **kwargs):
                 crispy.Field('complete_date_option'),
                 crispy.Field('complete_date_column'),
             ),
-            twbscrispy.StrictButton(
-                _("Save"),
-                type="submit",
-                css_class="btn btn-primary",
-            ),
-            hqcrispy.LinkButton(
-                _("Cancel"),
-                reverse(
-                    DataSetMapListView.urlname,
-                    kwargs={'domain': self.domain},
+            hqcrispy.FormActions(
+                twbscrispy.StrictButton(
+                    _("Save"),
+                    type="submit",
+                    css_class="btn btn-primary",
+                ),
+                hqcrispy.LinkButton(
+                    _("Cancel"),
+                    reverse(
+                        DataSetMapListView.urlname,
+                        kwargs={'domain': self.domain},
+                    ),
+                    css_class="btn btn-outline-primary",
                 ),
-                css_class="btn btn-outline-primary",
             ),
         )
 
diff --git a/corehq/motech/fhir/forms.py b/corehq/motech/fhir/forms.py
index 8e9e8ead16ec..5c424c043b99 100644
--- a/corehq/motech/fhir/forms.py
+++ b/corehq/motech/fhir/forms.py
@@ -1,9 +1,6 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from crispy_forms import bootstrap as twbscrispy
-
-from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.motech.repeaters.forms import GenericRepeaterForm
 
 from .const import FHIR_VERSION_4_0_1, FHIR_VERSIONS
@@ -16,28 +13,22 @@ class FHIRRepeaterForm(GenericRepeaterForm):
         initial=FHIR_VERSION_4_0_1,
     )
     patient_registration_enabled = forms.BooleanField(
-        label="",
+        label=_('Enable patient registration'),
         initial=True,
         required=False,
         help_text=_("Register new patients on the remote FHIR service?"),
-        widget=BootstrapCheckboxInput(
-            inline_label=_('Enable patient registration'),
-        ),
     )
     patient_search_enabled = forms.BooleanField(
-        label="",
+        label=_("Enable patient search"),
         initial=False,
         required=False,
         help_text=_('Search the remote FHIR service for matching patients?'),
-        widget=BootstrapCheckboxInput(
-            inline_label=_("Enable patient search"),
-        ),
     )
 
     def get_ordered_crispy_form_fields(self):
         fields = super().get_ordered_crispy_form_fields()
         return fields + [
             'fhir_version',
-            twbscrispy.PrependedText('patient_registration_enabled', ''),
-            twbscrispy.PrependedText('patient_search_enabled', ''),
+            'patient_registration_enabled',
+            'patient_search_enabled',
         ]
diff --git a/corehq/motech/forms.py b/corehq/motech/forms.py
index 30e92b2773aa..655f5130cb43 100644
--- a/corehq/motech/forms.py
+++ b/corehq/motech/forms.py
@@ -10,7 +10,6 @@
 from crispy_forms import layout as crispy
 
 from corehq.apps.hqwebapp import crispy as hqcrispy
-from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.motech.const import (
     AUTH_PRESETS,
     AUTH_TYPES,
@@ -70,12 +69,9 @@ class ConnectionSettingsForm(forms.ModelForm):
         required=False,
     )
     skip_cert_verify = forms.BooleanField(
-        label="",
+        label=_('Skip certificate verification'),
         help_text=_('Do not use in a production environment'),
         required=False,
-        widget=BootstrapCheckboxInput(
-            inline_label=_('Skip certificate verification'),
-        ),
     )
     notify_addresses_str = forms.CharField(
         label=_('Addresses to send notifications'),
@@ -144,7 +140,6 @@ def helper(self):
         from corehq.motech.views import ConnectionSettingsListView
 
         helper = hqcrispy.HQFormHelper()
-        helper.form_class = "form-horizontal"
         helper.layout = crispy.Layout(
             crispy.Field('name'),
             crispy.Field('notify_addresses_str'),
@@ -167,20 +162,21 @@ def helper(self):
                 id="div_id_oauth_settings",
             ),
             crispy.Field('skip_cert_verify'),
-            self.test_connection_button,
-
-            twbscrispy.StrictButton(
-                _("Save"),
-                type="submit",
-                css_class="btn btn-primary",
-            ),
-            hqcrispy.LinkButton(
-                _("Cancel"),
-                reverse(
-                    ConnectionSettingsListView.urlname,
-                    kwargs={'domain': self.domain},
+            hqcrispy.FormActions(
+                self.test_connection_button,
+                twbscrispy.StrictButton(
+                    _("Save"),
+                    type="submit",
+                    css_class="btn btn-primary",
+                ),
+                hqcrispy.LinkButton(
+                    _("Cancel"),
+                    reverse(
+                        ConnectionSettingsListView.urlname,
+                        kwargs={'domain': self.domain},
+                    ),
+                    css_class="btn btn-outline-primary",
                 ),
-                css_class="btn btn-outline-primary",
             ),
         )
 
diff --git a/corehq/motech/repeaters/forms.py b/corehq/motech/repeaters/forms.py
index 88c3b45e7135..0efb597fc850 100644
--- a/corehq/motech/repeaters/forms.py
+++ b/corehq/motech/repeaters/forms.py
@@ -72,17 +72,18 @@ def set_extra_django_form_fields(self):
 
     def _initialize_crispy_layout(self):
         self.helper = hqcrispy.HQFormHelper(self)
-        self.helper.form_class = 'form-horizontal'
 
         self.helper.layout = crispy.Layout(
             crispy.Fieldset(
                 'Forwarding Settings',
                 *self.get_ordered_crispy_form_fields()
             ),
-            twbscrispy.StrictButton(
-                self.submit_btn_text,
-                type="submit",
-                css_class='btn-primary',
+            hqcrispy.FormActions(
+                twbscrispy.StrictButton(
+                    self.submit_btn_text,
+                    type="submit",
+                    css_class='btn-primary',
+                )
             )
         )