diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 4e8efda0..ea008196 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -1,23 +1,23 @@
 {% extends 'base.html' %}
 {% block title %}List{% endblock %}
+{% load paginator from filters %}
 
 {% block content %}
 
-    <h4>Asset List</h4>
+    <h2 class="text-center">Asset List</h2>
 
-    <form method="post" id="asset-filter-form" class="row">
-        {% csrf_token %}
-        <div class="input-field col l11 s12">
-            <input type="text" name="asset_id">
-            <label for="asset_id">Asset ID</label>
-        </div>
+    <div class="col-lg-6">
+        <form method="post" id="asset-filter-form">
+            {% csrf_token %}
+            <div class="input-group">
+                <input type="text" name="asset_id" placeholder="Asset ID" class="form-control">
+                <label for="asset_id" class="sr-only">Asset ID</label>
+                <span class="input-group-btn"><button type="submit" class="btn">Search</button></span>
+            </div>
+        </form>
+    </div>
 
-        <div class="input-field col l1 offset-s4">
-            <button type="submit" class="btn">Search</button>
-        </div>
-    </form>
-
-    <table class="striped">
+    <table class="table">
         <thead>
         <tr>
             <th>Asset ID</th>
@@ -32,7 +32,11 @@
         </tbody>
     </table>
 
-    {% include 'helpers/paginator.html' %}
+    {% if is_paginated %}
+            <div class="col-md-6 text-right">
+                {% paginator %}
+            </div>
+    {% endif %}
 
 {% endblock %}
 
@@ -44,4 +48,4 @@
             return false;
         });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/assets/templates/asset_list_table_body.html b/assets/templates/asset_list_table_body.html
index 75c6e5c1..661920ba 100644
--- a/assets/templates/asset_list_table_body.html
+++ b/assets/templates/asset_list_table_body.html
@@ -6,9 +6,11 @@
         <td>{{ item.category }}</td>
         <td>{{ item.status }}</td>
         <td>
-            <a href="{% url 'asset_detail' item.pk %}"><i class="material-icons">visibility</i></a>
-            <a href="{% url 'asset_update' item.pk %}"><i class="material-icons">edit</i></a>
-            <a href="{% url 'asset_update' item.pk %}?duplicate=true"><i class="material-icons">content_copy</i></a>
+            <div class="btn-group" role="group">
+                <button type="button" class="btn btn-default" formaction="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</button>
+                <button type="button" class="btn btn-default" formaction="{% url 'asset_update' item.pk %}"><i class="glyphicon glyphicon-edit"></i> Edit</button>
+                <button type="button" class="btn btn-default" formaction="{% url 'asset_update' item.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</button>
+            </div>
         </td>
     </tr>
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/assets/templates/helpers/paginator.html b/assets/templates/helpers/paginator.html
deleted file mode 100644
index 9854a039..00000000
--- a/assets/templates/helpers/paginator.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% if is_paginated %}
-<ul class="pagination center-align">
-    {% if page_obj.has_previous %}
-    <li class="waves-effect"><a href="?page={{ page_obj.previous_page_number }}" class="no-pad"><i class="material-icons nnt-purple">chevron_left</i></a></li>
-    {% else %}
-    <li class="disabled"><i class="material-icons grey-text">chevron_left</i></li>
-    {% endif %}
-
-    <li class="nnt-orange" id="page">{{ page_obj.number }} of {{ page_obj.paginator.num_pages }}</li>
-
-    {% if page_obj.has_next %}
-    <li class="waves-effect"><a href="?page={{ page_obj.next_page_number }}" class="no-pad"><i class="material-icons nnt-purple">chevron_right</i></a></li>
-    {% else %}
-    <li class="disabled"><i class="material-icons grey-text">chevron_right</i></li>
-    {% endif %}
-</ul>
-{% endif %}
\ No newline at end of file