diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index cbae7aeac..751524902 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -44,6 +44,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-arrows-h"></i> 
                 <strong>Circuit</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -107,6 +108,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-commenting"></i> 
                 <strong>Comments</strong>
             </div>
             <div class="panel-body">
diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html
index 2b40e0df0..e9d8d684c 100644
--- a/netbox/templates/circuits/circuit_list.html
+++ b/netbox/templates/circuits/circuit_list.html
@@ -21,6 +21,7 @@
     <div class="col-md-3">
 		<div class="panel panel-default">
 			<div class="panel-heading">
+				<span class="glyphicon glyphicon-search" aria-hidden="true"></span> 
 				<strong>Search</strong>
 			</div>
 			<div class="panel-body">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 333a07faf..b5796a98e 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -36,6 +36,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-building"></i> 
                 <strong>Provider</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -73,6 +74,7 @@
         </div>
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-commenting"></i> 
                 <strong>Comments</strong>
             </div>
             <div class="panel-body">
@@ -87,6 +89,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	Circuit: <i class="fa fa-fw fa-arrows-h"></i> 
                 <strong>Circuits</strong>
             </div>
             <table class="table table-hover panel-body">
diff --git a/netbox/templates/dcim/component_template_add.html b/netbox/templates/dcim/component_template_add.html
index d305debf5..978f365d0 100644
--- a/netbox/templates/dcim/component_template_add.html
+++ b/netbox/templates/dcim/component_template_add.html
@@ -18,6 +18,7 @@
             {% endif %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> 
                     <strong>New {{ component_type }}</strong>
                 </div>
                 <div class="panel-body">
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 0f405b68e..0ff4e8595 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -11,6 +11,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-server"></i> 
                 <strong>Device</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -71,6 +72,7 @@
         </div>
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-cogs"></i> 
                 <strong>Management</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -135,6 +137,7 @@
         {% if request.user.is_authenticated %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                    <i class="fa fa-fw fa-user-secret"></i> 	
                     <strong>Secrets</strong>
                 </div>
                 {% if secrets %}
@@ -163,6 +166,7 @@
         {% endif %}
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-map-signs"></i> 
                 <strong>IP Addresses</strong>
             </div>
             {% if ip_addresses %}
@@ -187,6 +191,7 @@
         </div>
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-times-circle"></i> 
                 <strong>Critical Connections</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -254,6 +259,7 @@
         </div>
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-commenting"></i> 
                 <strong>Comments</strong>
             </div>
             <div class="panel-body">
@@ -266,6 +272,7 @@
         </div>
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-share-alt"></i> 
                 <strong>Related Devices</strong>
             </div>
             {% if related_devices %}
@@ -291,6 +298,7 @@
         {% if device_bays or device.device_type.is_parent_device %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                   <i class="fa fa-fw fa-puzzle-piece"></i> 
                     <strong>Device Bays</strong>
                 </div>
                 <table class="table table-hover panel-body">
@@ -315,6 +323,7 @@
         {% if interfaces or device.device_type.is_network_device %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                    <i class="fa fa-fw fa-exchange"></i> 
                     <strong>Interfaces</strong>
                 </div>
                 <table class="table table-hover panel-body">
@@ -339,6 +348,7 @@
         {% if cs_ports or device.device_type.is_console_server %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                    <i class="fa fa-fw fa-desktop"></i> 
                     <strong>Console Server Ports</strong>
                 </div>
                 <table class="table table-hover panel-body">
@@ -363,6 +373,7 @@
         {% if power_outlets or device.device_type.is_pdu %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                    <i class="fa fa-fw fa-plug"></i> 
                     <strong>Power Outlets</strong>
                 </div>
                 <table class="table table-hover panel-body">
diff --git a/netbox/templates/dcim/device_inventory.html b/netbox/templates/dcim/device_inventory.html
index e1e8f518d..76cab31a5 100644
--- a/netbox/templates/dcim/device_inventory.html
+++ b/netbox/templates/dcim/device_inventory.html
@@ -8,6 +8,7 @@
     <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-hdd-o"></i> 
                 <strong>Chassis</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -25,6 +26,7 @@
     <div class="col-md-8">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-server"></i> 
                 <strong>Hardware</strong>
             </div>
             <table class="table table-hover table-condensed panel-body" id="hardware">
diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html
index b37f1860e..c08ecd4dc 100644
--- a/netbox/templates/dcim/device_lldp_neighbors.html
+++ b/netbox/templates/dcim/device_lldp_neighbors.html
@@ -6,6 +6,7 @@
 {% include 'dcim/inc/_device_header.html' with active_tab='lldp-neighbors' %}
 <div class="panel panel-default">
     <div class="panel-heading">
+        <i class="fa fa-fw fa-sitemap"></i> 
         <strong>LLDP Neighbors</strong>
     </div>
     <table class="table table-hover panel-body">
@@ -21,7 +22,7 @@
         <tbody>
             {% for iface in interfaces %}
                 <tr id="{{ iface }}">
-                    <td>{{ iface }}</td>
+                    <td><i class="fa fa-fw fa-exchange"></i> {{ iface }}</td>
                     {% if iface.connection %}
                         {% with iface.get_connected_interface as connected_iface %}
                             <td class="configured_device" data="{{ connected_iface.device }}">
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index a9d84c5e7..97b342798 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -17,7 +17,9 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Populate {{ device_bay }}</div>
+                <div class="panel-heading">
+                	<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> 
+                	Populate {{ device_bay }}</div>
                 <div class="panel-body">
                     <div class="form-group">
                         <label class="col-md-3 control-label required">Parent Device</label>
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index f3ae5aa78..758b0d0b0 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -37,6 +37,7 @@
     <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-hdd-o"></i> 
                 <strong>Chassis</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -60,6 +61,7 @@
         </div>
         <div class="panel panel-default">
             <div class="panel-heading">
+                <i class="fa fa-fw fa-cog"></i> 
                 <strong>Function</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -77,21 +79,21 @@
                 </tr>
             </table>
         </div>
-        {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %}
-        {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %}
+        {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' icon='desktop' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %}
+        {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' icon='plug' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %}
     </div>
     <div class="col-md-6">
         {% if devicetype.is_parent_device %}
-            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicetype_add_devicebay' delete_url='dcim:devicetype_delete_devicebay' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' icon='puzzle-piece' add_url='dcim:devicetype_add_devicebay' delete_url='dcim:devicetype_delete_devicebay' %}
         {% endif %}
         {% if devicetype.is_network_device %}
-            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' icon='exchange' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %}
         {% endif %}
         {% if devicetype.is_console_server %}
-            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' icon='desktop' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %}
         {% endif %}
         {% if devicetype.is_pdu %}
-            {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' icon='plug' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %}
         {% endif %}
     </div>
 </div>
diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html
index 55bed30e9..7009a4221 100644
--- a/netbox/templates/dcim/inc/devicetype_component_table.html
+++ b/netbox/templates/dcim/inc/devicetype_component_table.html
@@ -5,6 +5,7 @@
         <div class="panel panel-default">
             <div class="panel-heading">
                 <a href="{% url add_url pk=devicetype.pk %}" class="btn btn-primary btn-xs pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add {{ title }}</a>
+                <i class="fa fa-fw fa-{{ icon }}"></i> 
                 <strong>{{ title }}</strong>
             </div>
             {% render_table table 'table.html' %}
@@ -20,6 +21,7 @@
 {% else %}
     <div class="panel panel-default">
         <div class="panel-heading">
+            <i class="fa fa-fw fa-{{ icon }}"></i> 
             <strong>{{ title }}</strong>
         </div>
         {% render_table table 'table.html' %}
diff --git a/netbox/templates/dcim/poweroutlet_connect.html b/netbox/templates/dcim/poweroutlet_connect.html
index 4e6356cb1..01dbd5885 100644
--- a/netbox/templates/dcim/poweroutlet_connect.html
+++ b/netbox/templates/dcim/poweroutlet_connect.html
@@ -18,7 +18,9 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ poweroutlet.device }} {{ poweroutlet }}</div>
+                <div class="panel-heading">
+                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> 
+                    Connect {{ poweroutlet.device }} {{ poweroutlet }}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 0e9f54ebc..7cab180af 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -32,6 +32,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-cube"></i> 
                 <strong>Aggregate</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -79,7 +80,7 @@
 </div>
 <div class="row">
     <div class="col-md-12">
-        {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
+        {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' icon='cubes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
 	</div>
 </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 6834ded9e..b511b58bb 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -47,6 +47,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-map-signs"></i> 
                 <strong>IP Address</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -119,15 +120,15 @@
         </div>
 	</div>
 	<div class="col-md-6">
-        {% with heading='Parent Prefixes' %}
+        {% with heading='Parent Prefixes' icon='cube' %}
             {% render_table parent_prefixes_table 'panel_table.html' %}
         {% endwith %}
         {% if duplicate_ips_table.rows %}
-            {% with heading='Duplicate IP Addresses' panel_class='danger' %}
+            {% with heading='Duplicate IP Addresses' icon='exclamation-traingle' panel_class='danger' %}
                 {% render_table duplicate_ips_table 'panel_table.html' %}
             {% endwith %}
         {% endif %}
-        {% with heading='Related IP Addresses' %}
+        {% with heading='Related IP Addresses' icon=share-alt' %}
             {% render_table related_ips_table 'panel_table.html' %}
         {% endwith %}
 	</div>
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 6403717f4..ff024ab03 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -9,6 +9,7 @@
 	<div class="col-md-5">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-cube"></i> 
                 <strong>Prefix</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -93,11 +94,11 @@
 	</div>
 	<div class="col-md-7">
         {% if duplicate_prefix_table.rows %}
-            {% with heading='Duplicate Prefixes' panel_class='danger' %}
+            {% with heading='Duplicate Prefixes' icon='exclamation-triangle' panel_class='danger' %}
                 {% render_table duplicate_prefix_table 'panel_table.html' %}
             {% endwith %}
         {% endif %}
-        {% with heading='Parent Prefixes' %}
+        {% with heading='Parent Prefixes' icon='cube' %}
             {% render_table parent_prefix_table 'panel_table.html' %}
         {% endwith %}
 	</div>
@@ -105,7 +106,7 @@
 <div class="row">
 	<div class="col-md-12">
         {% if child_prefix_table.rows %}
-            {% include 'utilities/obj_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' parent=prefix bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
+            {% include 'utilities/obj_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' icon='cubes' parent=prefix bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
         {% elif prefix.new_subnet %}
             <a href="{% url 'ipam:prefix_add' %}?prefix={{ prefix.new_subnet }}{% if prefix.vrf %}&vrf={{ prefix.vrf.pk }}{% endif %}{% if prefix.site %}&site={{ prefix.site.pk }}{% endif %}" class="btn btn-success">
                 <i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Add Child Prefix
diff --git a/netbox/templates/ipam/prefix_ipaddresses.html b/netbox/templates/ipam/prefix_ipaddresses.html
index 621bb2f22..bfb6af915 100644
--- a/netbox/templates/ipam/prefix_ipaddresses.html
+++ b/netbox/templates/ipam/prefix_ipaddresses.html
@@ -7,7 +7,7 @@
 {% include 'ipam/inc/prefix_header.html' with active_tab='ip-addresses' %}
 <div class="row">
 	<div class="col-md-12">
-        {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
+        {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' icon='map-signs' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
     </div>
 </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 3412d5254..67ff3da30 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -44,6 +44,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-exchange"></i> 
                 <strong>VLAN</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -83,6 +84,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-cubes"></i> 
                 <strong>Prefixes</strong>
             </div>
             {% if prefixes %}
diff --git a/netbox/templates/panel_table.html b/netbox/templates/panel_table.html
index 0d44d7ea9..1b517a3d5 100644
--- a/netbox/templates/panel_table.html
+++ b/netbox/templates/panel_table.html
@@ -8,6 +8,7 @@
 <div class="panel panel-{{ panel_class|default:'default' }}">
     {% if heading %}
         <div class="panel-heading">
+            <i class="fa fa-fw fa-{{ icon }}"></i> 
             <strong>{{ heading }}</strong>
         </div>
     {% endif %}
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index e98030c9a..ac9bc9614 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -33,6 +33,7 @@
 	<div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
+            	<i class="fa fa-fw fa-user-secret"></i> 
                 <strong>Secret Attributes</strong>
             </div>
             <table class="table table-hover panel-body">
@@ -71,6 +72,7 @@
         {% if secret|decryptable_by:request.user %}
             <div class="panel panel-default">
                 <div class="panel-heading">
+                    <i class="fa fa-fw fa-lock"></i> 
                     <strong>Secret Data</strong>
                 </div>
                 <div class="panel-body">