diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index b711d861125..b3a1bb4d93a 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -8,18 +8,18 @@
           %br
     .ui-box.ui-box-show
       .ui-box-head
-        .clearfix
+        .control-group
           = f.label :title do
             %strong= "Subject *"
-          .input
+          .controls
             = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
       .ui-box-body
-        .clearfix
+        .control-group
           .issue_assignee.pull-left
             = f.label :assignee_id do
               %i.icon-user
               Assign to
-            .input
+            .controls
               .pull-left
                 = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
               .pull-right
@@ -29,20 +29,20 @@
             = f.label :milestone_id do
               %i.icon-time
               Milestone
-            .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+            .controls= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
 
       .ui-box-bottom
-        .clearfix
+        .control-group
           = f.label :label_list do
             %i.icon-tag
             Labels
-          .input
+          .controls
             = f.text_field :label_list, maxlength: 2000, class: "xxlarge"
             %p.hint Separate labels with commas.
 
-        .clearfix
+        .control-group
           = f.label :description, "Details"
-          .input
+          .controls
             = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14
             %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
 
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 86c442142bf..5eabb4b32c3 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -31,21 +31,21 @@
     %i.icon-paper-clip
     Details
   .merge-request-form-info
-    .clearfix
+    .control-group
       = f.label :title do
         %strong= "Title *"
-      .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
-    .clearfix
+      .controls= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
+    .control-group
       .left
         = f.label :assignee_id do
           %i.icon-user
           Assign to
-        .input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
+        .controls= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
       .left
         = f.label :milestone_id do
           %i.icon-time
           Milestone
-        .input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+        .controls= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
 
 
   .form-actions