diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 204b8cdd696e7ba74d71c877cb950efa3197cc5d..f265a6254dda828bce6d54dd8b444514021bb1b2 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -8,7 +8,7 @@
 
 = form_for [:admin, @broadcast_message] do |f|
   -if @broadcast_message.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       - @broadcast_message.errors.full_messages.each do |msg|
         %p= msg
   .form-group
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index 8183454c7634698455ace6161d40b75c95074b9c..e68c97e2c596793118ba43501cd783167269ab6b 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %span= @group.errors.full_messages.first
   .form-group.group_name_holder
     = f.label :name do
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 301e9a61cbf472c707c89714c9d0af3787b9c993..644879c65e4cb5b2588266980e5757f78c126122 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -2,7 +2,7 @@
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %span= @group.errors.full_messages.first
   .form-group
     = f.label :name do
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 0192cd0eb829c3667a38c34de6b318fde152cb46..560e6182439a933d944381342378bbefb4b0f346 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -10,7 +10,7 @@
 
 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
   -if @hook.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       - @hook.errors.full_messages.each do |msg|
         %p= msg
   .form-group
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index fc9b2d250a532d4283081d1006460266906dd5bc..a9fb62c9b96c3df751e699dc5c11b6f37d225e4e 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -2,7 +2,7 @@
   = form_for [:admin, @user] do |f|
     -if @user.errors.any?
       #error_explanation
-        %ul.unstyled.alert.alert-error
+        %ul.unstyled.alert.alert-danger
           - @user.errors.full_messages.each do |msg|
             %li= msg
 
@@ -62,7 +62,7 @@
             .col-sm-10= f.check_box :admin
         .col-md-4
           - unless @user.new_record?
-            .alert.alert-error
+            .alert.alert-danger
               - if @user.blocked?
                 %p This user is blocked and is not able to login to GitLab
                 = link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 71c12a18783d151bed7aafa1dbfc16ad231c64d2..bd276f22221ba1d7b93d1882a58c340d59111f2c 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -100,7 +100,7 @@
             %li Owned groups will be left
           = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
 
-      .alert.alert-error
+      .alert.alert-danger
         %h4
           Remove user
         %br
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 550c060da1f0293c3f065ecafadc03a76eabb8b1..c5ae284ef7ee165b94fb24e187b2295224c2e198 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -22,7 +22,7 @@
           %div.form-holder
             = form_for @group do |f|
               - if @group.errors.any?
-                .alert.alert-error
+                .alert.alert-danger
                   %span= @group.errors.full_messages.first
               .form-group
                 = f.label :name do
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 7086630f51576a374fd6c8cc5db5f08cbc6f7df4..0147cc7e9e1f43787a0a67be9e973c323f719188 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -1,6 +1,6 @@
 = form_for @group do |f|
   - if @group.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %span= @group.errors.full_messages.first
   .form-group
     = f.label :name do
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index 54d64057922f5b7b167c2c257ee33a8c769002e4..f905417f0e2bf905705b939f19fe3235decc51a6 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -1,7 +1,7 @@
 %div
   = form_for [:profile, @key], html: { class: 'form-horizontal' } do |f|
     - if @key.errors.any?
-      .alert.alert-error
+      .alert.alert-danger
         %ul
           - @key.errors.full_messages.each do |msg|
             %li= msg
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 72f6521d92b3933cf0f084ee24157445adc72b79..fd3d0ac09d4bee22e02228097c48992c467e0153 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -10,7 +10,7 @@
         %br
         After a successful password update you will be redirected to login page where you should login with your new password
       -if @user.errors.any?
-        .alert.alert-error
+        .alert.alert-danger
           %ul
             - @user.errors.full_messages.each do |msg|
               %li= msg
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index fc2c85df9b97cea14b3d477d82e4a2c68f775940..f333879cf6ce88da69bba3a5fd9d0aa9e4e4cf82 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -5,7 +5,7 @@
       %br
       After successful password update you will be redirected to login screen
     -if @user.errors.any?
-      .alert.alert-error
+      .alert.alert-danger
         %ul
           - @user.errors.full_messages.each do |msg|
             %li= msg
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index a97e748da652cab45902a60ff86e2378b0e2e3d5..73d90fe9f450c53db58ae41402c3f70e5fb46213 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -10,7 +10,7 @@
 
 = form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit_user form-horizontal" }, authenticity_token: true do |f|
   -if @user.errors.any?
-    %div.alert.alert-error
+    %div.alert.alert-danger
       %ul
         - @user.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/projects/_errors.html.haml b/app/views/projects/_errors.html.haml
index bb9759353a3a36c09f4064f93fd4e716f34bde7f..7c8bb33ed7edc4f3d868742ec68f1a16005d3aab 100644
--- a/app/views/projects/_errors.html.haml
+++ b/app/views/projects/_errors.html.haml
@@ -1,4 +1,4 @@
 - if @project.errors.any?
-  .alert.alert-error
+  .alert.alert-danger
     %button{ type: "button", class: "close", "data-dismiss" => "alert"} ×
     = @project.errors.full_messages.first
diff --git a/app/views/projects/commit/huge_commit.html.haml b/app/views/projects/commit/huge_commit.html.haml
index 210d8d9e2073aafc5e3d7d78aa077bc5789f4f28..398ce77142695dc1097e79c8de9f5f62be95c6df 100644
--- a/app/views/projects/commit/huge_commit.html.haml
+++ b/app/views/projects/commit/huge_commit.html.haml
@@ -1,3 +1,3 @@
 = render "projects/commit/commit_box"
-.alert.alert-error
+.alert.alert-danger
   %h4 Commit diffs are too big to be displayed
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 5ee4aae54eb1caabc6d6ab1d61bda8b55b5c7db4..3507c3c1cdb52696c7eafd30a307bcdad4afbc6c 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -1,7 +1,7 @@
 %div
   = form_for [@project, @key], url: project_deploy_keys_path do |f|
     -if @key.errors.any?
-      .alert.alert-error
+      .alert.alert-danger
         %ul
           - @key.errors.full_messages.each do |msg|
             %li= msg
diff --git a/app/views/projects/fork.html.haml b/app/views/projects/fork.html.haml
index 227fde8a735286fb221d9dd26f02da445edff842..bdd75de447a97ac0ccbd8e14ef6ac8c04dae32dd 100644
--- a/app/views/projects/fork.html.haml
+++ b/app/views/projects/fork.html.haml
@@ -1,4 +1,4 @@
-.alert.alert-error.alert-block
+.alert.alert-danger.alert-block
   %h4
     %i.icon-code-fork
     Fork Error!
diff --git a/app/views/projects/graphs/show.js.haml b/app/views/projects/graphs/show.js.haml
index 43e776e5330dd2ad19d12977ede75e0e7cca891a..dcf6cacdcebf520b019b7a6f6b3cb4d3c79440c2 100644
--- a/app/views/projects/graphs/show.js.haml
+++ b/app/views/projects/graphs/show.js.haml
@@ -16,4 +16,4 @@
     })
 - else
   :plain
-    $('.stat-graph').replaceWith('<div class="alert alert-error">Failed to load graph</div>')
+    $('.stat-graph').replaceWith('<div class="alert alert-danger">Failed to load graph</div>')
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 5c9705b9427aadf501082dd76daffe32363c7509..dac6a698bdc56dc47ee0089643ac473a4e6d83b1 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -9,7 +9,7 @@
 
 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f|
   -if @hook.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       - @hook.errors.full_messages.each do |msg|
         %p= msg
   .form-group
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index c51dbf820e7b7cf3f8d148efdb4e48b48e411b5b..b22f77775c991bc32e1d1e6721c03cdc363c61ee 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -2,7 +2,7 @@
   %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
   = form_for [@project, @issue] do |f|
     -if @issue.errors.any?
-      .alert.alert-error
+      .alert.alert-danger
         - @issue.errors.full_messages.each do |msg|
           %span= msg
           %br
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 098596ff845aa0818417c80217e6638c99bc9f9e..4ca319e5eb2c1f621bcb3f6ce1ba064602ccb2d1 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,6 +1,6 @@
 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
   -if @merge_request.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %ul
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index 16e9fee42a22ecd79d56c8d6d81644b7575d7cf3..b9c466657de4f01fe66edf0f9f530e8664dfc9db 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -2,7 +2,7 @@
   = render "projects/merge_requests/show/mr_title"
   = render "projects/merge_requests/show/mr_box"
 
-  .alert.alert-error
+  .alert.alert-danger
     %p
       We cannot render this merge request properly because
       - if @merge_request.for_fork? && !@merge_request.source_project
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index bd29de895d5e6c4098f1427a377181f5af3df95e..5a6b6a5ff90a436c9030bc768c06195e000e0733 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -25,7 +25,7 @@
 
 
   .automerge_widget.no_satellite{style: "display:none"}
-    .alert.alert-error
+    .alert.alert-danger
       %span
         %strong This repository does not have satellite. Ask an administrator to fix this issue
 
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index fa41db99cd7ba40171b491d1a4ebde085fb20d81..b4f648ab197fdc75f4c79dcc6c73a2370bbeb00c 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -21,7 +21,7 @@
           = markdown @merge_request.description
 
   - if @merge_request.closed?
-    .description.alert-error
+    .description.alert-danger
       %span
         %i.icon-remove
         Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml
index 9b15c4526e943ef49abc54b66daf37ae34877aed..f18fe8c80c4b2afd97bc3bd779b4ae175bd0f3b8 100644
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
@@ -8,7 +8,7 @@
 
 
   .ci_widget.ci-failed{style: "display:none"}
-    .alert.alert-error
+    .alert.alert-danger
       %i.icon-remove
       %strong CI build failed
       for #{@merge_request.last_commit_short_sha}.
@@ -29,7 +29,7 @@
         Checking for CI status for #{@merge_request.last_commit_short_sha}
 
   .ci_widget.ci-error{style: "display:none"}
-    .alert.alert-error
+    .alert.alert-danger
       %i.icon-remove
       %strong Cannot connect to CI server. Please check your setting
 
diff --git a/app/views/projects/merge_requests/show/_no_accept.html.haml b/app/views/projects/merge_requests/show/_no_accept.html.haml
index a0507b24ad8224cb8960dc9657510f1947a73332..203e2612de476750cfd59c3adfc6a0fd02641f94 100644
--- a/app/views/projects/merge_requests/show/_no_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_no_accept.html.haml
@@ -1,4 +1,4 @@
-.alert.alert-error
+.alert.alert-danger
   %p
     This merge request can not be accepted because branch
     - unless @merge_request.source_branch_exists?
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index a3dc9d8c9cb147879de555332ae97268714f9cd2..10e43a58508cb9fe3405e70b230823ffcf61d8da 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -7,7 +7,7 @@
 
 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"}  do |f|
   -if @milestone.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %ul
         - @milestone.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 4ecd682113d29a20310db3e50603d11d97e86825..3533d4d23bc3b609fba5e94df9c27e4f955df1f6 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -14,7 +14,7 @@
     - if can? current_user, :admin_project, @project
       = form_for [@project, @protected_branch] do |f|
         -if @protected_branch.errors.any?
-          .alert.alert-error
+          .alert.alert-danger
             %ul
               - @protected_branch.errors.full_messages.each do |msg|
                 %li= msg
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 5f5a1bb9b673c50db0c450836ccd7d06c61c5433..a6f87c93169d02d4684e4f780b87d157502b12c4 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -12,7 +12,7 @@
 
 = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f|
   - if @service.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %ul
         - @service.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
index b37bee98f3fb364f1ad392dce6a4d1906a859973..4b79cab86566c48054ee5d943d82df27f24ca6b6 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/projects/snippets/_form.html.haml
@@ -4,7 +4,7 @@
 .snippet-form-holder
   = form_for [@project, @snippet], as: :project_snippet, url: url do |f|
     -if @snippet.errors.any?
-      .alert.alert-error
+      .alert.alert-danger
         %ul
           - @snippet.errors.full_messages.each do |msg|
             %li= msg
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index f7f609e54521a3f17d8f4322d08edae37a693f61..6673d44eb1ad4feac812ec4dd8f0f29037558e9b 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -3,7 +3,7 @@
 
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
-    .alert.alert-error
+    .alert.alert-danger
       %ul
         - @user_project_relation.errors.full_messages.each do |msg|
           %li= msg
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 1bed2bdc90eb4a2a068d9e9b0f455d47e663f8be..210277f436da70f4cc6cb47d3905577f56e71c84 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -4,7 +4,7 @@
 .snippet-form-holder
   = form_for @snippet, as: :personal_snippet, url: url do |f|
     -if @snippet.errors.any?
-      .alert.alert-error
+      .alert.alert-danger
         %ul
           - @snippet.errors.full_messages.each do |msg|
             %li= msg