diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index bc1f08c0d2..ed1802cf3b 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -56,7 +56,7 @@ class ManufacturerPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('admin/manufacturers/table.support_url'),
                 'visible' => true,
-                'formatter' => 'linkFormatter',
+                'formatter' => 'externalLinkFormatter',
             ],
 
             [
@@ -85,7 +85,7 @@ class ManufacturerPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('admin/manufacturers/table.warranty_lookup_url'),
                 'visible' => false,
-                'formatter' => 'linkFormatter',
+                'formatter' => 'externalLinkFormatter',
             ],
 
             [
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 3e6a9ea3b0..2639a8a801 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -511,8 +511,12 @@
     }
 
     function externalLinkFormatter(value) {
+
         if (value) {
-            return '<a href="' + value + '" target="_blank">' + value + '</a>';
+            if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
+                return '<a href="' + value + '" target="_blank">' + value + ' <i class="fa fa-external-link"><span class="sr-only">{{ trans('hardware/general.mfg_warranty_lookup') }}</span></i></a>';
+            }
+            return value;
         }
     }