diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less
--- a/rhodecode/public/css/buttons.less
+++ b/rhodecode/public/css/buttons.less
@@ -225,6 +225,7 @@ input[type="button"] {
     }
 }
 
+
 .btn-approved-status {
     .border ( @border-thickness, @alert1 );
     background-color: white;
@@ -429,6 +430,31 @@ input[type="button"] {
     }
 }
 
+input[type="submit"].btn-draft {
+    .border ( @border-thickness, @rcblue );
+    background-color: white;
+    color: @rcblue;
+
+    a {
+        color: @rcblue;
+    }
+
+    &:hover,
+    &.active {
+        .border ( @border-thickness, @rcdarkblue );
+        background-color: white;
+        color: @rcdarkblue;
+
+        a {
+            color: @rcdarkblue;
+        }
+    }
+
+    &:disabled {
+        background-color: white;
+        color: @rcblue;
+    }
+}
 
 input[type="submit"].btn-warning {
     &:extend(.btn-warning);
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -510,9 +510,9 @@
             % if form_type == 'inline':
                 % if c.rhodecode_edition_id == 'EE':
                     ## Disable the button for CE, the "real" validation is in the backend code anyway
-                    <input class="btn btn-warning comment-button-input submit-draft-action" id="save_draft_${lineno_id}" name="save_draft" type="submit" value="${_('Add draft')}" data-is-draft=true onclick="$(this).addClass('submitter')">
+                    <input class="btn btn-draft comment-button-input submit-draft-action" id="save_draft_${lineno_id}" name="save_draft" type="submit" value="${_('Add draft')}" data-is-draft=true onclick="$(this).addClass('submitter')">
                 % else:
-                    <input class="btn btn-warning comment-button-input submit-draft-action disabled" disabled="disabled" type="submit"  value="${_('Add draft')}" onclick="return false;" title="Draft comments only available in EE edition of RhodeCode">
+                    <input class="btn btn-draft comment-button-input submit-draft-action disabled" disabled="disabled" type="submit"  value="${_('Add draft')}" onclick="return false;" title="Draft comments only available in EE edition of RhodeCode">
                 % endif
             % endif
 
@@ -534,9 +534,9 @@
             % if form_type == 'inline':
                 <input type="hidden" name="f_path" value="{0}">
                 <input type="hidden" name="line" value="${lineno_id}">
-                <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
-                <i class="icon-cancel-circled2"></i>
-                </button>
+                <span class="cursor-pointer action_button cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
+                ${_('dismiss')}
+                </span>
             % endif
         </div>