diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 74ef819a7aa843e6530ac242ec049d913a137d76..f8d2673335a91cb92aa449fe8e5d0ee9ff3cb731 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -42,7 +42,7 @@
           %span.badge= @merge_request.mr_and_commit_notes.count
       %li.commits-tab{data: {action: 'commits'}}
         = link_to project_merge_request_path(@project, @merge_request), title: 'Commits' do
-          %i.fa.fa-database
+          %i.fa.fa-history
           Commits
           %span.badge= @commits.size
       %li.diffs-tab{data: {action: 'diffs'}}
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index a658740387114515ed851b1c51e5aa0622b04701..ac214e687b8462c8e581ca6a686e3bbcb9373ed2 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1,30 +1 @@
-- if @commits.present?
-  .panel.panel-default
-    .panel-heading
-      %i.fa.fa-list
-      Commits (#{@commits.count})
-    .commits.mr-commits
-      - if @commits.count > 8
-        %ul.first-commits.well-list
-          - @commits.first(8).each do |commit|
-            = render "projects/commits/commit", commit: commit, project: @merge_request.source_project
-          %li.bottom
-            8 of #{@commits.count} commits displayed.
-            %strong
-              %a.show-all-commits Click here to show all
-        - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
-          %ul.all-commits.hide.well-list
-            - @commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE).each do |commit|
-              = render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project
-            %li
-              other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden to prevent performance issues.
-        - else
-          %ul.all-commits.hide.well-list
-            - @commits.each do |commit|
-              = render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project
-
-      - else
-        %ul.well-list
-          - @commits.each do |commit|
-            = render "projects/commits/commit", commit: commit, project: @merge_request.source_project
-
+= render "projects/commits/commits"
\ No newline at end of file