diff --git a/Gemfile.lock b/Gemfile.lock
index 3283da40f8d0e8ee26c1e79b88e27a21fed76888..a9784f36ac9251f3c384cee06bbd8bdd87772f2e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,6 +47,9 @@ GEM
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     attr_required (1.0.0)
+    autoprefixer-rails (5.1.6)
+      execjs
+      json
     awesome_print (1.2.0)
     axiom-types (0.0.5)
       descendants_tracker (~> 0.0.1)
@@ -57,8 +60,9 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.0.3.0)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.3)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     browser (0.7.2)
     builder (3.2.2)
     cal-heatmap-rails (0.0.1)
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 81cd6d745b67833225272f6dab58d86381b56753..a3eabb5e330f0a645e5c685599b65849187bf044 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -24,6 +24,7 @@
 
     .accept-control {
       display: inline-block;
+      margin: 0;
       margin-left: 20px;
       padding: 10px 0;
       line-height: 20px;
@@ -31,6 +32,7 @@
 
       .remove_source_checkbox {
         margin: 0;
+        font-weight: bold;
       }
     }
   }
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 36a4a2fb4af464c91bf8dc25b7a548f833e835c9..70121c84b4d3ffb66f875d2e96d5be5894c7db08 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -13,15 +13,13 @@
         .form-group
           %strong Activity
           .checkbox
-            = label_tag :with_push, 'Not empty'
-            = check_box_tag :with_push, 1, params[:with_push]
-            &nbsp;
-            %span.light Projects with push events
+            = label_tag :with_push do
+              = check_box_tag :with_push, 1, params[:with_push]
+              %span Projects with push events
           .checkbox
-            = label_tag :abandoned, 'Abandoned'
-            = check_box_tag :abandoned, 1, params[:abandoned]
-            &nbsp;
-            %span.light No activity over 6 month
+            = label_tag :abandoned do
+              = check_box_tag :abandoned, 1, params[:abandoned]
+              %span No activity over 6 month
 
         %fieldset
           %strong Visibility level:
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml
index ab9085f0ba729f41f4736f87be62a10cd9735e81..54a397267714112be0444d0726685a0648b352bc 100644
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@@ -2,11 +2,11 @@
   = f.text_field :login, class: "form-control top", placeholder: "Username or Email", autofocus: "autofocus"
   = f.password_field :password, class: "form-control bottom", placeholder: "Password"
   - if devise_mapping.rememberable?
-    .remember-me
-      %label.checkbox.remember_me{for: "user_remember_me"}
+    .remember-me.checkbox
+      %label{for: "user_remember_me"}
         = f.check_box :remember_me
         %span Remember me
-        .pull-right
-          = link_to "Forgot your password?", new_password_path(resource_name)
+      .pull-right
+        = link_to "Forgot your password?", new_password_path(resource_name)
   %div
     = f.submit "Sign in", class: "btn btn-save"
diff --git a/app/views/projects/_visibility_level.html.haml b/app/views/projects/_visibility_level.html.haml
index 5f34e66b3edd9678741e7d8eac65ee31b5565f4d..42c8e685224c022894f724ce9140d50d6be4273e 100644
--- a/app/views/projects/_visibility_level.html.haml
+++ b/app/views/projects/_visibility_level.html.haml
@@ -7,8 +7,8 @@
       - Gitlab::VisibilityLevel.values.each do |level|
         .radio
           - restricted = restricted_visibility_levels.include?(level)
-          = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
           = label :project_visibility_level, level do
+            = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
             = visibility_level_icon(level)
             .option-title
               = visibility_level_label(level)
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index f8ee69736370b1d57e37cc369ee8f7ddc4be366e..d58d20a9442ddba179695807549f08b671f42d3e 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -17,7 +17,7 @@
           .accept-action
             = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
           - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
-            .accept-control
+            .accept-control.checkbox
               = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
                 = check_box_tag :should_remove_source_branch
                 Remove source-branch