diff --git a/src/static/default.css b/src/static/default.css
index b23d26b..bdf81bd 100644
--- a/src/static/default.css
+++ b/src/static/default.css
@@ -40,7 +40,6 @@ td {
 .inline {
   display: inline;
 }
-
 .link-button {
   background: none;
   border: none;
@@ -58,4 +57,27 @@ td {
 }
 .link-button:active {
   color: red;
-}
\ No newline at end of file
+}
+.icon-zoom:hover{
+	transform: scale(1.2);
+}
+.icon-desc {
+	position: relative;
+	display: inline-block;
+  }
+.icon-desc:hover::after {
+	content: attr(desc);
+	font-size: 12px;
+	position: absolute;
+	background: #333;
+	color: white;
+	padding: 3px;
+	border-radius: 10px;
+	pointer-events: none;
+	left: 50%;
+	transform: translateX(-50%);
+	top: 100%;
+	margin-top: 5px;
+	white-space: nowrap;
+	z-index: 2000;
+  }
\ No newline at end of file
diff --git a/src/static/icons/check-lg.svg b/src/static/icons/check-lg.svg
new file mode 100644
index 0000000..0d680db
--- /dev/null
+++ b/src/static/icons/check-lg.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="green" class="bi bi-check-lg" viewBox="0 0 16 16">
+  <path d="M12.736 3.97a.733.733 0 0 1 1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z"/>
+</svg>
\ No newline at end of file
diff --git a/src/static/icons/wrench.svg b/src/static/icons/wrench.svg
new file mode 100644
index 0000000..806cca0
--- /dev/null
+++ b/src/static/icons/wrench.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-wrench" viewBox="0 0 16 16">
+  <path d="M.102 2.223A3.004 3.004 0 0 0 3.78 5.897l6.341 6.252A3.003 3.003 0 0 0 13 16a3 3 0 1 0-.851-5.878L5.897 3.781A3.004 3.004 0 0 0 2.223.1l2.141 2.142L4 4l-1.757.364zm13.37 9.019.528.026.287.445.445.287.026.529L15 13l-.242.471-.026.529-.445.287-.287.445-.529.026L13 15l-.471-.242-.529-.026-.287-.445-.445-.287-.026-.529L11 13l.242-.471.026-.529.445-.287.287-.445.529-.026L13 11z"/>
+</svg>
\ No newline at end of file
diff --git a/src/static/icons/x-lg.svg b/src/static/icons/x-lg.svg
new file mode 100644
index 0000000..8295963
--- /dev/null
+++ b/src/static/icons/x-lg.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="red" class="bi bi-x-lg" viewBox="0 0 16 16">
+  <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8z"/>
+</svg>
\ No newline at end of file
diff --git a/src/templates/base.html b/src/templates/base.html
index 48a1b4c..e68e35f 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -10,7 +10,7 @@
         <!-- Bootstrap CSS -->
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
 
-		<link rel="stylesheet" href="{% static 'default.css' %}" rel="stylesheet">
+		<link rel="stylesheet" href="{% static 'default.css' %}">
 
 		<link rel="icon" href="{% static 'icons/favicon.svg' %}" sizes="any" type="image/svg+xml">
 		
diff --git a/src/templates/devices.html b/src/templates/devices.html
index 73ae17e..1513947 100644
--- a/src/templates/devices.html
+++ b/src/templates/devices.html
@@ -11,6 +11,7 @@ <h1>Devices</h1>
 		<thead>
 			<tr>
 				<th scope="col">Name</th>
+				<th scope="col">Status</th>
 				<th scope="col">FQDN</th>
 				<th scope="col">Device Role Prod</th>
 				<th scope="col">MAC</th>
@@ -22,6 +23,16 @@ <h1>Devices</h1>
 			<td>
 				<a href="{% url 'device_detail' device.pk %}">{{ device.name }}</a>
 			</td>
+			<td>
+				{% if device.appl_NAC_Active %}
+					<span class="icon-desc" desc="Active Device"><img src="{% static 'icons/check-lg.svg' %}" alt="appl_NAC_Active_True" height="25" width="25" class="icon-zoom" /></span>
+				{% else %}
+					<span class="icon-desc" desc="Inactive Device"><img src="{% static 'icons/x-lg.svg' %}" alt="appl_NAC_Active_False" height="25" width="25" class="icon-zoom" /></span>
+				{% endif %}
+				{% if device.appl_NAC_Install %}
+					<span class="icon-desc" desc="Install"><img src="{% static 'icons/wrench.svg' %}" alt="appl_NAC_Install" height="25" width="25" class="icon-zoom"/></span>
+				{% endif %}
+			</td>
 			<td>
 				{{ device.appl_NAC_FQDN }}
 			</td>
@@ -32,7 +43,7 @@ <h1>Devices</h1>
 				{% for mac in device.get_appl_NAC_macAddressAIR %}
 					<b> 
 						{% if mac != None %}
-							<img src="{% static 'icons/wifi.svg' %}" alt="appl_NAC_macAddressAIR" height="14" width="14">
+							<span class="icon-desc" desc="macAddressAIR"><img src="{% static 'icons/wifi.svg' %}" alt="appl_NAC_macAddressAIR" height="14" width="14" class="icon-zoom"/></span>
 							<b> {{mac}}</b> <br />
 						{% endif %}
 					</b>
@@ -40,7 +51,7 @@ <h1>Devices</h1>
 				{% for mac in device.get_appl_NAC_macAddressCAB %}
 					<b> 
 						{% if mac != None %}
-							<img src="{% static 'icons/ethernet.svg' %}" alt="appl_NAC_macAddressCAB" height="14" width="14">
+						<span class="icon-desc" desc="macAddressCAB"><img src="{% static 'icons/ethernet.svg' %}" alt="appl_NAC_macAddressCAB" height="14" width="14" class="icon-zoom"/></span>
 							<b> {{mac}}</b> <br />
 						{% endif %}
 					</b>
@@ -48,10 +59,11 @@ <h1>Devices</h1>
 			</td>
 			<td>
 				<a href="{% url 'device_edit' device.pk %}">
-					<img src="{% static 'icons/pencil-square.svg' %}" alt="edit" height="16" width="16">
+					<span class="icon-desc" desc="edit"><img src="{% static 'icons/pencil-square.svg' %}" alt="edit" height="16" width="16" class="icon-zoom"/></span>
+					
 				</a>
 				<a href="{% url 'device_delete' device.pk %}">
-					<img src="{% static 'icons/trash.svg' %}" alt="delete" height="16" width="16">
+					<span class="icon-desc" desc="delete"><img src="{% static 'icons/trash.svg' %}" alt="delete" height="16" width="16" class="icon-zoom"/></span>
 				</a>
 			</td>
 		</tr>