diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index f91a93ae35e..e604a8795db 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -35,5 +35,4 @@
           = f.check_box :user_default_external
           Newly registered users will by default be external
 
-  .form-actions
-    = f.submit 'Save changes', class: 'btn btn-success'
+  = f.submit 'Save changes', class: 'btn btn-success'
diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml
index 073c81ac9ed..f6c4ed9c078 100644
--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/app/views/admin/application_settings/_help_page.html.haml
@@ -16,5 +16,4 @@
     .col-sm-10
       = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block'
       %span.help-block#support_help_block Alternate support URL for help page
-  .form-actions
-    = f.submit 'Save changes', class: "btn btn-success"
+  = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml
index 24b44f76a1e..96aeb888082 100644
--- a/app/views/admin/application_settings/_pages.html.haml
+++ b/app/views/admin/application_settings/_pages.html.haml
@@ -16,5 +16,4 @@
         sites. Users are required to demonstrate they control a domain before
         it is enabled
         = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record')
-  .form-actions
-    = f.submit 'Save changes', class: "btn btn-success"
+  = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml
index 1da648cc348..e4e72a238ee 100644
--- a/app/views/admin/application_settings/_signin.html.haml
+++ b/app/views/admin/application_settings/_signin.html.haml
@@ -53,5 +53,4 @@
     .col-sm-10
       = f.text_area :sign_in_text, class: 'form-control', rows: 4
       .help-block Markdown enabled
-  .form-actions
-    = f.submit 'Save changes', class: "btn btn-success"
+  = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml
index 913b8c8ff1e..aa945ae1bd0 100644
--- a/app/views/admin/application_settings/_signup.html.haml
+++ b/app/views/admin/application_settings/_signup.html.haml
@@ -53,5 +53,4 @@
       = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
       .help-block Markdown enabled
 
-  .form-actions
-    = f.submit 'Save changes', class: "btn btn-success"
+  = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml
index edeb85a6364..5c8031e4ab8 100644
--- a/app/views/admin/application_settings/_visibility_and_access.html.haml
+++ b/app/views/admin/application_settings/_visibility_and_access.html.haml
@@ -60,5 +60,4 @@
       = f.label field_name, "#{type.upcase} SSH keys", class: 'control-label col-sm-2'
       .col-sm-10
         = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
-  .form-actions
-    = f.submit 'Save changes', class: "btn btn-success"
+  = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index f3c07f4b1b9..82d97f90248 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -6,66 +6,66 @@
 %section.settings.as-visibility-access.no-animate#js-visibility-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Visibility and access controls
+      = _('Visibility and access controls')
     %button.btn.js-settings-toggle
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Set default and restrict visibility levels. Configure import sources and git access protocol.
+      = _('Set default and restrict visibility levels. Configure import sources and git access protocol.')
   .settings-content
     = render 'visibility_and_access'
 
 %section.settings.as-account-limit.no-animate#js-account-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Account and limit settings
+      = _('Account and limit settings')
     %button.btn.js-settings-toggle
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Session expiration, projects limit and attachment size.
+      = _('Session expiration, projects limit and attachment size.')
   .settings-content
     = render 'account_and_limit'
 
 %section.settings.as-signup.no-animate#js-signup-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Sign-up restrictions
+      = _('Sign-up restrictions')
     %button.btn.js-settings-toggle
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Configure the way a user creates a new account.
+      = _('Configure the way a user creates a new account.')
   .settings-content
     = render 'signup'
 
 %section.settings.as-signin.no-animate#js-signin-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Sign-in restrictions
+      = _('Sign-in restrictions')
     %button.btn.js-settings-toggle
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Set requirements for a user to sign-in. Enable mandatory two-factor authentication.
+      = _('Set requirements for a user to sign-in. Enable mandatory two-factor authentication.')
   .settings-content
     = render 'signin'
 
 %section.settings.as-help-page.no-animate#js-help-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Help page
+      = _('Help page')
     %button.btn.js-settings-toggle
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Help page text and support page url.
+      = _('Help page text and support page url.')
   .settings-content
     = render 'help_page'
 
 %section.settings.as-pages.no-animate#js-pages-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Pages
+      = _('Pages')
     %button.btn.js-settings-toggle
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Size and domain settings for static websites
+      = _('Size and domain settings for static websites')
   .settings-content
     = render 'pages'