diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 5aaaccdf68..da474f339f 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -265,7 +265,7 @@ class AccessoryPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Accessory', $this])) {
-            return (string)link_to_route('accessories.show', e($this->display_name), $this->id);
+            return '<a href="' . route('accessories.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
index 2a13b272f8..0f85e30ea5 100644
--- a/app/Presenters/ActionlogPresenter.php
+++ b/app/Presenters/ActionlogPresenter.php
@@ -22,9 +22,6 @@ class ActionlogPresenter extends Presenter
 
     public function item()
     {
-        if ($this->action_type == 'uploaded') {
-            return (string) link_to_route('show/userfile', $this->model->filename, [$this->model->item->id, $this->model->id]);
-        }
         if ($item = $this->model->item) {
             if (empty($item->deleted_at)) {
                 return $this->model->item->present()->nameUrl();
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index b51327c1b6..ab6a53472e 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -266,7 +266,7 @@ class AssetModelPresenter extends Presenter
      */
     public function nameUrl()
     {
-        return  (string) link_to_route('models.show', $this->name, $this->id);
+        return '<a href="' . route('models.show', $this->id) . '">' . e($this->name) . '</a>';
     }
 
     /**
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 943706c93d..72d009846f 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -452,7 +452,7 @@ class AssetPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Asset', $this])) {
-            return (string)link_to_route('hardware.show', e($this->display_name), $this->id);
+            return '<a href="' . route('hardware.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index a0ea3437a7..d3ab2c24f3 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -143,7 +143,7 @@ class CategoryPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Category', $this])) {
-            return (string)link_to_route('categories.show', e($this->display_name), $this->id);
+            return '<a href="' . route('categories.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index ace3fd898d..e1a0c777bc 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -166,7 +166,7 @@ class CompanyPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Company', $this])) {
-            return (string)link_to_route('companies.show', e($this->display_name), $this->id);
+            return '<a href="' . route('companies.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 0a23d9e223..76d98f9376 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -257,7 +257,7 @@ class ComponentPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Component', $this])) {
-            return (string)link_to_route('components.show', e($this->display_name), $this->id);
+            return '<a href="' . route('components.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index 312aec56b6..0e129a0714 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -255,6 +255,6 @@ class ConsumablePresenter extends Presenter
      */
     public function nameUrl()
     {
-        return (string) link_to_route('consumables.show', e($this->name), $this->id);
+        return '<a href="' . route('consumables.show', $this->id) . '">' . e($this->name) . '</a>';
     }
 }
diff --git a/app/Presenters/CustomFieldsetPresenter.php b/app/Presenters/CustomFieldsetPresenter.php
index a5d4d64749..15abead059 100644
--- a/app/Presenters/CustomFieldsetPresenter.php
+++ b/app/Presenters/CustomFieldsetPresenter.php
@@ -12,7 +12,7 @@ class CustomFieldsetPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\CustomFieldset', $this])) {
-            return (string)link_to_route('fieldsets.show', e($this->display_name), $this->id);
+            return '<a href="' . route('fieldsets.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/DepartmentPresenter.php b/app/Presenters/DepartmentPresenter.php
index 463b1e7746..035d761a3b 100644
--- a/app/Presenters/DepartmentPresenter.php
+++ b/app/Presenters/DepartmentPresenter.php
@@ -125,8 +125,8 @@ class DepartmentPresenter extends Presenter
      */
     public function viewUrl()
     {
-        if (auth()->user()->can('view', ['\App\Models\Location', $this])) {
-            return (string)link_to_route('locations.show', $this->display_name, $this->id);
+        if (auth()->user()->can('view', ['\App\Models\Department', $this])) {
+            return '<a href="' . route('departments.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return $this->display_name;
         }
diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.php
index b577dbd401..c179b443a6 100644
--- a/app/Presenters/DepreciationPresenter.php
+++ b/app/Presenters/DepreciationPresenter.php
@@ -111,7 +111,7 @@ class DepreciationPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Depreciation', $this])) {
-            return (string)link_to_route('depreciations.show', e($this->display_name), $this->id);
+            return '<a href="' . route('depreciations.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/DepreciationReportPresenter.php b/app/Presenters/DepreciationReportPresenter.php
index c8332cccbf..975e84a4be 100644
--- a/app/Presenters/DepreciationReportPresenter.php
+++ b/app/Presenters/DepreciationReportPresenter.php
@@ -181,7 +181,7 @@ class DepreciationReportPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Depreciation', $this])) {
-            return (string)link_to_route('depreciations.show', e($this->display_name), $this->id);
+            return '<a href="' . route('depreciations.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index a5ed9b050f..248845570b 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -323,7 +323,7 @@ class LicensePresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\License', $this])) {
-            return (string)link_to_route('licenses.show', e($this->display_name), $this->id);
+            return '<a href="' . route('licenses.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
@@ -339,15 +339,6 @@ class LicensePresenter extends Presenter
         return $this->name;
     }
 
-    /**
-     * Link to this licenses serial
-     * @return string
-     */
-    public function serialUrl()
-    {
-        return (string) link_to('/licenses/'.$this->id, mb_strimwidth($this->serial, 0, 50, '...'));
-    }
-
     /**
      * Url to view this item.
      * @return string
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index 77693450ed..4412bec648 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -351,7 +351,7 @@ class LocationPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Location', $this])) {
-            return (string)link_to_route('locations.show', e($this->display_name), $this->id);
+            return '<a href="' . route('locations.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index 94b7a0fd79..059a250ee3 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -184,7 +184,7 @@ class ManufacturerPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Manufacturer', $this])) {
-            return (string)link_to_route('manufacturers.show', e($this->display_name), $this->id);
+            return '<a href="' . route('manufacturers.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/PredefinedKitPresenter.php b/app/Presenters/PredefinedKitPresenter.php
index 92c49b6aa7..70f2edd5e5 100644
--- a/app/Presenters/PredefinedKitPresenter.php
+++ b/app/Presenters/PredefinedKitPresenter.php
@@ -296,7 +296,7 @@ class PredefinedKitPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\PredefinedKit', $this])) {
-            return (string)link_to_route('kits.show', e($this->display_name), $this->id);
+            return '<a href="' . route('kits.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/SupplierPresenter.php b/app/Presenters/SupplierPresenter.php
index 5571e00082..682a903a26 100644
--- a/app/Presenters/SupplierPresenter.php
+++ b/app/Presenters/SupplierPresenter.php
@@ -210,7 +210,7 @@ class SupplierPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Supplier', $this])) {
-            return (string)link_to_route('suppliers.show', e($this->display_name), $this->id);
+            return '<a href="' . route('suppliers.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
@@ -232,7 +232,7 @@ class SupplierPresenter extends Presenter
     public function viewUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\Supplier', $this])) {
-            return (string)link_to_route('suppliers.show', $this->display_name, $this->id);
+            return '<a href="' . route('suppliers.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 3c362fe1de..0f2d378b84 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -529,7 +529,7 @@ class UserPresenter extends Presenter
     public function nameUrl()
     {
         if (auth()->user()->can('view', ['\App\Models\User', $this])) {
-            return (string)link_to_route('users.show', $this->display_name, $this->id);
+            return '<a href="' . route('users.show', $this->id) . '">' . e($this->display_name) . '</a>';
         } else {
             return e($this->display_name);
         }
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 8d7d6ba52e..36b5a8b30d 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -51,7 +51,7 @@
             @foreach($custom_fieldsets AS $fieldset)
             <tr>
               <td>
-                {{ link_to_route("fieldsets.show",$fieldset->name,['fieldset' => $fieldset->id]) }}
+                <a href="{{ route('fieldsets.show', ['fieldset' => $fieldset->id]) }}">{{ $fieldset->name }}</a>
               </td>
               <td>
                 {{ $fieldset->fields->count() }}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 93e47ca608..52afb4b3a8 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -553,7 +553,7 @@
                                                 {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                 {{ Helper::getFormattedDateObject($audit_log->created_at, 'datetime', false) }}
                                                 @if ($audit_log->user)
-                                                    ({{ link_to_route('users.show', $audit_log->user->display_name, [$audit_log->user->id]) }})
+                                                    (<a href="{{ route('users.show', $audit_log->user->id) }}">{{ $audit_log->user->display_name }}</a>)
                                                 @endif
 
                                             </div>