diff --git a/css/80_app.css b/css/80_app.css
index 1292234f0..ef585e645 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3506,33 +3506,50 @@ img.tile-removing {
     float: left;
     height: 12px;
     min-width: 12px;
-    font-size:12px;
+    font-size: 12px;
     line-height: 12px;
-    border-radius:24px;
-    padding:5px;
-    background:#7092ff;
-    color:#fff;
+    border-radius: 24px;
+    padding: 5px;
+    background: #7092ff;
+    color: #fff;
 }
 
+.mode-save .field-warning {
+    background: #ffb;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.mode-save .field-warning:empty {
+    display: none;
+}
+
+.mode-save .field-warning,
+.mode-save .changeset-info,
 .mode-save .request-review,
 .mode-save .commit-info {
     margin-bottom: 10px;
 }
 
 .mode-save .changeset-list {
-    border:1px solid #ccc;
+    border: 1px solid #ccc;
     border-radius: 4px;
-    background:#fff;
+    background: #fff;
+}
+
+.mode-save .warning-section {
+    background: #ffb;
 }
 
 .mode-save .warning-section .changeset-list button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
 }
 
 .mode-save .changeset-list li {
     position: relative;
-    border-top:1px solid #ccc;
-    padding:5px 10px;
+    border-top: 1px solid #ccc;
+    padding: 5px 10px;
     cursor: pointer;
 }
 
@@ -3545,8 +3562,8 @@ img.tile-removing {
 }
 
 .changeset-list li span.count {
-    font-size:10px;
-    color:#555;
+    font-size: 10px;
+    color: #555;
 }
 
 .mode-save .commit-section .changeset-list button {
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 37e745e2a..71e8ef0a9 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -110,8 +110,8 @@ export function uiCommit(context) {
                 );
         });
 
-        var clippyArea = fieldSection.append('div')
-            .attr('class', 'clippy-area');
+        var commentWarning = fieldSection.append('div')
+            .attr('class', 'field-warning comment-warning');
 
         var changeSetInfo = fieldSection.append('div')
             .attr('class', 'changeset-info');
@@ -144,7 +144,6 @@ export function uiCommit(context) {
             .append('div')
             .attr('class', 'modal-section warning-section fillL2')
             .style('display', function(d) { return _.isEmpty(d) ? 'none' : null; })
-            .style('background', '#ffb')
             .merge(warnings);
 
         warnings
@@ -350,7 +349,7 @@ export function uiCommit(context) {
                 .attr('disabled', (comment.length ? null : true));
 
             // Warn if comment mentions Google..
-            var googleWarning = clippyArea
+            var googleWarning = commentWarning
                .html('')
                .selectAll('a')
                .data(comment.match(/google/i) ? [true] : []);