diff --git a/resources/views/settings/company/edit.blade.php b/resources/views/settings/company/edit.blade.php
index 29ba258d9..2d3f9d928 100644
--- a/resources/views/settings/company/edit.blade.php
+++ b/resources/views/settings/company/edit.blade.php
@@ -28,7 +28,7 @@
 
                 {{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }}
 
-                {{ Form::fileGroup('logo', trans('settings.company.logo')) }}
+                {{ Form::fileGroup('logo', trans('settings.company.logo'), 'file-image-o', [], setting('company.logo')) }}
             </div>
         </div>
 
diff --git a/resources/views/settings/email/edit.blade.php b/resources/views/settings/email/edit.blade.php
index c2d497ebe..a71b89e12 100644
--- a/resources/views/settings/email/edit.blade.php
+++ b/resources/views/settings/email/edit.blade.php
@@ -24,14 +24,15 @@
         @php $collapse_status = in_array($card, [1, 2]) ? 'show' : ''; @endphp
 
         <div class="col-md-6">
-            <div class="accordion" id="accordion{{ $card }}">
+            <div class="accordion" id="accordion-{{ $card }}">
                 <div class="card">
-                    <div class="card-header" id="heading{{ $card }}" data-toggle="collapse" data-target="#collapse{{ $card }}" aria-expanded="{{ $aria_expanded_status }}" aria-controls="collapse{{ $card }}">
+                    <div class="card-header" id="heading-{{ $card }}" data-toggle="collapse" data-target="#collapse-{{ $card }}" aria-expanded="{{ $aria_expanded_status }}" aria-controls="collapse-{{ $card }}">
                         <div class="align-items-center">
                             <h4 class="mb-0">{{ trans($template->name) }}</h4>
                         </div>
                     </div>
-                    <div id="collapse{{ $card }}" class="collapse {{ $collapse_status }}" aria-labelledby="heading{{ $card }}" data-parent="#accordion{{ $card }}">
+
+                    <div id="collapse-{{ $card }}" class="collapse {{ $collapse_status }}" aria-labelledby="heading-{{ $card }}" data-parent="#accordion-{{ $card }}">
                         <div class="card-body">
                             <div class="row">
                                 {{ Form::textGroup('template_' . $template->alias . '_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], $template->subject, 'col-md-12') }}
@@ -54,29 +55,30 @@
     @endforeach
 
         <div class="col-md-12">
-            <div class="accordion" id="accordion{{ $card }}">
+            <div class="accordion" id="accordion-{{ $card }}">
                 <div class="card">
-                    <div class="card-header" id="heading{{ $card }}" data-toggle="collapse" data-target="#collapse{{ $card }}" aria-expanded="false" aria-controls="collapse{{ $card }}">
+                    <div class="card-header" id="heading-{{ $card }}" data-toggle="collapse" data-target="#collapse-{{ $card }}" aria-expanded="false" aria-controls="collapse-{{ $card }}">
                         <div class="align-items-center">
                             <h4 class="mb-0">{{ trans('settings.email.protocol') }}</h4>
                         </div>
                     </div>
-                    <div id="collapse{{ $card }}" class="collapse hide" aria-labelledby="heading{{ $card }}" data-parent="#accordion{{ $card }}">
+
+                    <div id="collapse-{{ $card }}" class="collapse hide" aria-labelledby="heading-{{ $card }}" data-parent="#accordion-{{ $card }}">
                         <div class="card-body">
                             <div class="row">
                                 {{ Form::selectGroup('protocol', trans('settings.email.protocol'), 'share', $email_protocols, setting('email.protocol'), ['change' => 'onChangeProtocol']) }}
 
                                 {{ Form::textGroup('sendmail_path', trans('settings.email.sendmail_path'), 'road', [':disabled'=> 'email.sendmailPath'], setting('email.sendmail_path')) }}
 
-                                {{ Form::textGroup('smtp_host', trans('settings.email.smtp.host'), 'paper-plane', [':disabled' => 'email.smtpHost']) }}
+                                {{ Form::textGroup('smtp_host', trans('settings.email.smtp.host'), 'paper-plane', [':disabled' => 'email.smtpHost'], setting('email.smtp_host')) }}
 
-                                {{ Form::textGroup('smtp_port', trans('settings.email.smtp.port'), 'paper-plane', [':disabled' => 'email.smtpPort']) }}
+                                {{ Form::textGroup('smtp_port', trans('settings.email.smtp.port'), 'paper-plane', [':disabled' => 'email.smtpPort'], setting('email.smtp_port')) }}
 
-                                {{ Form::textGroup('smtp_username', trans('settings.email.smtp.username'), 'paper-plane', [':disabled' => 'email.smtpUsername']) }}
+                                {{ Form::textGroup('smtp_username', trans('settings.email.smtp.username'), 'paper-plane', [':disabled' => 'email.smtpUsername'], setting('email.smtp_username')) }}
 
-                                {{ Form::textGroup('smtp_password', trans('settings.email.smtp.password'), 'paper-plane', ['type' => 'password', ':disabled' => 'email.smtpPassword']) }}
+                                {{ Form::textGroup('smtp_password', trans('settings.email.smtp.password'), 'paper-plane', ['type' => 'password', ':disabled' => 'email.smtpPassword'], setting('email.smtp_password')) }}
 
-                                {{ Form::selectGroup('smtp_encryption', trans('settings.email.smtp.encryption'), 'paper-plane', ['' => trans('settings.email.smtp.none'), 'ssl' => 'SSL', 'tls' => 'TLS'], !empty($setting['smtp_encryption']) ? $setting['smtp_encryption'] : null , ['disabled' => 'email.smtpEncryption']) }}
+                                {{ Form::selectGroup('smtp_encryption', trans('settings.email.smtp.encryption'), 'paper-plane', ['' => trans('settings.email.smtp.none'), 'ssl' => 'SSL', 'tls' => 'TLS'], setting('email.smtp_encryption', null), ['disabled' => 'email.smtpEncryption']) }}
                              </div>
                         </div>
                     </div>
diff --git a/resources/views/settings/invoice/edit.blade.php b/resources/views/settings/invoice/edit.blade.php
index f2e1731dd..fa8dfb514 100644
--- a/resources/views/settings/invoice/edit.blade.php
+++ b/resources/views/settings/invoice/edit.blade.php
@@ -28,11 +28,11 @@
 
                 {{ Form::textGroup('title', trans('settings.invoice.title'), 'font', [], setting('invoice.title')) }}
 
-                {{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', []) }}
+                {{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', [], setting('invoice.subheading')) }}
 
-                {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
+                {{ Form::textareaGroup('notes', trans_choice('general.notes', 2), 'sticky-note-o', setting('invoice.notes')) }}
 
-                {{ Form::textareaGroup('footer', trans('general.footer')) }}
+                {{ Form::textareaGroup('footer', trans('general.footer'), 'sticky-note-o', setting('invoice.footer')) }}
 
                 {{ Form::invoice_text('item_name', trans('settings.invoice.item_name'), 'font', $item_names, setting('invoice.item_name'), [], 'item_name_input', null) }}
 
diff --git a/resources/views/settings/schedule/edit.blade.php b/resources/views/settings/schedule/edit.blade.php
index ce2e9a522..7c1bf8ba4 100644
--- a/resources/views/settings/schedule/edit.blade.php
+++ b/resources/views/settings/schedule/edit.blade.php
@@ -31,7 +31,7 @@
                     <input type="text" class="form-control form-control-muted" value="php {{ base_path('artisan') }} schedule:run >> /dev/null 2>&1">
                 </div>
 
-                {{ Form::textGroup('time', trans('settings.scheduling.schedule_time'), 'clock', []) }}
+                {{ Form::textGroup('time', trans('settings.scheduling.schedule_time'), 'clock', [], setting('schedule.time')) }}
             </div>
         </div>