diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8c76b4baa22d01e11f03e2e0faad4af25c6b9593..1551af2d6973cdd503ea5fd08f84390a0edfb524 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -311,14 +311,17 @@ li.note {
   }
 }
 
-.error_message {
-  @extend .cred;
-  border-left: 4px solid #E99;
+.error-message {
   padding: 10px;
-  margin-bottom: 10px;
-  background: #FEE;
+  background: #C67;
   padding-left: 20px;
+  margin: 0;
+  color: #FFF;
 
+  a {
+    color: #fff;
+    text-decoration: underline;
+  }
   &.centered {
     text-align: center;
   }
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index b4e4c3fd8b65d254b175029e384f3246986782ee..0c75ddb8bc835f307f1a11dc187eaa46d16e0c70 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -99,7 +99,7 @@
     margin-bottom: 5px;
     .avatar {
       width: 18px;
-      margin-top: 3px;
+      margin: 2px 4px;
     }
   }
 
@@ -118,7 +118,12 @@
       }
       &.commits-stat {
         display: block;
-        margin-top: 5px;
+        padding: 3px;
+        margin-top: 3px;
+
+        &:hover {
+          background: none;
+        }
       }
     }
   }
diff --git a/app/views/projects/notes/_form_errors.html.haml b/app/views/projects/notes/_form_errors.html.haml
index 0851536f0da7b294f534e35f3263eabbde168afe..0b68bf243f058fea0dded49389a94c97ea91e002 100644
--- a/app/views/projects/notes/_form_errors.html.haml
+++ b/app/views/projects/notes/_form_errors.html.haml
@@ -1,3 +1,3 @@
-.error_message.js-errors
+.error-message.js-errors
   - note.errors.full_messages.each do |msg|
     %div= msg
diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml
index f8c2ea1eed314c4af074165c58b406ccbe536d0b..82bf00aa2804311cb9ea0d8f83a566ffbed66524 100644
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
@@ -1,3 +1,3 @@
 - if current_user.require_ssh_key?
-  %p.error_message.centered
+  %p.error-message.centered
     You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile