diff --git a/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png b/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png
index 2708b7e0f3..75cd60ca8e 100644
Binary files a/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png and b/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png differ
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index ddf8de1f11..5f4c2b7a3e 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -107,7 +107,8 @@ is also a link to the commit in the Git web browser.
 
 image::images/user-review-ui-change-screen-commit-info.png[width=800, link="images/user-review-ui-change-screen-commit-info.png"]
 
-For merge commits the parent commits are also shown.
+If a merge commit is viewed this is highlighted by an icon. In this
+case the parent commits are also shown.
 
 image::images/user-review-ui-change-screen-commit-info-merge-commit.png[width=800, link="images/user-review-ui-change-screen-commit-info-merge-commit.png"]
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
index 3319457450..19d50ff5e3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
@@ -69,4 +69,7 @@ public interface GerritResources extends ClientBundle {
 
   @Source("warning.png")
   public ImageResource warning();
+
+  @Source("important.png")
+  public ImageResource important();
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
index 938b23b1f4..4ba579336e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
@@ -41,6 +41,7 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.VerticalPanel;
@@ -59,6 +60,7 @@ class CommitBox extends Composite {
   }
 
   @UiField Style style;
+  @UiField Image mergeCommit;
   @UiField CopyableLabel commitName;
   @UiField AnchorElement browserLink;
   @UiField Element parents;
@@ -120,6 +122,7 @@ class CommitBox extends Composite {
     }
 
     if (revInfo.commit().parents().length() > 1) {
+      mergeCommit.setVisible(true);
       setParents(change.project(), revInfo.commit().parents());
     }
   }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
index 195ad5dfaf..34454f02c3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
@@ -19,6 +19,7 @@ limitations under the License.
     xmlns:g='urn:import:com.google.gwt.user.client.ui'
     xmlns:x='urn:import:com.google.gerrit.client.ui'
     xmlns:clippy='urn:import:com.google.gwtexpui.clippy.client'>
+  <ui:with field='ico' type='com.google.gerrit.client.GerritResources'/>
   <ui:image field="toggle" src="more_less.png"/>
   <ui:style type='com.google.gerrit.client.change.CommitBox.Style'>
     @eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor;
@@ -83,6 +84,11 @@ limitations under the License.
     .parentWebLink {
       margin-left:16px;
     }
+
+    .mergeCommit {
+      margin-right: 3px;
+      float: left;
+    }
   </ui:style>
   <g:HTMLPanel>
     <g:ScrollPanel styleName='{style.scroll}' ui:field='scroll'>
@@ -116,7 +122,18 @@ limitations under the License.
         <td ui:field='committerDate' class='{style.date}' colspan="2"/>
       </tr>
       <tr>
-        <th><ui:msg>Commit</ui:msg></th>
+        <th>
+          <div class='{style.mergeCommit}'>
+            <ui:msg>Commit</ui:msg>
+          </div>
+          <g:Image
+              ui:field='mergeCommit'
+              resource='{ico.important}'
+              visible='false'
+              title='Merge Commit'>
+            <ui:attribute name='title'/>
+          </g:Image>
+        </th>
         <td><clippy:CopyableLabel styleName='{style.clippy}' ui:field='commitName'/></td>
         <td><a style="margin-left:16px;" ui:field='browserLink' href=""/></td>
       </tr>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png
new file mode 100644
index 0000000000..81e9ed29a5
Binary files /dev/null and b/gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png differ