diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 86a333e594..4b791be0c1 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -518,6 +518,6 @@ class AssetPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fa fa-barcode"></i>';
+        return '<i class="fa fa-barcode" aria-hidden="true"></i>';
     }
 }
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index 1d0ab86b4a..6ecba2e915 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -49,7 +49,7 @@ class CompanyPresenter extends Presenter
                 "field" => "assets_count",
                 "searchable" => false,
                 "sortable" => true,
-                "title" => '<span class="hidden-xs"><i class="fa fa-barcode"></i></span><span class="hidden-md hidden-lg">'.trans('general.assets').'</span>',
+                "title" => '<span class="hidden-xs"><i class="fa fa-barcode" aria-hidden="true"></i></span><span class="hidden-md hidden-lg">'.trans('general.assets').'</span>',
                 "visible" => true,
 
             ],[
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index 3fc225514a..442745131d 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -190,7 +190,7 @@ class LocationPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fa fa-map-marker"></i>';
+        return '<i class="fa fa-map-marker" aria-hidden="true"></i>';
     }
     
     public function fullName() {
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index aa5d3f268c..2e7af67591 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -353,6 +353,6 @@ class UserPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fa fa-user"></i>';
+        return '<i class="fa fa-user" aria-hidden="true"></i>';
     }
 }
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index 2c4d0bad4f..63e8e5860e 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -349,7 +349,7 @@ Form::macro('countries', function ($name = "country", $selected = null, $class =
     $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:350px"'.$idclause.' aria-label="'.$name.'">';
 
     foreach ($countries as $abbr => $country) {
-        $select .= '<option value="'.strtoupper($abbr).'"'.(strtoupper($selected)== strtoupper($abbr) ? ' selected="selected"' : '').'>'.$country.'</option> ';
+        $select .= '<option value="'.strtoupper($abbr).'"'.(strtoupper($selected)== strtoupper($abbr) ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$country.'</option> ';
     }
 
     $select .= '</select>';
@@ -382,7 +382,7 @@ Form::macro('date_display_format', function ($name = "date_display_format", $sel
     }
     $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:250px" aria-label="'.$name.'">';
     foreach ($date_display_formats as $format => $date_display_format) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$date_display_format.'</option> ';
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'">'.$date_display_format.'</option> ';
     }
 
     $select .= '</select>';
@@ -404,7 +404,7 @@ Form::macro('time_display_format', function ($name = "time_display_format", $sel
     }
     $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:150px" aria-label="'.$name.'">';
     foreach ($time_display_formats as $format => $time_display_format) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$time_display_format.'</option> ';
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$time_display_format.'</option> ';
     }
 
     $select .= '</select>';
@@ -428,7 +428,7 @@ Form::macro('alt_barcode_types', function ($name = "alt_barcode", $selected = nu
 
     $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
     foreach ($barcode_types as $barcode_type) {
-        $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected"' : '').'>'.$barcode_type.'</option> ';
+        $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$barcode_type.'</option> ';
     }
 
     $select .= '</select>';
@@ -452,7 +452,7 @@ Form::macro('barcode_types', function ($name = "barcode_type", $selected = null,
 
     $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
     foreach ($barcode_types as $barcode_type) {
-        $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected"' : '').'>'.$barcode_type.'</option> ';
+        $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ?' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$barcode_type.'</option> ';
     }
 
     $select .= '</select>';
@@ -474,7 +474,7 @@ Form::macro('username_format', function ($name = "username_format", $selected =
 
     $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
     foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
     }
 
     $select .= '</select>';
@@ -494,7 +494,7 @@ Form::macro('two_factor_options', function ($name = "two_factor_enabled", $selec
 
     $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
     foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
     }
 
     $select .= '</select>';
@@ -516,7 +516,7 @@ Form::macro('customfield_elements', function ($name = "customfield_elements", $s
 
     $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
     foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
     }
 
     $select .= '</select>';
@@ -549,7 +549,7 @@ Form::macro('skin', function ($name = "skin", $selected = null, $class = null) {
 
     $select = '<select name="'.$name.'" class="'.$class.'" style="width: 250px" aria-label="'.$name.'">';
     foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
     }
 
     $select .= '</select>';
diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php
index 5c2b785c31..036eb019bd 100644
--- a/resources/views/asset_maintenances/edit.blade.php
+++ b/resources/views/asset_maintenances/edit.blade.php
@@ -63,7 +63,7 @@
           <div class="input-group col-md-3{{  (\App\Helpers\Helper::checkIfRequired($item, 'start_date')) ? ' required' : '' }}">
             <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
               <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="start_date" id="start_date" value="{{ Input::old('start_date', $item->start_date) }}">
-              <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+              <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
             </div>
             {!! $errors->first('start_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
           </div>
@@ -78,7 +78,7 @@
           <div class="input-group col-md-3{{  (\App\Helpers\Helper::checkIfRequired($item, 'completion_date')) ? ' required' : '' }}">
             <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
               <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="completion_date" id="completion_date" value="{{ Input::old('completion_date', $item->completion_date) }}">
-              <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+              <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
             </div>
             {!! $errors->first('completion_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
           </div>
diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php
index b9d2545ef2..78c4fa47d6 100644
--- a/resources/views/companies/view.blade.php
+++ b/resources/views/companies/view.blade.php
@@ -18,7 +18,7 @@
                     <li class="active">
                         <a href="#asset_tab" data-toggle="tab">
                             <span class="hidden-lg hidden-md">
-                            <i class="fa fa-barcode"></i>
+                            <i class="fa fa-barcode" aria-hidden="true"></i>
                             </span>
                             <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span>
                         </a>
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 3758a9982e..a44cd9ea4c 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -37,7 +37,7 @@
         <p>{{ trans('general.total_assets') }}</p>
       </div>
       <div class="icon" aria-hidden="true">
-        <i class="fa fa-barcode"></i>
+        <i class="fa fa-barcode" aria-hidden="true"></i>
       </div>
       @can('index', \App\Models\Asset::class)
         <a href="{{ route('hardware.index') }}" class="small-box-footer">{{ trans('general.moreinfo') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 52340912f9..5175baf658 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -60,7 +60,7 @@
                             <div class="col-md-9">
                                 <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd">
                                     <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ Input::old('next_audit_date', $next_audit_date) }}">
-                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                    <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                                 </div>
                                 {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 9899ed4699..596d4a98ca 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -40,7 +40,7 @@
                   <div class="col-md-8">
                       <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d">
                           <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}">
-                          <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                          <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                       </div>
                       {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                   </div>
@@ -52,7 +52,7 @@
                   <div class="col-md-8">
                       <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
                           <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
-                          <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                          <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                       </div>
                       {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                   </div>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index a2add1ede1..30804be0ba 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -33,7 +33,7 @@
             <label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.date') }}</label>
             <div class="input-group col-md-3">
               <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date') }}" arial-label="purchase_date">
-              <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+              <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
               {!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
           </div>
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 2f2a77a1d7..5f5e0a5485 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -82,7 +82,7 @@
               <div class="input-group col-md-5 required">
                 <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                   <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ Input::old('checkin_at', date('Y-m-d')) }}">
-                  <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                 </div>
                 {!! $errors->first('checkin_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 017a23a093..65e79ba9a2 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -52,7 +52,7 @@
                             <div class="col-md-9">
                                 <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd">
                                     <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ Input::old('next_audit_date', $next_audit_date) }}">
-                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                    <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                                 </div>
                                 {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index e26c94ad66..39a92f724d 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -117,28 +117,29 @@
           <a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="offcanvas" role="button">
             <span class="sr-only">Toggle navigation</span>
           </a>
-          <ul class="nav navbar-nav navbar-left">
-              <li class="left-navblock">
+          <div class="nav navbar-nav navbar-left">
+              <div class="left-navblock">
                  @if ($snipeSettings->brand == '3')
                       <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
                           @if ($snipeSettings->logo!='')
-                          <img class="navbar-brand-img" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}" alt="{{ $snipeSettings->site_name }} logo image">
+                          <img class="navbar-brand-img" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}" alt="">
                           @endif
                           {{ $snipeSettings->site_name }}
                       </a>
                   @elseif ($snipeSettings->brand == '2')
                       <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
                           @if ($snipeSettings->logo!='')
-                          <img class="navbar-brand-img" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}" alt="{{ $snipeSettings->site_name }} logo image">
+                          <img class="navbar-brand-img" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}" alt="">
                           @endif
+                          <span class="sr-only">{{ $snipeSettings->site_name }}</span>
                       </a>
                   @else
                       <a class="logo no-hover" href="{{ url('/') }}">
                           {{ $snipeSettings->site_name }}
                       </a>
                   @endif
-              </li>
-            </ul>
+              </div>
+            </div>
 
           <!-- Navbar Right Menu -->
             <div class="navbar-custom-menu">
@@ -146,7 +147,7 @@
                   @can('index', \App\Models\Asset::class)
                   <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!} tabindex="-1">
                       <a href="{{ url('hardware') }}" tabindex="-1">
-                          <i class="fa fa-barcode"></i>
+                          <i class="fa fa-barcode" aria-hidden="true"></i>
                           <span class="sr-only">Assets</span>
                       </a>
                   </li>
@@ -185,6 +186,7 @@
                   @endcan
 
                   @can('index', \App\Models\Asset::class)
+                  <li>
                   <form class="navbar-form navbar-left form-horizontal" role="search" action="{{ route('findbytag/hardware') }}" method="get">
                       <div class="col-xs-12 col-md-12">
                           <div class="col-xs-12 form-group">
@@ -200,6 +202,7 @@
                           </div>
                       </div>
                   </form>
+                  </li>
                   @endcan
 
                   @can('admin')
@@ -313,7 +316,7 @@
                <li class="dropdown user user-menu">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                    @if (Auth::user()->present()->gravatar())
-                       <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image" alt="User Image">
+                       <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image" alt="">
                    @else
                       <i class="fa fa-user fa-fws" aria-hidden="true"></i>
                    @endif
@@ -402,7 +405,7 @@
             @endcan
             @can('index', \App\Models\Asset::class)
             <li class="treeview{{ (Request::is('hardware*') ? ' active' : '') }}">
-                <a href="#"><i class="fa fa-barcode"></i>
+                <a href="#"><i class="fa fa-barcode" aria-hidden="true"></i>
                   <span>{{ trans('general.assets') }}</span>
                   <i class="fa fa-angle-left pull-right"></i>
                 </a>
@@ -719,7 +722,7 @@
 
       <!-- Content Wrapper. Contains page content -->
 
-      <div class="content-wrapper">
+      <div class="content-wrapper" role="main">
 
           @if ($debug_in_production)
               <div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index cc0b6417e4..fbdcbcc07b 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -77,7 +77,7 @@
     <div class="input-group col-md-3">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ Input::old('expiration_date', $item->expiration_date) }}">
-            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
         </div>
         {!! $errors->first('expiration_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
@@ -91,7 +91,7 @@
     <div class="input-group col-md-3">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ Input::old('termination_date', $item->termination_date) }}">
-            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
         </div>
         {!! $errors->first('termination_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
diff --git a/resources/views/models/bulk-delete.blade.php b/resources/views/models/bulk-delete.blade.php
index 121f78042f..d05f48ab91 100644
--- a/resources/views/models/bulk-delete.blade.php
+++ b/resources/views/models/bulk-delete.blade.php
@@ -34,7 +34,7 @@
                                     </label>
 
                                 </td>
-                                <td class="col-md-1"><i class="fa fa-barcode"></i></td>
+                                <td class="col-md-1"><i class="fa fa-barcode" aria-hidden="true"></i></td>
                                 <td class="col-md-10">Name</td>
                             </tr>
                             </thead>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index d042b11d02..f016f93579 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -37,7 +37,7 @@
                         <div class="input-group col-md-4" style="padding-left: 0px;">
                             <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                                 <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" value="{{ Input::old($field->db_column_name(),(isset($item) ? \App\Helpers\Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : "")) }}">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                             </div>
                         </div>
 
diff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.php
index bb437236d6..ba55058857 100644
--- a/resources/views/partials/forms/checkout-selector.blade.php
+++ b/resources/views/partials/forms/checkout-selector.blade.php
@@ -4,17 +4,17 @@
         <div class="btn-group" data-toggle="buttons">
             @if ((isset($user_select)) && ($user_select!='false'))
             <label class="btn btn-default active">
-                <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><i class="fa fa-user"></i> {{ trans('general.user') }}
+                <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><i class="fa fa-user" aria-hidden="true"></i> {{ trans('general.user') }}
             </label>
             @endif
             @if ((isset($asset_select)) && ($asset_select!='false'))
             <label class="btn btn-default">
-                <input name="checkout_to_type" value="asset" aria-label="checkout_to_type" type="radio"><i class="fa fa-barcode"></i> {{ trans('general.asset') }}
+                <input name="checkout_to_type" value="asset" aria-label="checkout_to_type" type="radio"><i class="fa fa-barcode" aria-hidden="true"></i> {{ trans('general.asset') }}
             </label>
             @endif
             @if ((isset($location_select)) && ($location_select!='false'))
             <label class="btn btn-default">
-                <input name="checkout_to_type" value="location" aria-label="checkout_to_type" class="active" type="radio"><i class="fa fa-map-marker"></i> {{ trans('general.location') }}
+                <input name="checkout_to_type" value="location" aria-label="checkout_to_type" class="active" type="radio"><i class="fa fa-map-marker" aria-hidden="true"></i> {{ trans('general.location') }}
             </label>
             @endif
 
diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index de2087506a..cccb211f64 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -5,12 +5,12 @@
         <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" aria-label="{{ $fieldname }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}>
 
             @if ((!isset($unselect)) && ($asset_id = Input::old($fieldname, (isset($asset) ? $asset->id  : (isset($item) ? $item->{$fieldname} : '')))))
-                <option value="{{ $asset_id }}" selected="selected">
+                <option value="{{ $asset_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Asset::find($asset_id)) ? \App\Models\Asset::find($asset_id)->present()->fullName : '' }}
                 </option>
             @else
                 @if(!isset($multiple))
-                    <option value="">{{ trans('general.select_asset') }}</option>
+                    <option value=""  role="option">{{ trans('general.select_asset') }}</option>
                 @endif
             @endif
         </select>
diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index 2185e3a424..a844153e01 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -6,11 +6,11 @@
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" data-placeholder="{{ trans('general.select_category') }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id" aria-label="{{ $fieldname }}">
             @if ($category_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $category_id }}" selected="selected">
+                <option value="{{ $category_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Category::find($category_id)) ? \App\Models\Category::find($category_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_category') }}</option>
+                <option value=""  role="option">{{ trans('general.select_category') }}</option>
             @endif
 
         </select>
diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php
index 6042a17477..6f7e511f68 100644
--- a/resources/views/partials/forms/edit/company-select.blade.php
+++ b/resources/views/partials/forms/edit/company-select.blade.php
@@ -4,11 +4,11 @@
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select" aria-label="{{ $fieldname }}">
             @if ($company_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $company_id }}" selected="selected">
+                <option value="{{ $company_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_company') }}</option>
+                <option value="" role="option">{{ trans('general.select_company') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index 73b85aa58e..ea63db6932 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -5,11 +5,11 @@
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}">
             @if ($department_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $department_id }}" selected="selected">
+                <option value="{{ $department_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_department') }}</option>
+                <option value=""  role="option">{{ trans('general.select_department') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 1730af64a8..cc6c496f7a 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -1,16 +1,19 @@
 <div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
     <div class="col-md-9">
-        <label class="btn btn-default">
+
+        <input type="file" id="image" name="image" aria-label="image">
+
+        <label class="btn btn-default" aria-hidden="true">
             {{ trans('button.select_file')  }}
-            <input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none" aria-label="image">
+            <input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none" aria-label="image" aria-hidden="true">
         </label>
         <span class='label label-default' id="upload-file-info"></span>
 
         <p class="help-block" id="upload-file-status">{{ trans('general.image_filetypes_help', ['size' => \App\Helpers\Helper::file_upload_max_size_readable()]) }}</p>
         {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
-    <div class="col-md-4 col-md-offset-3">
+    <div class="col-md-4 col-md-offset-3" aria-hidden="true">
         <img id="imagePreview" style="max-width: 200px; display: none;" alt="Uploaded image thumbnail">
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/location-profile-select.blade.php b/resources/views/partials/forms/edit/location-profile-select.blade.php
index 7e623c10ba..3ff18509f1 100644
--- a/resources/views/partials/forms/edit/location-profile-select.blade.php
+++ b/resources/views/partials/forms/edit/location-profile-select.blade.php
@@ -5,11 +5,11 @@
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="location_id" style="width: 100%" id="location_id_location_select" aria-label="location_id">
             @if ($location_id = Input::old('location_id', (isset($user)) ? $user->location_id : ''))
-                <option value="{{ $location_id }}" selected="selected">
+                <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_location') }}</option>
+                <option value=""  role="option">{{ trans('general.select_location') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
index 566ceb7179..74f29c08b3 100644
--- a/resources/views/partials/forms/edit/location-select.blade.php
+++ b/resources/views/partials/forms/edit/location-select.blade.php
@@ -5,11 +5,11 @@
     <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}">
             @if ($location_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $location_id }}" selected="selected">
+                <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_location') }}</option>
+                <option value=""  role="option">{{ trans('general.select_location') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index caacf379ef..b6b3505247 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -6,11 +6,11 @@
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="manufacturers" data-placeholder="{{ trans('general.select_manufacturer') }}" name="{{ $fieldname }}" style="width: 100%" id="manufacturer_select_id" aria-label="{{ $fieldname }}">
             @if ($manufacturer_id = Input::old($fieldname,  (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $manufacturer_id }}" selected="selected">
+                <option value="{{ $manufacturer_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_manufacturer') }}</option>
+                <option value=""  role="option">{{ trans('general.select_manufacturer') }}</option>
             @endif
 
         </select>
diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index 2752c54f83..165c8a8416 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -10,7 +10,7 @@
                     {{ (\App\Models\AssetModel::find($model_id)) ? \App\Models\AssetModel::find($model_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_model') }}</option>
+                <option value=""  role="option">{{ trans('general.select_model') }}</option>
             @endif
 
         </select>
@@ -19,7 +19,9 @@
         @can('create', \App\Models\AssetModel::class)
             @if ((!isset($hide_new)) || ($hide_new!='true'))
                 <a href='{{ route('modal.model') }}' data-toggle="modal"  data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-default">New</a>
-                <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
+                <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;">
+                    <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+                </span>
             @endif
         @endcan
     </div>
diff --git a/resources/views/partials/forms/edit/purchase_date.blade.php b/resources/views/partials/forms/edit/purchase_date.blade.php
index 46ee129cf5..97c4b83a3b 100644
--- a/resources/views/partials/forms/edit/purchase_date.blade.php
+++ b/resources/views/partials/forms/edit/purchase_date.blade.php
@@ -4,7 +4,7 @@
    <div class="input-group col-md-3">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}">
-            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
        </div>
        {!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
    </div>
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index bb26e9fff6..8c84fb4701 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -11,7 +11,7 @@
             <a href='{{ route('modal.statuslabel') }}' data-toggle="modal"  data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-default">New</a>
         @endcan
 
-        <span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
+        <span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> </span>
 
     </div>
 
diff --git a/resources/views/partials/forms/edit/supplier-select.blade.php b/resources/views/partials/forms/edit/supplier-select.blade.php
index bed444c9af..7377e6fe1a 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -5,11 +5,11 @@
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="suppliers" data-placeholder="{{ trans('general.select_supplier') }}" name="{{ $fieldname }}" style="width: 100%" id="supplier_select" aria-label="{{ $fieldname }}">
             @if ($supplier_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $supplier_id }}" selected="selected">
+                <option value="{{ $supplier_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Supplier::find($supplier_id)) ? \App\Models\Supplier::find($supplier_id)->name : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_supplier') }}</option>
+                <option value=""  role="option">{{ trans('general.select_supplier') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/user-select.blade.php b/resources/views/partials/forms/edit/user-select.blade.php
index 6afbde8923..07d701ad02 100644
--- a/resources/views/partials/forms/edit/user-select.blade.php
+++ b/resources/views/partials/forms/edit/user-select.blade.php
@@ -5,11 +5,11 @@
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select" aria-label="{{ $fieldname }}">
             @if ($user_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $user_id }}" selected="selected">
+                <option value="{{ $user_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\User::find($user_id)) ? \App\Models\User::find($user_id)->present()->fullName : '' }}
                 </option>
             @else
-                <option value="">{{ trans('general.select_user') }}</option>
+                <option value=""  role="option">{{ trans('general.select_user') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php
index b60bfe97ae..a1ae876d35 100644
--- a/resources/views/settings/barcodes.blade.php
+++ b/resources/views/settings/barcodes.blade.php
@@ -32,7 +32,7 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fa fa-barcode"></i> Barcodes
+                        <i class="fa fa-barcode" aria-hidden="true"></i> Barcodes
                     </h2>
                 </div>
                 <div class="box-body">
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 7e0a002a28..72655fbdec 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -229,7 +229,7 @@
 
     <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px; padding-top: 20px;">
       @if ($supplier->contact)
-      <li><i class="fa fa-user"></i> {{ $supplier->contact }}</li>
+      <li><i class="fa fa-user" aria-hidden="true"></i> {{ $supplier->contact }}</li>
       @endif
       @if ($supplier->phone)
       <li><i class="fa fa-phone"></i>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 1a6c720098..73d94d21c1 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -26,7 +26,7 @@
         <li>
           <a href="#asset" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fa fa-barcode"></i>
+            <i class="fa fa-barcode" aria-hidden="true"></i>
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}</span>
           </a>