diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml
index f1dced326..a9c2b1c4b 100644
--- a/app/views/admin/settings/index.haml
+++ b/app/views/admin/settings/index.haml
@@ -38,7 +38,28 @@
 
   .panel.panel-default
     .panel-heading.clearfix
-      = t(:billing)
+      = t(:billing_settings)
+    .table-responsive
+      %table.table.table-hover.table-bordered.table-condensed
+        %thead
+          %tr
+            %th{class: 'col-xs-6'}= t(:setting)
+            %th{class: 'col-xs-6'}= t(:value)
+        %tbody
+          = render 'setting_row', var: :invoice_number_min
+          = render 'setting_row', var: :invoice_number_max
+          = render 'setting_row', var: :days_to_keep_overdue_invoices_active
+          = render 'setting_row', var: :registry_billing_email
+          = render 'setting_row', var: :registry_invoice_contact
+          = render 'setting_row', var: :registry_vat_no
+          = render 'setting_row', var: :registry_vat_prc
+          = render 'setting_row', var: :registry_bank
+          = render 'setting_row', var: :registry_iban
+          = render 'setting_row', var: :registry_swift
+
+  .panel.panel-default
+    .panel-heading.clearfix
+      = t(:registry_settings)
     .table-responsive
       %table.table.table-hover.table-bordered.table-condensed
         %thead
@@ -49,24 +70,13 @@
           = render 'setting_row', var: :registry_juridical_name
           = render 'setting_row', var: :registry_reg_no
           = render 'setting_row', var: :registry_email
-          = render 'setting_row', var: :registry_billing_email
           = render 'setting_row', var: :registry_phone
-          = render 'setting_row', var: :registry_country_code
-          = render 'setting_row', var: :registry_state
+          = render 'setting_row', var: :registry_url
           = render 'setting_row', var: :registry_street
           = render 'setting_row', var: :registry_city
+          = render 'setting_row', var: :registry_state
           = render 'setting_row', var: :registry_zip
-          = render 'setting_row', var: :registry_vat_no
-          = render 'setting_row', var: :registry_url
-          = render 'setting_row', var: :registry_vat_prc
-          = render 'setting_row', var: :registry_iban
-          = render 'setting_row', var: :registry_bank
-          = render 'setting_row', var: :registry_swift
-          = render 'setting_row', var: :registry_invoice_contact
-
-          = render 'setting_row', var: :invoice_number_min
-          = render 'setting_row', var: :invoice_number_max
-          = render 'setting_row', var: :days_to_keep_overdue_invoices_active
+          = render 'setting_row', var: :registry_country_code
 
   .panel.panel-default
     .panel-heading.clearfix
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56d5bceba..97103b089 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -833,3 +833,22 @@ en:
   create_bank_transaction: 'Create bank transaction'
   create_new_invoice: 'Create new invoice'
   ip_is_not_whitelisted: 'IP is not whitelisted'
+  billing_settings: 'Billing settings'
+  registry_settings: 'Registry settings'
+  registry_billing_email: 'Billing e-mail'
+  registry_invoice_contact: 'Invoice contact'
+  registry_vat_no: 'VAT no.'
+  registry_vat_prc: 'VAT prc.'
+  registry_bank: 'Bank'
+  registry_iban: 'IBAN'
+  registry_swift: 'SWIFT'
+  registry_juridical_name: 'Juridical name'
+  registry_reg_no: 'Reg no.'
+  registry_email: 'E-mail'
+  registry_phone: 'Phone'
+  registry_url: 'URL'
+  registry_street: 'Street'
+  registry_city: 'City'
+  registry_state: 'State / Province'
+  registry_zip: 'Postcode'
+  registry_country_code: 'Country'