diff --git a/openstack_dashboard/dashboards/admin/floating_ips/forms.py b/openstack_dashboard/dashboards/admin/floating_ips/forms.py
index 42ad353574..6dd7db25f3 100644
--- a/openstack_dashboard/dashboards/admin/floating_ips/forms.py
+++ b/openstack_dashboard/dashboards/admin/floating_ips/forms.py
@@ -24,8 +24,8 @@ from openstack_dashboard import api
 
 
 class AdminFloatingIpAllocate(forms.SelfHandlingForm):
-    pool = forms.ChoiceField(label=_("Pool"))
-    tenant = forms.ChoiceField(label=_("Project"))
+    pool = forms.ThemableChoiceField(label=_("Pool"))
+    tenant = forms.ThemableChoiceField(label=_("Project"))
     floating_ip_address = forms.IPField(
         label=_("Floating IP Address (optional)"),
         required=False,
diff --git a/openstack_dashboard/dashboards/project/networks/ports/workflows.py b/openstack_dashboard/dashboards/project/networks/ports/workflows.py
index 4966b922e9..9d47e2c269 100644
--- a/openstack_dashboard/dashboards/project/networks/ports/workflows.py
+++ b/openstack_dashboard/dashboards/project/networks/ports/workflows.py
@@ -55,10 +55,11 @@ class UpdatePortInfoAction(workflows.Action):
                             vnic_type for vnic_type in api.neutron.VNIC_TYPES
                             if vnic_type[0] in supported_vnic_types
                         ]
-                    self.fields['binding__vnic_type'] = forms.ChoiceField(
-                        choices=vnic_type_choices,
-                        label=_("Binding: VNIC Type"),
-                        required=False)
+                    self.fields['binding__vnic_type'] = (
+                        forms.ThemableChoiceField(
+                            choices=vnic_type_choices,
+                            label=_("Binding: VNIC Type"),
+                            required=False))
         except Exception:
             msg = _("Unable to verify the VNIC types extension in Neutron")
             exceptions.handle(self.request, msg)
diff --git a/openstack_dashboard/dashboards/project/routers/forms.py b/openstack_dashboard/dashboards/project/routers/forms.py
index c83438855b..e95d9d8f96 100644
--- a/openstack_dashboard/dashboards/project/routers/forms.py
+++ b/openstack_dashboard/dashboards/project/routers/forms.py
@@ -42,8 +42,8 @@ class CreateForm(forms.SelfHandlingForm):
     enable_snat = forms.BooleanField(label=_("Enable SNAT"),
                                      initial=True,
                                      required=False)
-    mode = forms.ChoiceField(label=_("Router Type"))
-    ha = forms.ChoiceField(label=_("High Availability Mode"))
+    mode = forms.ThemableChoiceField(label=_("Router Type"))
+    ha = forms.ThemableChoiceField(label=_("High Availability Mode"))
     az_hints = forms.MultipleChoiceField(
         label=_("Availability Zone Hints"),
         required=False,