diff --git a/app/Http/routes.php b/app/Http/routes.php
index 738ef1e4aa42..202ca4329c28 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -357,7 +357,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('MAX_NUM_CLIENTS', 100);
     define('MAX_NUM_CLIENTS_PRO', 20000);
     define('MAX_NUM_CLIENTS_LEGACY', 500);
-    define('MAX_INVOICE_AMOUNT', 10000000);
+    define('MAX_INVOICE_AMOUNT', 1000000000);
     define('LEGACY_CUTOFF', 57800);
     define('ERROR_DELAY', 3);
 
diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php
index 415fcf95f79c..83ab9f35b9f3 100644
--- a/database/seeds/PaymentLibrariesSeeder.php
+++ b/database/seeds/PaymentLibrariesSeeder.php
@@ -117,6 +117,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['name' => 'Colombian Peso', 'code' => 'COP', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
             ['name' => 'West African Franc', 'code' => 'XOF', 'symbol' => 'CFA ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Chinese Renminbi', 'code' => 'CNY', 'symbol' => 'RMB ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['name' => 'Rwandan Franc', 'code' => 'RWF', 'symbol' => 'RF ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
         ];
 
         foreach ($currencies as $currency) {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index b09552781c1d..85cf5231296d 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -955,14 +955,26 @@ return array(
 
     'email_design' => 'Email Design',
     'due_by' => 'Due by :date',
-    'enable_email_markup' => 'Enable Email Markup',
+    'enable_email_markup' => 'Enable Markup',
     'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.',
     'template_help_title' => 'Templates Help',
     'template_help_1' => 'Available variables:',
-    'email_design_id' => 'Email Design',
+    'email_design_id' => 'Email Style',
     'email_design_help' => 'Make your emails look more professional with HTML layouts',
     'plain' => 'Plain',
     'light' => 'Light',
     'dark' => 'Dark',
 
+    'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.',
+    'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.',
+    'invoice_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the invoice number.',
+    'quote_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the quote number.',
+    'custom_client_fields_helps' => 'Adds a text input to the client create/edit page and displays the label and value on the PDF.',
+    'custom_account_fields_helps' => 'Adds the label and value to the company details section of the PDF.',
+    'custom_invoice_fields_helps' => 'Adds a text input to the invoice create/edit page and displays the label and value on the PDF.',
+    'custom_invoice_charges_helps' => 'Adds a text input to the invoice create/edit page and includes the charge in the invoice subtotals.',
+    'color_help' => 'Note: the primary color is also used in the client portal and custom email designs.',
+
+
+
 );
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index 5023c132ed8d..96036eee7955 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -58,8 +58,14 @@
                 </div>
                 @endif
 
-                {!! Former::select('size_id')->addOption('','')->fromQuery($sizes, 'name', 'id') !!}
-                {!! Former::select('industry_id')->addOption('','')->fromQuery($industries, 'name', 'id') !!}
+                {!! Former::select('size_id')
+                        ->addOption('','')
+                        ->fromQuery($sizes, 'name', 'id') !!}
+
+                {!! Former::select('industry_id')
+                        ->addOption('','')
+                        ->fromQuery($industries, 'name', 'id')
+                        ->help('texts.industry_help') !!}
 
             </div>
         </div>
diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php
index 23e72a26c456..a28d63f70247 100644
--- a/resources/views/accounts/invoice_design.blade.php
+++ b/resources/views/accounts/invoice_design.blade.php
@@ -119,7 +119,8 @@
                             ->step('1') !!}
 
                       {!! Former::text('primary_color') !!}
-                      {!! Former::text('secondary_color') !!}
+                      {!! Former::text('secondary_color')
+                                ->help('<br/>'.trans('texts.color_help')) !!}
 
                     </div>
                 </div>
diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php
index ab4ace817020..c0a6a02a1ad2 100644
--- a/resources/views/accounts/invoice_settings.blade.php
+++ b/resources/views/accounts/invoice_settings.blade.php
@@ -49,13 +49,15 @@
                         ->placeholder(trans('texts.www'))
                         ->onchange('onSubdomainChange()')
                         ->addGroupClass('subdomain')
-                        ->label(' ') !!}
+                        ->label(' ')
+                        ->help(trans('texts.subdomain_help')) !!}
 
             {!! Former::text('iframe_url')
                         ->placeholder('http://www.example.com/invoice')
                         ->appendIcon('question-sign')
                         ->addGroupClass('iframe_url')
-                        ->label(' ') !!}
+                        ->label(' ')
+                        ->help(trans('texts.subdomain_help')) !!}
         </div>
     </div>
 
@@ -91,7 +93,8 @@
                                 ->label(' ')
                                 ->addGroupClass('number-pattern') !!}
                         {!! Former::text('invoice_number_counter')
-                                ->label(trans('texts.counter')) !!}
+                                ->label(trans('texts.counter'))
+                                ->help(trans('texts.invoice_number_help')) !!}
 
                     </div>
                 </div>
@@ -117,7 +120,8 @@
                                 ->label(trans('texts.counter'))
                                 ->addGroupClass('pad-checkbox')
                                 ->append(Former::checkbox('share_counter')->raw()
-                                ->onclick('setQuoteNumberEnabled()') . ' ' . trans('texts.share_invoice_counter')) !!}
+                                ->onclick('setQuoteNumberEnabled()') . ' ' . trans('texts.share_invoice_counter'))
+                                ->help(trans('texts.quote_number_help')) !!}
 
 
                     </div>
@@ -145,27 +149,38 @@
                 <div role="tabpanel" class="tab-pane active" id="clientFields">
                     <div class="panel-body">
 
-                        {!! Former::text('custom_client_label1')->label(trans('texts.field_label')) !!}
-                        {!! Former::text('custom_client_label2')->label(trans('texts.field_label')) !!}
+                        {!! Former::text('custom_client_label1')
+                                ->label(trans('texts.field_label')) !!}
+                        {!! Former::text('custom_client_label2')
+                                ->label(trans('texts.field_label'))
+                                ->help(trans('texts.custom_client_fields_helps')) !!}
 
                     </div>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="companyFields">
                     <div class="panel-body">
 
-                        {!! Former::text('custom_label1')->label(trans('texts.field_label')) !!}
-                        {!! Former::text('custom_value1')->label(trans('texts.field_value')) !!}
+                        {!! Former::text('custom_label1')
+                                ->label(trans('texts.field_label')) !!}
+                        {!! Former::text('custom_value1')
+                                ->label(trans('texts.field_value')) !!}
                         <p>&nbsp;</p>
-                        {!! Former::text('custom_label2')->label(trans('texts.field_label')) !!}
-                        {!! Former::text('custom_value2')->label(trans('texts.field_value')) !!}
+                        {!! Former::text('custom_label2')
+                                ->label(trans('texts.field_label')) !!}
+                        {!! Former::text('custom_value2')
+                                ->label(trans('texts.field_value'))
+                                ->help(trans('texts.custom_account_fields_helps')) !!}
 
                     </div>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="invoiceFields">
                     <div class="panel-body">
 
-                        {!! Former::text('custom_invoice_text_label1')->label(trans('texts.field_label')) !!}
-                        {!! Former::text('custom_invoice_text_label2')->label(trans('texts.field_label')) !!}
+                        {!! Former::text('custom_invoice_text_label1')
+                                ->label(trans('texts.field_label')) !!}
+                        {!! Former::text('custom_invoice_text_label2')
+                                ->label(trans('texts.field_label'))
+                                ->help(trans('texts.custom_invoice_fields_helps')) !!}
 
                     </div>
                 </div>
@@ -181,7 +196,8 @@
                                 ->label(trans('texts.field_label'))
                                 ->addGroupClass('pad-checkbox')
                                 ->append(Former::checkbox('custom_invoice_taxes2')
-                                ->raw() . trans('texts.charge_taxes')) !!}
+                                ->raw() . trans('texts.charge_taxes'))
+                                ->help(trans('texts.custom_invoice_charges_helps')) !!}
 
                     </div>
                 </div>