diff --git a/app/Http/ViewComposers/Wizard.php b/app/Http/ViewComposers/Wizard.php
index 61e06051d..5c2ba6a7f 100644
--- a/app/Http/ViewComposers/Wizard.php
+++ b/app/Http/ViewComposers/Wizard.php
@@ -64,7 +64,7 @@ class Wizard
                 'logo' => trans('settings.company.logo'),
                 'skip' => trans('general.skip'),
                 'save' => trans('general.save'),
-                'country' => trans_choice('addresses.countries', 1),
+                'country' => trans_choice('general.countries', 1),
             ],
 
             'currencies' => [
diff --git a/resources/lang/en-GB/addresses.php b/resources/lang/en-GB/addresses.php
deleted file mode 100644
index f1af9d89d..000000000
--- a/resources/lang/en-GB/addresses.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'countries' => 'Country|Countries',
-    'cities'    => 'Town/City|Towns/Cities',
-    'state'     => 'Province/State',
-    'zip_code' => 'Postal/Zip code',
-];
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 6696852f6..83f8e286e 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -52,6 +52,8 @@ return [
     'sales'                 => 'Sale|Sales',
     'purchases'             => 'Purchase|Purchases',
     'notifications'         => 'Notification|Notifications',
+    'countries'             => 'Country|Countries',
+    'cities'                => 'Town/City|Towns/Cities',
 
     'welcome'               => 'Welcome',
     'banking'               => 'Banking',
@@ -164,6 +166,8 @@ return [
     'amount_due'            => 'Amount due',
     'financial_year'        => 'Financial Year',
     'created'               => 'Created',
+    'state'                 => 'Province/State',
+    'zip_code'              => 'Postal/Zip code',
 
     'card' => [
         'cards'                 => 'Card|Cards',
diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php
index 1f7324bc6..63f1ceab5 100644
--- a/resources/views/common/companies/create.blade.php
+++ b/resources/views/common/companies/create.blade.php
@@ -31,13 +31,13 @@
 
                     {{ Form::textareaGroup('address', trans('general.address')) }}
 
-                    {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', [], setting('company.city')) }}
+                    {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', [], setting('company.city')) }}
 
-                    {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}
+                    {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}
 
-                    {{ Form::textGroup('state', trans('addresses.state'), 'city', [], setting('company.state')) }}
+                    {{ Form::textGroup('state', trans('general.state'), 'city', [], setting('company.state')) }}
 
-                    {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
+                    {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
                     {{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file']) }}
 
diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php
index 072b191a7..7802aa0af 100644
--- a/resources/views/common/companies/edit.blade.php
+++ b/resources/views/common/companies/edit.blade.php
@@ -32,13 +32,13 @@
 
                     {{ Form::textareaGroup('address', trans('general.address')) }}
 
-                    {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
+                    {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
 
-                    {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
+                    {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}
 
-                    {{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
+                    {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                    {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $company->country, []) }}
+                    {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $company->country, []) }}
 
                     {{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file'], $company->company_logo) }}
 
diff --git a/resources/views/modals/companies/edit.blade.php b/resources/views/modals/companies/edit.blade.php
index e3dfd8a0d..f0fb949a6 100644
--- a/resources/views/modals/companies/edit.blade.php
+++ b/resources/views/modals/companies/edit.blade.php
@@ -20,7 +20,7 @@
 
         {{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }}
 
-        {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
         {!! Form::hidden('_prefix', 'company') !!}
     </div>
diff --git a/resources/views/modals/customers/create.blade.php b/resources/views/modals/customers/create.blade.php
index 4afa30f30..7599a812c 100644
--- a/resources/views/modals/customers/create.blade.php
+++ b/resources/views/modals/customers/create.blade.php
@@ -18,7 +18,7 @@
 
         {{ Form::textareaGroup('address', trans('general.address')) }}
 
-        {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
 
         {{ Form::hidden('type', 'customer') }}
         {!! Form::hidden('enabled', '1', []) !!}
diff --git a/resources/views/modals/customers/edit.blade.php b/resources/views/modals/customers/edit.blade.php
index 21ab150bf..278b2c2dd 100644
--- a/resources/views/modals/customers/edit.blade.php
+++ b/resources/views/modals/customers/edit.blade.php
@@ -21,7 +21,7 @@
 
         {{ Form::textareaGroup('address', trans('general.address'), null, $customer->address) }}
 
-        {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}
 
         {{ Form::hidden('type', 'customer') }}
         {!! Form::hidden('enabled', '1', []) !!}
diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index a9618b898..e5de81f10 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -18,7 +18,7 @@
 
         {{ Form::textareaGroup('address', trans('general.address')) }}
 
-        {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
 
         {{ Form::hidden('type', 'vendor') }}
         {!! Form::hidden('enabled', '1', []) !!}
diff --git a/resources/views/modals/vendors/edit.blade.php b/resources/views/modals/vendors/edit.blade.php
index a4fab2ad6..e7a873d59 100644
--- a/resources/views/modals/vendors/edit.blade.php
+++ b/resources/views/modals/vendors/edit.blade.php
@@ -21,7 +21,7 @@
 
         {{ Form::textareaGroup('address', trans('general.address'), null, $vendor->address) }}
 
-        {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}
 
         {{ Form::hidden('type', 'vendor') }}
         {!! Form::hidden('enabled', '1', []) !!}
diff --git a/resources/views/purchases/vendors/create.blade.php b/resources/views/purchases/vendors/create.blade.php
index b95e01c8f..3f6d1148e 100644
--- a/resources/views/purchases/vendors/create.blade.php
+++ b/resources/views/purchases/vendors/create.blade.php
@@ -31,13 +31,13 @@
 
                     {{ Form::textareaGroup('address', trans('general.address')) }}
 
-                    {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
+                    {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
 
-                    {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
+                    {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}
 
-                    {{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
+                    {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                    {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+                    {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
 
                     {{ Form::fileGroup('logo', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}
 
diff --git a/resources/views/purchases/vendors/edit.blade.php b/resources/views/purchases/vendors/edit.blade.php
index ef76fd7a3..6cf0e3c17 100644
--- a/resources/views/purchases/vendors/edit.blade.php
+++ b/resources/views/purchases/vendors/edit.blade.php
@@ -32,13 +32,13 @@
 
                     {{ Form::textareaGroup('address', trans('general.address')) }}
 
-                    {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
+                    {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
 
-                    {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
+                    {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}
 
-                    {{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
+                    {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                    {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}
+                    {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }}
 
                     {{ Form::fileGroup('logo', trans_choice('general.logos', 1), '', ['dropzone-class' => 'form-file']) }}
 
diff --git a/resources/views/sales/customers/create.blade.php b/resources/views/sales/customers/create.blade.php
index 603aa9e93..67ef63b07 100644
--- a/resources/views/sales/customers/create.blade.php
+++ b/resources/views/sales/customers/create.blade.php
@@ -32,13 +32,13 @@
 
                 {{ Form::textareaGroup('address', trans('general.address')) }}
 
-                {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
+                {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
 
-                {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
+                {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}
 
-                {{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
+                {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
 
                 {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
diff --git a/resources/views/sales/customers/edit.blade.php b/resources/views/sales/customers/edit.blade.php
index ca292ee64..6d04bc534 100644
--- a/resources/views/sales/customers/edit.blade.php
+++ b/resources/views/sales/customers/edit.blade.php
@@ -31,13 +31,13 @@
 
                 {{ Form::textareaGroup('address', trans('general.address')) }}
 
-                {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', []) }}
+                {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
 
-                {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', []) }}
+                {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', []) }}
 
-                {{ Form::textGroup('state', trans('addresses.state'), 'city', []) }}
+                {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}
+                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }}
 
                 {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
diff --git a/resources/views/settings/company/edit.blade.php b/resources/views/settings/company/edit.blade.php
index 0ce9493b2..9b2859d44 100644
--- a/resources/views/settings/company/edit.blade.php
+++ b/resources/views/settings/company/edit.blade.php
@@ -28,13 +28,13 @@
 
                 {{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }}
 
-                {{ Form::textGroup('city', trans_choice('addresses.cities', 1), 'city', [], setting('company.city')) }}
+                {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', [], setting('company.city')) }}
 
-                {{ Form::textGroup('zip_code', trans('addresses.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}
+                {{ Form::textGroup('zip_code', trans('general.zip_code'), 'mail-bulk', [], setting('company.zip_code')) }}
 
-                {{ Form::textGroup('state', trans('addresses.state'), 'city', [], setting('company.state')) }}
+                {{ Form::textGroup('state', trans('general.state'), 'city', [], setting('company.state')) }}
 
-                {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
+                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
                 {{ Form::fileGroup('logo', trans('settings.company.logo'), 'file-image-o', [], setting('company.logo')) }}
             </div>
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index b217d62c9..8fe845fed 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -32,7 +32,7 @@
 
                 {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale'), []) }}
 
-                {{ Form::selectGroup('country', trans_choice('addresses.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
 
                 {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], setting('default.list_limit'), []) }}