diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss
index 3cb64d69a9..c468980f64 100644
--- a/app/assets/stylesheets/generic/issue_box.scss
+++ b/app/assets/stylesheets/generic/issue_box.scss
@@ -56,23 +56,22 @@
 
   .state {
     border-bottom: 1px solid #DDD;
-    padding: 10px 25px;
+    padding: 10px 15px;
   }
 
   .title {
-    font-size: 26px;
+    font-size: 28px;
     font-weight: normal;
     line-height: 1.5;
     margin: 0;
     color: #333;
-    padding-bottom: 0;
-    padding: 15px 25px;
+    padding: 10px 15px;
   }
 
   .context {
     border: none;
     border-top: 1px solid #eee;
-    padding: 15px 25px;
+    padding: 10px 15px;
 
     // Reset text align for children
     .text-right > * { text-align: left; }
@@ -88,7 +87,7 @@
   }
 
   .description {
-    padding: 0 25px 15px 25px;
+    padding: 0 15px 10px 15px;
   }
 
   .title, .context, .description {
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 5bff00f376..debbec4cb9 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -118,3 +118,7 @@
 .merge-request-show-labels .label {
   padding: 6px 10px;
 }
+
+.mr-commits .commit {
+  padding: 10px 15px;
+}
diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml
index 425dcb45dd..d7987f43fb 100644
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -1,6 +1,6 @@
 = form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f|
   .row
-    .col-md-6
+    .col-sm-6
       %strong.append-right-10
         Assignee:
 
@@ -11,7 +11,7 @@
       - else
         None
 
-    .col-md-6.text-right
+    .col-sm-6.text-right
       %strong.append-right-10
         Milestone:
       - if can?(current_user, :modify_issue, @issue)
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index e62ab9d9d3..92a7bb927e 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -3,7 +3,7 @@
     .panel-heading
       %i.icon-list
       Commits (#{@commits.count})
-    .commits
+    .commits.mr-commits
       - if @commits.count > 8
         %ul.first-commits.well-list
           - @commits.first(8).each do |commit|
diff --git a/app/views/projects/merge_requests/show/_context.html.haml b/app/views/projects/merge_requests/show/_context.html.haml
index 5c6734fd24..ab00b34242 100644
--- a/app/views/projects/merge_requests/show/_context.html.haml
+++ b/app/views/projects/merge_requests/show/_context.html.haml
@@ -1,6 +1,6 @@
 = form_for [@project, @merge_request], remote: true, html: {class: 'edit-merge_request inline-update'} do |f|
   .row
-    .col-md-6
+    .col-sm-6
       %strong.append-right-10
         Assignee:
 
@@ -11,7 +11,7 @@
       - else
         None
 
-    .col-md-6.text-right
+    .col-sm-6.text-right
       %strong.append-right-10
         Milestone:
       - if can?(current_user, :modify_merge_request, @merge_request)