diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html b/themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html
index 13855adfd7..29aa6888ff 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html
@@ -26,7 +26,7 @@
                 <kc-tooltip>{{:: 'mapper.name.tooltip' | translate}}</kc-tooltip>
             </div>
             <div class="form-group">
-                <label for="consentRequired" class="col-sm-2 control-label">{{:: 'consent-required' | translate}}</label>
+                <label for="consentRequired" class="col-md-2 control-label">{{:: 'consent-required' | translate}}</label>
                 <div class="col-md-6">
                     <input ng-model="model.mapper.consentRequired" name="consentRequired" id="consentRequired" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                 </div>
@@ -42,7 +42,7 @@
             </div>
             <div class="form-group" data-ng-show="model.create">
                 <label class="col-md-2 control-label" for="mapperTypeCreate">{{:: 'mapper-type' | translate}}</label>
-                <div class="col-sm-6">
+                <div class="col-md-6">
                     <div>
                         <select class="form-control" id="mapperTypeCreate"
                                 ng-model="model.mapperType"
diff --git a/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html b/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html
index e847c594fa..87acc2a8c1 100755
--- a/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html
+++ b/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html
@@ -2,31 +2,31 @@
     <div data-ng-repeat="option in properties" class="form-group" data-ng-controller="ProviderConfigCtrl">
         <label class="col-md-2 control-label">{{:: option.label | translate}}</label>
 
-        <div class="col-sm-6" data-ng-hide="option.type == 'boolean' || option.type == 'List' || option.type == 'Role' || option.type == 'ClientList' || option.type == 'Password'">
+        <div class="col-md-6" data-ng-hide="option.type == 'boolean' || option.type == 'List' || option.type == 'Role' || option.type == 'ClientList' || option.type == 'Password'">
             <input class="form-control" type="text" data-ng-model="config[ option.name ]" >
         </div>
-        <div class="col-sm-6" data-ng-show="option.type == 'Password'">
+        <div class="col-md-6" data-ng-show="option.type == 'Password'">
             <input class="form-control" type="password" data-ng-model="config[ option.name ]" >
         </div>
-        <div class="col-sm-6" data-ng-show="option.type == 'boolean'">
+        <div class="col-md-6" data-ng-show="option.type == 'boolean'">
             <input ng-model="config[ option.name ]" value="'true'" name="option.name" id="option.name" onoffswitchstring on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}"/>
         </div>
-        <div class="col-sm-6" data-ng-show="option.type == 'List'">
+        <div class="col-md-6" data-ng-show="option.type == 'List'">
             <select ng-model="config[ option.name ]" ng-options="data for data in option.defaultValue">
                 <option value="" selected> {{:: 'selectOne' | translate}} </option>
             </select>
         </div>
-        <div class="col-sm-6" data-ng-show="option.type == 'Role'">
+        <div class="col-md-6" data-ng-show="option.type == 'Role'">
             <div class="row">
-                <div class="col-sm-8">
+                <div class="col-md-8">
                     <input class="form-control" type="text" data-ng-model="config[ option.name ]" >
                 </div>
-                <div class="col-sm-2">
+                <div class="col-md-2">
                     <button type="submit" data-ng-click="openRoleSelector(option.name, config)" class="btn btn-default" tooltip-placement="top" tooltip-trigger="mouseover mouseout" tooltip="{{:: 'selectRole.tooltip' | translate}}">{{:: 'selectRole.label' | translate}}</button>
                 </div>
             </div>
         </div>
-        <div class="col-sm-4" data-ng-show="option.type == 'ClientList'">
+        <div class="col-md-4" data-ng-show="option.type == 'ClientList'">
             <select ng-model="config[ option.name ]" ng-options="client.clientId as client.clientId for client in clients">
                 <option value="" selected> {{:: 'selectOne' | translate}} </option>
             </select>