4 files changed, 16 insertions, 15 deletions
diff --git a/app/views/projects/environments/_form.html.haml b/app/views/projects/environments/_form.html.haml
index 0586dbdf0e2..f942b936037 100644
--- a/app/views/projects/environments/_form.html.haml
+++ b/app/views/projects/environments/_form.html.haml
@@ -18,5 +18,5 @@
       = f.url_field :external_url, class: 'form-control'
 
     .form-actions
-      = f.submit 'Save', class: 'btn btn-save'
+      = f.submit 'Save', class: 'btn btn-success'
       = link_to 'Cancel', project_environments_path(@project), class: 'btn btn-cancel'
diff --git a/app/views/projects/environments/empty.html.haml b/app/views/projects/environments/empty.html.haml
index 1413930ebdb..129dbbf4e56 100644
--- a/app/views/projects/environments/empty.html.haml
+++ b/app/views/projects/environments/empty.html.haml
@@ -1,14 +1,14 @@
 - page_title _("Metrics")
 
-.row
+.row.empty-state
   .col-sm-12
     .svg-content
       = image_tag 'illustrations/operations_metrics_empty.svg'
-.row.empty-environments
-  .col-sm-12.text-center
-    %h4
-      = s_('Metrics|No deployed environments')
-    .state-description
-      = s_('Metrics|Check out the CI/CD documentation on deploying to an environment')
-    .prepend-top-10
-      = link_to s_("Metrics|Learn about environments"), help_page_path('ci/environments'), class: 'btn btn-success'
+  .col-12
+    .text-content
+      %h4.text-center
+        = s_('Metrics|No deployed environments')
+      %p.state-description
+        = s_('Metrics|Check out the CI/CD documentation on deploying to an environment')
+      .text-center
+        = link_to s_("Metrics|Learn about environments"), help_page_path('ci/environments'), class: 'btn btn-success'
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index c7890b37381..8c5b6e089ea 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -49,15 +49,16 @@
 
   .environments-container
     - if @deployments.blank?
-      .blank-state-row
-        .blank-state-center
-          %h2.blank-state-title
+      .empty-state
+        .text-content
+          %h4.state-title
             You don't have any deployments right now.
           %p.blank-state-text
             Define environments in the deploy stage(s) in
             %code .gitlab-ci.yml
             to track deployments here.
-          = link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success"
+          .text-center
+            = link_to _("Read more"), help_page_path("ci/environments"), class: "btn btn-success"
     - else
       .table-holder
         .ci-table.environments{ role: 'grid' }
diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml
index 5b680189bc8..e40d631a1a1 100644
--- a/app/views/projects/environments/terminal.html.haml
+++ b/app/views/projects/environments/terminal.html.haml
@@ -2,7 +2,7 @@
 - page_title "Terminal for environment", @environment.name
 
 - content_for :page_specific_javascripts do
-  = stylesheet_link_tag "xterm/xterm"
+  = stylesheet_link_tag "xterm.css"
 
 %div{ class: container_class }
   .top-area