diff --git a/client_overview.php b/client_overview.php
index 528008eb..6d16da48 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -315,7 +315,7 @@ $sql_asset_retired = mysqli_query(
                                         <i class="<?php echo $item_icon; ?> mr-2 text-secondary"></i><?php echo $item_name; ?>
                                     </td>
                                     <td>
-                                        <div>Views: <?php echo "$item_views / $item_view_limit" ?></div>
+                                        <div>Views: <?php echo $item_views ?></div>
                                         <div class="text-secondary"><?php echo $item_recipient; ?></div>
                                     </td>
                                     <td title="Expires at <?php echo $item_expire_at; ?>">Expires <?php echo $item_expire_at_human ?></td>
diff --git a/functions.php b/functions.php
index 1e29ff1a..0c8573ab 100644
--- a/functions.php
+++ b/functions.php
@@ -648,8 +648,10 @@ function getAssetIcon($asset_type)
         $device_icon = "print";
     } elseif ($asset_type == 'Camera') {
         $device_icon = "video";
-    } elseif ($asset_type == 'Switch' || $asset_type == 'Firewall/Router') {
+    } elseif ($asset_type == 'Switch') {
         $device_icon = "network-wired";
+    } elseif ($asset_type == 'Firewall/Router') {
+        $device_icon = "fire-alt";
     } elseif ($asset_type == 'Access Point') {
         $device_icon = "wifi";
     } elseif ($asset_type == 'Phone') {
@@ -658,7 +660,7 @@ function getAssetIcon($asset_type)
         $device_icon = "mobile-alt";
     } elseif ($asset_type == 'Tablet') {
         $device_icon = "tablet-alt";
-    } elseif ($asset_type == 'TV') {
+    } elseif ($asset_type == 'Display') {
         $device_icon = "tv";
     } elseif ($asset_type == 'Virtual Machine') {
         $device_icon = "cloud";
diff --git a/get_settings.php b/get_settings.php
index c41d7b19..89e92976 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -211,23 +211,26 @@ $asset_types_array = array (
     'Phone'=>'fa-phone',
     'Mobile Phone'=>'fa-mobile-alt',
     'Tablet'=>'fa-tablet-alt',
-    'Firewall/Router'=>'fa-network-wired',
+    'Firewall/Router'=>'fa-fire-alt',
     'Switch'=>'fa-network-wired',
-    'Access Point'=>'fa-wifi',
+    'Wireless Access Point'=>'fa-wifi',
     'Printer'=>'fa-print',
+    'Display'=>'fa-tv',
     'Camera'=>'fa-video',
-    'TV'=>'fa-tv',
     'Virtual Machine'=>'fa-cloud',
     'Other'=>'fa-tag'
 );
 
 $software_types_array = array (
-    'SaaS',
-    'Application',
-    'Mobile',
+    'Software as a Service (SaaS)',
+    'Productivity Suites',
+    'Web Application',
+    'Desktop Application',
+    'Mobile Application',
+    'Security Software',
     'System Software',
     'Operating System',
-    'Misc'
+    'Other'
 );
 
 $license_types_array = array (
diff --git a/guest_view_item.php b/guest_view_item.php
index 230ec667..49be46f7 100644
--- a/guest_view_item.php
+++ b/guest_view_item.php
@@ -97,12 +97,12 @@ appNotify("Share Viewed", "$item_type_sql_escaped has been viewed by $item_recip
 <div class="card mt-2">
     <div class="card-header bg-dark">
         <div class="card-title">
-            <h5><small>Secure Message intended for:</small><br><strong><?php echo $item_recipient ?></strong></h5>
+            <h6><small>Secure link intended for:</small><br><strong><?php echo $item_recipient ?></strong></h6>
         </div>
 
         <div class="card-tools">
             <div>
-                <?php echo "Views: $item_views / <strong>$item_view_limit</strong>"; ?>
+                <?php echo "Viewed: <strong>$item_views</strong> Times"; ?>
             </div>
             <div>
                 <?php echo "Expires: <strong>$item_expire</strong>"; ?>