diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html
index 600f72e7a1..f8380ed255 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html
@@ -92,30 +92,24 @@
                 </div>
                 <div class="form-group" data-ng-show="!application.bearerOnly">
                     <label class="col-sm-2 control-label" for="newWebOrigin">Web Origin</label>
-                    <div class="col-sm-6">
-                        <div ng-repeat="webOrigin in application.webOrigins" class="row kc-item-deletable">
-                                <div class="col-sm-8">
-                                    <input class="form-control kc-button-control"
-                                           type="text" data-ng-class="{'input-below':!$first}"
-                                           name="webOrigin" id="webOrigin"
-                                           data-ng-model="webOrigin" readonly/>
-                                </div>
-                                <div class="col-sm-2">
-                                    <button class="btn btn-danger"
-                                            type="button" data-ng-click="deleteWebOrigin($index)">Delete</button>
-                                </div>
+                    <div class="col-sm-4 multiple" ng-repeat="webOrigin in application.webOrigins">
+                        <div class="input-group kc-item-deletable">
+                            <input class="form-control" type="text" data-ng-class="{'input-below':!$first}"
+                                   name="webOrigin" id="webOrigin" data-ng-model="webOrigin" readonly />
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type="button" data-ng-click="deleteWebOrigin($index)">
+                                    Delete</button>
+                            </span>
                         </div>
-                        <div class="row">
-                            <div class="col-sm-8">
-                                <input class="form-control kc-button-control"
-                                       type="text" name="newWebOrigin" id="newWebOrigin"
-                                       placeholder="New Web Origin..." data-ng-model="newWebOrigin"
-                                       data-ng-class="{'input-below':application.webOrigins.length}"/>
-                            </div>
-                            <div class="col-sm-2">
-                                <button class="btn btn-primary"
-                                        data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
-                            </div>
+                    </div>
+                    <div class="col-sm-4 multiple">
+                        <div class="input-group">
+                            <input class="form-control" type="text" name="newWebOrigin" id="newWebOrigin"
+                                   placeholder="New Web Origin..." data-ng-model="newWebOrigin"
+                                   data-ng-class="{'input-below':application.webOrigins.length}" />
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
+                            </span>
                         </div>
                     </div>
                 </div>
diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html
index e5ea613e8a..f1ed7f81ae 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html
@@ -77,26 +77,24 @@
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 control-label" for="newWebOrigin">Web Origin</label>
-                    <div class="col-sm-6">
-                        <div ng-repeat="webOrigin in oauth.webOrigins" class="kc-item-deletable row">
-                            <div class="col-sm-8">
-                                <input  class="form-control" type="text" data-ng-class="{'input-below':!$first}"
-                                        name="webOrigin" id="webOrigin" data-ng-model="webOrigin" readonly />
-                            </div>
-                            <div class="col-sm-2">
-                                <button class="btn btn-danger" type="button" data-ng-click="deleteWebOrigin($index)">
+                    <div class="col-sm-4 multiple" ng-repeat="webOrigin in oauth.webOrigins">
+                        <div class="input-group kc-item-deletable">
+                            <input class="form-control" type="text" data-ng-class="{'input-below':!$first}"
+                                   name="webOrigin" id="webOrigin" data-ng-model="webOrigin" readonly />
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type="button" data-ng-click="deleteWebOrigin($index)">
                                     Delete</button>
-                            </div>
+                            </span>
                         </div>
-                        <div class="row">
-                            <div class="col-sm-8">
-                                <input  class="form-control" type="text" name="newWebOrigin" id="newWebOrigin"
-                                        placeholder="New Web Origin..." data-ng-model="newWebOrigin"
-                                        data-ng-class="{'input-below':oauth.webOrigins.length}" />
-                            </div>
-                            <div class="col-sm-2">
-                                <button  class="btn btn-primary" data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
-                            </div>
+                    </div>
+                    <div class="col-sm-4 multiple">
+                        <div class="input-group">
+                            <input class="form-control" type="text" name="newWebOrigin" id="newWebOrigin"
+                                   placeholder="New Web Origin..." data-ng-model="newWebOrigin"
+                                   data-ng-class="{'input-below':oauth.webOrigins.length}" />
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" data-ng-click="addWebOrigin()" ng-show="newWebOrigin.length > 0">Add</button>
+                            </span>
                         </div>
                     </div>
                 </div>