diff --git a/helpdesk/templates/helpdesk/followup_edit.html b/helpdesk/templates/helpdesk/followup_edit.html
index 9ef48ff9..0afff6e8 100644
--- a/helpdesk/templates/helpdesk/followup_edit.html
+++ b/helpdesk/templates/helpdesk/followup_edit.html
@@ -9,29 +9,47 @@
 </script>
 {% endblock helpdesk_head %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{{ ticket.get_absolute_url }}">{{ ticket.queue.slug }}-{{ ticket.id }}</a>
+</li>
+<li class="breadcrumb-item active">
+    {% trans "Edit FollowUp" %}
+</li>
+{% endblock %}
+
 {% block helpdesk_body %}
 
 {% include "helpdesk/ticket_desc_table.html" %}
 
-<h3>{% trans "Edit FollowUp" %}</h3>
-    <form action="." method="POST" name="edit_followup_form">
-        {{ form.non_field_errors }}
-        <fieldset>
-        <dl>
-            <dt><label for='id_ticket'>{% trans "Reassign ticket:" %}</label></dt>
-            <dd>{{ form.ticket }}</dd>
-            <dt><label for="id_title">{% trans "Title:" %}</label></dt>
-            <dd>{{ form.title }}</dd>
-            <dt><label for="id_comment">{% trans "Comment:" %}</label></dt>
-            <dd>{{ form.comment }}</dd>
-            <dt><label for="id_public">Public:</label></dt>
-            <dd>{{ form.public }}</dd>
-                <p>Public tickets are viewable by the submitter and all staff, but non-public tickets can only be seen by staff.</p>
-            <dt><label for="id_new_status">New Status:</label></dt>
-            <dd>{{ form.new_status }}</dd>
-                <p>If the status was changed, what was it changed to?</p>
-        </dl>
-        </fieldset>
-        <p><input class="btn btn-primary" type="submit" value="Submit"></p>{% csrf_token %}
-    </form>
-{% endblock helpdesk_body %}
\ No newline at end of file
+<div class="card mb-3">
+    <div class="card-header">
+        {% trans "Edit FollowUp" %}
+    </div>
+    <div class="card-body">
+        <form action="." method="POST" name="edit_followup_form">
+            {{ form.non_field_errors }}
+            <fieldset>
+            <dl>
+                <dt><label for='id_ticket'>{% trans "Reassign ticket:" %}</label></dt>
+                <dd>{{ form.ticket }}</dd>
+                <dt><label for="id_title">{% trans "Title:" %}</label></dt>
+                <dd>{{ form.title }}</dd>
+                <dt><label for="id_comment">{% trans "Comment:" %}</label></dt>
+                <dd>{{ form.comment }}</dd>
+                <dt><label for="id_public">Public:</label></dt>
+                <dd>{{ form.public }}</dd>
+                    <p>Public tickets are viewable by the submitter and all staff, but non-public tickets can only be seen by staff.</p>
+                <dt><label for="id_new_status">New Status:</label></dt>
+                <dd>{{ form.new_status }}</dd>
+                    <p>If the status was changed, what was it changed to?</p>
+            </dl>
+            </fieldset>
+            <p><input class="btn btn-primary" type="submit" value="Submit"></p>{% csrf_token %}
+        </form>
+    </div>
+</div>
+{% endblock helpdesk_body %}
diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html
index 261c8a47..a1b6bb7b 100644
--- a/helpdesk/templates/helpdesk/ticket.html
+++ b/helpdesk/templates/helpdesk/ticket.html
@@ -32,23 +32,20 @@
 
 {% if ticket.followup_set.all %}
 {% load ticket_to_link %}
-<div class="panel panel-primary">
-    <div class="panel-heading">
-        <h4><i class="fa fa-clock-o fa-fw fa-lg"></i>&nbsp;{% trans "Follow-Ups" %}</h4>
-    </div>
-    <!-- /.panel-heading -->
-    <div class="panel-body">
-        <ul class="timeline">
-        {% for followup in ticket.followup_set.all %}
-            <li{% if not followup.user %} class="timeline-inverted"{% endif %}>
-                <div class="timeline-badge{% if forloop.first %} success{% endif %}"><i class="fa {% if forloop.first %}fa-plus-square{% else %}{% if followup.ticketchange_set.all %}fa-gears{% else %}{% if followup.user %}fa-share{% else %}fa-reply{% endif %}{% endif %}{% endif %}"></i></div>
-                <div class="timeline-panel">
-                    <div class="timeline-heading">
-                        <h4 class="timeline-title">{{ followup.title }}</h4>
-                        <p><small class="text-muted"><i class="fa fa-clock-o"></i>&nbsp;<span class='byline text-info'>{% if followup.user %}by {{ followup.user }}{% endif %} <span title='{{ followup.date|date:"r" }}'>{{ followup.date|naturaltime }}</span>{% if not followup.public %} <span class='private'>({% trans "Private" %})</span>{% endif %}</span></small></p>
+    <div class="card mb-3">
+        <div class="card-header"><i class="fas fa-clock fa-fw fa-lg"></i>&nbsp;{% trans "Follow-Ups" %}</div>
+        <div class="card-body">
+            <div class="list-group">
+            {% for followup in ticket.followup_set.all %}
+                <div class="list-group-item list-group-item-action">
+                    <div class="d-flex w-100 justify-content-between">
+                        <h5 class="mb-1">{{ followup.title }}</h5>
+                        <small><i class="fas fa-clock"></i>&nbsp;<span class='byline text-info'>{% if followup.user %}by {{ followup.user }},{% endif %} <span title='{{ followup.date|date:"r" }}'>{{ followup.date|naturaltime }}</span>{% if not followup.public %} <span class='private'>({% trans "Private" %})</span>{% endif %}</span></small>
                     </div>
-                    <div class="timeline-body">
-                        <p>{% if followup.comment %}{{ followup.comment|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}{% endif %}</p>
+                    <p class="mb-1">
+                        {% if followup.comment %}
+                            <p>{{ followup.comment|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}</p>
+                        {% endif %}
                         {% for change in followup.ticketchange_set.all %}
                             {% if forloop.first %}<div class='changes'><ul>{% endif %}
                             <li>{% blocktrans with change.field as field and change.old_value as old_value and change.new_value as new_value %}Changed {{ field }} from {{ old_value }} to {{ new_value }}.{% endblocktrans %}</li>
@@ -57,44 +54,44 @@
                         {% for attachment in followup.attachment_set.all %}{% if forloop.first %}<hr><div class='attachments'><ul>{% endif %}
                             <li><a href='{{ attachment.file.url }}'>{{ attachment.filename }}</a> ({{ attachment.mime_type }}, {{ attachment.size|filesizeformat }})
                             {% if followup.user and request.user == followup.user %}
-                            <a href='{% url 'helpdesk:attachment_del' ticket.id attachment.id %}'><button class="btn btn-danger btn-xs"><i class="fa fa-trash"></i>&nbsp;{% trans 'Delete' %}</button></a>
+                            <a href='{% url 'helpdesk:attachment_del' ticket.id attachment.id %}'><button class="btn btn-danger btn-sm"><i class="fas fa-trash"></i>&nbsp;{% trans 'Delete' %}</button></a>
                             {% endif %}
                             </li>
                             {% if forloop.last %}</ul></div>{% endif %}
                         {% endfor %}
-<!--- ugly long test to suppress the following if it will be empty, to save vertical space -->
-{% with possible=helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP %}
-    {% if  possible and followup.user and request.user == followup.user and not followup.ticketchange_set.all or  possible and user.is_superuser and helpdesk_settings.HELPDESK_SHOW_DELETE_BUTTON_SUPERUSER_FOLLOW_UP %}
-                        <hr>
-                        <div class="btn-group">
+                    </p>
+                    <!--- ugly long test to suppress the following if it will be empty, to save vertical space -->
+                    {% with possible=helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP %}
+                        {% if  possible and followup.user and request.user == followup.user and not followup.ticketchange_set.all or  possible and user.is_superuser and helpdesk_settings.HELPDESK_SHOW_DELETE_BUTTON_SUPERUSER_FOLLOW_UP %}
+                        <small>
                             {% if helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP %}
                                 {% if followup.user and request.user == followup.user and not followup.ticketchange_set.all %}
-                                <a href="{% url 'helpdesk:followup_edit' ticket.id followup.id %}" class='followup-edit'><button type="button" class="btn btn-warning btn-xs"><i class="fa fa-edit"></i>&nbsp;{% trans "Edit" %}</button></a>
+                                    <a href="{% url 'helpdesk:followup_edit' ticket.id followup.id %}" class='followup-edit'><button type="button" class="btn btn-warning btn-sm"><i class="fas fa-edit"></i>&nbsp;{% trans "Edit" %}</button></a>
                                 {% endif %}
                             {% endif %}
                             {% if user.is_superuser and helpdesk_settings.HELPDESK_SHOW_DELETE_BUTTON_SUPERUSER_FOLLOW_UP %}
-                                <a href="{% url 'helpdesk:followup_delete' ticket.id followup.id %}" class='followup-edit'><button type="button" class="btn btn-warning btn-xs"><i class="fa fa-trash"></i>&nbsp;{% trans "Delete" %}</button></a>
+                                <a href="{% url 'helpdesk:followup_delete' ticket.id followup.id %}" class='followup-edit'><button type="button" class="btn btn-warning btn-sm"><i class="fas fa-trash"></i>&nbsp;{% trans "Delete" %}</button></a>
                             {% endif %}
-                        </div>
-{% endif %}{% endwith %}
-                    </div>
+                        </small>
+                    {% endif %}{% endwith %}
                 </div>
-            </li>
-        {% endfor %}
-
-        </ul>
+                <!-- /.list-group-item -->
+            {% endfor %}
+            </div>
+            <!-- /.list-group -->
+        </div>
+        <!-- /.card-body -->
     </div>
-    <!-- /.panel-body -->
-</div>
-<!-- /.panel -->
+    <!-- /.card -->
 
 {% endif %}
 {% if helpdesk_settings.HELPDESK_TRANSLATE_TICKET_COMMENTS %}
 </div>
 {% endif %}
 
-<div id='add-followup' class="well">
-<h3>{% trans "Respond to this ticket" %}</h3>
+<div class="card mb-3">
+    <div class="card-header">{% trans "Respond to this ticket" %}</div>
+    <div class="card-body">
 
 <form method='post' action='update/' enctype='multipart/form-data'>
 
@@ -203,6 +200,7 @@
 
 {% csrf_token %}</form>
 
+    </div>
 </div>
 {% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html
index 82c1aba2..72f2c5d1 100644
--- a/helpdesk/templates/helpdesk/ticket_desc_table.html
+++ b/helpdesk/templates/helpdesk/ticket_desc_table.html
@@ -1,95 +1,85 @@
 {% load i18n humanize ticket_to_link %}
 {% load static from staticfiles %}
 
-<div class="row">
-                <div class="col-lg-12">
-                    <div class="panel panel-primary">
-                        <div class="panel-heading">
-                            {% trans "Ticket Summary" %}
-                        </div>
-                        <!-- /.panel-heading -->
-                        <div class="panel-body">
-                            <div class="table-responsive">
-                                <table class="table table-striped table-bordered table-hover">
-                                    <thead>
-                                        <tr class='row_tablehead'><td colspan='2'><h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</h3> <span class='ticket_toolbar'>
-                                            <a href="{% url 'helpdesk:edit' ticket.id %}" class="ticket-edit"><button class="btn btn-warning btn-xs"><i class="fas fa-pencil-alt"></i> {% trans "Edit" %}</button></a>
-                                        | <a href="{% url 'helpdesk:delete' ticket.id %}" class="ticket-delete"><button class="btn btn-danger btn-xs"><i class="fas fa-trash-alt"></i> {% trans "Delete" %}</button></a>
-                                        {% if ticket.on_hold %} | <a href="{% url 'helpdesk:unhold' ticket.id %}" class="ticket-hold"><button class="btn btn-warning btn-xs"><i class="fas fa-play"></i> {% trans "Unhold" %}</button></a>{% else %} | <a href="{% url 'helpdesk:hold' ticket.id %}" class="ticket-hold"><button class="btn btn-warning btn-xs"><i class="fas fa-pause"></i> {% trans "Hold" %}</button></a>{% endif %}
-                                        </span></td></tr>
-                                    <tr><th colspan='2'>{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}</th></tr>
-                                    </thead>
-                                    <tbody>
-                                        {% for customfield in ticket.ticketcustomfieldvalue_set.all %}
-                                        <tr>
-                                            <th>{{ customfield.field.label }}</th>
-                                            <td>{% ifequal customfield.field.data_type "url" %}<a href='{{ customfield.value }}'>{{ customfield.value }}</a>{% else %}{{ customfield.value }}{% endifequal %}</td>
-                                        </tr>{% endfor %}
-                                        <tr>
-                                            <th colspan='2'>{% trans "Description" %}</th>
-                                        </tr>
-                                        <tr>
-                                            <td id="ticket-description" colspan='2'>{{ ticket.description|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}</td>
-                                        </tr>
+<div class="card mb-3">
+    <div class="card-header">
+        {% trans "Ticket Summary" %}
+    </div>
+    <div class="card-body">
+        <div class="table-responsive">
+            <table class="table table-striped table-bordered table-hover">
+                <thead>
+                    <tr class='row_tablehead'><td colspan='2'><h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</h3> <span class='ticket_toolbar'>
+                        <a href="{% url 'helpdesk:edit' ticket.id %}" class="ticket-edit"><button class="btn btn-warning btn-sm"><i class="fas fa-pencil-alt"></i> {% trans "Edit" %}</button></a>
+                    | <a href="{% url 'helpdesk:delete' ticket.id %}" class="ticket-delete"><button class="btn btn-danger btn-sm"><i class="fas fa-trash-alt"></i> {% trans "Delete" %}</button></a>
+                    {% if ticket.on_hold %} | <a href="{% url 'helpdesk:unhold' ticket.id %}" class="ticket-hold"><button class="btn btn-warning btn-sm"><i class="fas fa-play"></i> {% trans "Unhold" %}</button></a>{% else %} | <a href="{% url 'helpdesk:hold' ticket.id %}" class="ticket-hold"><button class="btn btn-warning btn-sm"><i class="fas fa-pause"></i> {% trans "Hold" %}</button></a>{% endif %}
+                    </span></td></tr>
+                    <tr><th colspan='2'>{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}</th></tr>
+                </thead>
+                <tbody>
+                    {% for customfield in ticket.ticketcustomfieldvalue_set.all %}
+                    <tr>
+                        <th>{{ customfield.field.label }}</th>
+                        <td>{% ifequal customfield.field.data_type "url" %}<a href='{{ customfield.value }}'>{{ customfield.value }}</a>{% else %}{{ customfield.value }}{% endifequal %}</td>
+                    </tr>{% endfor %}
+                    <tr>
+                        <th colspan='2'>{% trans "Description" %}</th>
+                    </tr>
+                    <tr>
+                        <td id="ticket-description" colspan='2'>{{ ticket.description|force_escape|urlizetrunc:50|num_to_link|linebreaksbr }}</td>
+                    </tr>
 
-                                        {% if ticket.resolution %}<tr>
-                                            <th colspan='2'>{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} <a href='?close'><button type="button" class="btn btn-warning btn-xs">{% trans "Accept and Close" %}</button></a>{% endifequal %}</th>
-                                        </tr>
-                                        <tr>
-                                            <td colspan='2'>{{ ticket.resolution|force_escape|urlizetrunc:50|linebreaksbr }}</td>
-                                        </tr>{% endif %}
+                    {% if ticket.resolution %}<tr>
+                        <th colspan='2'>{% trans "Resolution" %}{% ifequal ticket.get_status_display "Resolved" %} <a href='?close'><button type="button" class="btn btn-warning btn-sm">{% trans "Accept and Close" %}</button></a>{% endifequal %}</th>
+                    </tr>
+                    <tr>
+                        <td colspan='2'>{{ ticket.resolution|force_escape|urlizetrunc:50|linebreaksbr }}</td>
+                    </tr>{% endif %}
+                    <tr>
+                        <th>{% trans "Due Date" %}</th>
+                        <td>{{ ticket.due_date|date:"r" }} ({{ ticket.due_date|naturaltime }})</td>
+                    </tr>
+                    <tr>
+                        <th>{% trans "Submitted On" %}</th>
+                        <td>{{ ticket.created|date:"r" }} ({{ ticket.created|naturaltime }})</td>
+                    </tr>
+                    <tr>
+                        <th>{% trans "Assigned To" %}</th>
+                        <td>{{ ticket.get_assigned_to }}{% ifequal ticket.get_assigned_to _('Unassigned') %} <strong><a href='?take'><button type="button" class="btn btn-primary btn-sm"><i class="fas fa-hand-paper"></i>&nbsp;{% trans "Take" %}</button></a></strong>{% endifequal %}</td>
+                    </tr>
+                    <tr>
+                        <th>{% trans "Submitter E-Mail" %}</th>
+                        <td>{{ ticket.submitter_email }}
+                        {% if user.is_superuser %} {% if submitter_userprofile_url %}<strong><a href='{{submitter_userprofile_url}}'><button type="button" class="btn btn-primary btn-sm"><i class="fas fa-address-book"></i>&nbsp;{% trans "Profile" %}</button></a></strong>{% endif %}
+                        <strong><a href='{% url 'helpdesk:email_ignore_add' %}?email={{ ticket.submitter_email }}'><button type="button" class="btn btn-warning btn-sm"><i class="fas fa-eye-slash"></i>&nbsp;{% trans "Ignore" %}</button></a></strong>{% endif %}</td>
+                    </tr>
+                    <tr>
+                        <th>{% trans "Priority" %}</th>
+                        <td>{{ ticket.get_priority_display }}</td>
+                    </tr>
+                    <tr>
+                        <th>{% trans "Copies To" %}</th>
+                        <td>{{ ticketcc_string }} <a data-toggle='tooltip' href='{% url 'helpdesk:ticket_cc' ticket.id %}' title='{% trans "Click here to add / remove people who should receive an e-mail whenever this ticket is updated." %}'><strong><button type="button" class="btn btn-warning btn-sm"><i class="fa fa-share"></i>&nbsp;{% trans "Manage" %}</button></strong></a>{% if SHOW_SUBSCRIBE %}, <strong><a data-toggle='tooltip' href='?subscribe' title='{% trans "Click here to subscribe yourself to this ticket, if you want to receive an e-mail whenever this ticket is updated." %}'><button type="button" class="btn btn-warning btn-sm"><i class="fas fa-rss-square"></i>&nbsp;{% trans "Subscribe" %}</button></a></strong>{% endif %}</td>
+                    </tr>
 
-                                        <tr>
-                                            <th>{% trans "Due Date" %}</th>
-                                            <td>{{ ticket.due_date|date:"r" }} ({{ ticket.due_date|naturaltime }})</td>
-                                        </tr>
-                                        <tr>
-                                            <th>{% trans "Submitted On" %}</th>
-                                            <td>{{ ticket.created|date:"r" }} ({{ ticket.created|naturaltime }})</td>
-                                        </tr>
-
-                                        <tr>
-                                            <th>{% trans "Assigned To" %}</th>
-                                            <td>{{ ticket.get_assigned_to }}{% ifequal ticket.get_assigned_to _('Unassigned') %} <strong><a href='?take'><button type="button" class="btn btn-primary btn-xs"><i class="fas fa-hand-paper"></i>&nbsp;{% trans "Take" %}</button></a></strong>{% endifequal %}</td>
-                                        </tr>
-
-                                        <tr>
-                                            <th>{% trans "Submitter E-Mail" %}</th>
-                                            <td>{{ ticket.submitter_email }}
-                                            {% if user.is_superuser %} {% if submitter_userprofile_url %}<strong><a href='{{submitter_userprofile_url}}'><button type="button" class="btn btn-primary btn-xs"><i class="fas fa-address-book"></i>&nbsp;{% trans "Profile" %}</button></a></strong>{% endif %}
-                                            <strong><a href='{% url 'helpdesk:email_ignore_add' %}?email={{ ticket.submitter_email }}'><button type="button" class="btn btn-warning btn-xs"><i class="fas fa-eye-slash"></i>&nbsp;{% trans "Ignore" %}</button></a></strong>{% endif %}</td>
-                                        </tr>
-
-                                        <tr>
-                                            <th>{% trans "Priority" %}</th>
-                                            <td>{{ ticket.get_priority_display }}</td>
-                                        </tr>
-
-                                        <tr>
-                                            <th>{% trans "Copies To" %}</th>
-                                            <td>{{ ticketcc_string }} <a data-toggle='tooltip' href='{% url 'helpdesk:ticket_cc' ticket.id %}' title='{% trans "Click here to add / remove people who should receive an e-mail whenever this ticket is updated." %}'><strong><button type="button" class="btn btn-warning btn-xs"><i class="fa fa-share"></i>&nbsp;{% trans "Manage" %}</button></strong></a>{% if SHOW_SUBSCRIBE %}, <strong><a data-toggle='tooltip' href='?subscribe' title='{% trans "Click here to subscribe yourself to this ticket, if you want to receive an e-mail whenever this ticket is updated." %}'><button type="button" class="btn btn-warning btn-xs"><i class="fas fa-rss-square"></i>&nbsp;{% trans "Subscribe" %}</button></a></strong>{% endif %}</td>
-                                        </tr>
-
-                                        <tr>
-                                            <th>{% trans "Dependencies" %}</th>
-                                            <td>{% for dep in ticket.ticketdependency.all %}
-                                                {% if forloop.first %}<p>{% trans "This ticket cannot be resolved until the following ticket(s) are resolved" %}</p><ul>{% endif %}
-                                                    <li><a href='{{ dep.depends_on.get_absolute_url }}'>{{ dep.depends_on.ticket }} {{ dep.depends_on.title }}</a> ({{ dep.depends_on.get_status_display }}) <a href='{% url 'helpdesk:ticket_dependency_del' ticket.id dep.id %}'><button type="button" class="btn btn-warning btn-xs"><i class="fas fa-trash"></i>&nbsp;{% trans "Remove Dependency" %}</button></a></li>
-                                                {% if forloop.last %}</ul>{% endif %}
-                                                {% empty %}
-                                                <p>{% trans "This ticket has no dependencies." %}</p>
-                                                {% endfor %}
-                                                <p><a data-toggle='tooltip' href='{% url 'helpdesk:ticket_dependency_add' ticket.id %}' title="{% trans "Click on 'Add Dependency', if you want to make this ticket dependent on another ticket. A ticket may not be closed until all tickets it depends on are closed." %}"><button type="button" class="btn btn-primary btn-xs"><i class="fas fa-child"></i>&nbsp;{% trans "Add Dependency" %}</button></a></p>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <!-- /.table-responsive -->
-                        </div>
-                        <!-- /.panel-body -->
-                    </div>
-                    <!-- /.panel -->
-                </div>
-            </div>
+                    <tr>
+                        <th>{% trans "Dependencies" %}</th>
+                        <td>{% for dep in ticket.ticketdependency.all %}
+                            {% if forloop.first %}<p>{% trans "This ticket cannot be resolved until the following ticket(s) are resolved" %}</p><ul>{% endif %}
+                                <li><a href='{{ dep.depends_on.get_absolute_url }}'>{{ dep.depends_on.ticket }} {{ dep.depends_on.title }}</a> ({{ dep.depends_on.get_status_display }}) <a href='{% url 'helpdesk:ticket_dependency_del' ticket.id dep.id %}'><button type="button" class="btn btn-warning btn-sm"><i class="fas fa-trash"></i>&nbsp;{% trans "Remove Dependency" %}</button></a></li>
+                                {% if forloop.last %}</ul>{% endif %}
+                            {% empty %}
+                            <p>{% trans "This ticket has no dependencies." %}</p>
+                            {% endfor %}
+                            <p><a data-toggle='tooltip' href='{% url 'helpdesk:ticket_dependency_add' ticket.id %}' title="{% trans "Click on 'Add Dependency', if you want to make this ticket dependent on another ticket. A ticket may not be closed until all tickets it depends on are closed." %}"><button type="button" class="btn btn-primary btn-sm"><i class="fas fa-child"></i>&nbsp;{% trans "Add Dependency" %}</button></a></p>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <!-- /.table-responsive -->
+    </div>
+    <!-- /.card-body -->
+</div>
+<!-- /.card -->
 
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index 30e36e0c..b421cc70 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -59,7 +59,7 @@
                             <option value='Keywords'>{% trans "Keywords" %}</option>
                             <option value='Dates'>{% trans "Date Range" %}</option>
                         </select>
-                        <button class='btn btn-success btn-xs' id='filterBuilderButton'><i class="fas fa-plus-circle"></i></button>
+                        <button class='btn btn-success btn-sm' id='filterBuilderButton'><i class="fas fa-plus-circle"></i></button>
                     {% csrf_token %}</form>
                             
                     <form method='get' action='./'>
@@ -88,7 +88,7 @@
                         <label for='id_sortreverse'>{% trans "Reverse" %}</label>
                         <input type='checkbox' name='sortreverse' id='id_sortreverse'{% if query_params.sortreverse %} checked='checked'{% endif %} />
                         <p class='filterHelp'>{% trans "Ordering applied to tickets" %}</p>
-                        <button class='filterBuilderRemove btn btn-danger btn-xs'><i class="fas fa-trash-alt"></i></button>
+                        <button class='filterBuilderRemove btn btn-danger btn-sm'><i class="fas fa-trash-alt"></i></button>
                         </div>
 
                         <div class='thumbnail filterBox{% if query_params.filtering.assigned_to__id__in %} filterBoxShow{% endif %}' id='filterBoxOwner'>
@@ -101,32 +101,32 @@
                             {% endfor %}
                         </select>
                         <p class='filterHelp'>{% trans "Ctrl-Click to select multiple options" %}</p>
-                        <button class='filterBuilderRemove btn btn-danger btn-xs'><i class="fas fa-trash-alt"></i></button></a>
+                        <button class='filterBuilderRemove btn btn-danger btn-sm'><i class="fas fa-trash-alt"></i></button></a>
                         </div>
 
                         <div class='thumbnail filterBox{% if query_params.filtering.queue__id__in %} filterBoxShow{% endif %}' id='filterBoxQueue'>
                         <label for='id_queues'>{% trans "Queue(s)" %}</label><select id='id_queues' name='queue' multiple='selected' size='5'>{% for q in queue_choices %}<option value='{{ q.id }}'{% if q.id|in_list:query_params.filtering.queue__id__in %} selected='selected'{% endif %}>{{ q.title }}</option>{% endfor %}</select>
                         <p class='filterHelp'>{% trans "Ctrl-click to select multiple options" %}</p>
-                        <button class='filterBuilderRemove btn btn-danger btn-xs'><i class="fas fa-trash-alt"></i></button>
+                        <button class='filterBuilderRemove btn btn-danger btn-sm'><i class="fas fa-trash-alt"></i></button>
                         </div>
 
                         <div class='thumbnail filterBox{% if query_params.filtering.status__in %} filterBoxShow{% endif %}' id='filterBoxStatus'>
                         <label for='id_statuses'>{% trans "Status(es)" %}</label><select id='id_statuses' name='status' multiple='selected' size='5'>{% for s in status_choices %}<option value='{{ s.0 }}'{% if s.0|in_list:query_params.filtering.status__in %} selected='selected'{% endif %}>{{ s.1 }}</option>{% endfor %}</select>
                         <p class='filterHelp'>{% trans "Ctrl-click to select multiple options" %}</p>
-                        <button class='filterBuilderRemove btn btn-danger btn-xs'><i class="fas fa-trash-alt"></i></button>
+                        <button class='filterBuilderRemove btn btn-danger btn-sm'><i class="fas fa-trash-alt"></i></button>
                         </div>
 
                         <div class='thumbnail filterBox{% if query_params.filtering.created__gte or query_params.filtering.created__lte %} filterBoxShow{% endif %}' id='filterBoxDates'>
                         <label for='id_date_from'>{% trans "Date (From)" %}</label><input type='text' name='date_from' value='{{ query_params.filtering.created__gte }}' id='id_date_from' />
                         <label for='id_date_to'>{% trans "Date (To)" %}</label><input type='text' name='date_to' value='{{ query_params.filtering.created__lte }}' id='id_date_to' />
                         <p class='filterHelp'>{% trans "Use YYYY-MM-DD date format, eg 2018-01-30" %}</p>
-                        <button class='filterBuilderRemove btn btn-danger btn-xs'><i class="fas fa-trash-alt"></i></button>
+                        <button class='filterBuilderRemove btn btn-danger btn-sm'><i class="fas fa-trash-alt"></i></button>
                         </div>
 
                         <div class='thumbnail filterBox{% if query %} filterBoxShow{% endif %}' id='filterBoxKeywords'>
                         <label for='id_query'>{% trans "Keywords" %}</label><input type='text' name='q' value='{{ query }}' id='id_query' />
                         <p class='filterHelp'>{% trans "Keywords are case-insensitive, and will be looked for in the title, body and submitter fields." %}</p>
-                        <button class='filterBuilderRemove btn btn-danger btn-xs'><i class="fas fa-trash-alt"></i></button>
+                        <button class='filterBuilderRemove btn btn-danger btn-sm'><i class="fas fa-trash-alt"></i></button>
                         </div>
                         <hr style='clear: both;' />
                         <input class="btn btn-primary" type='submit' value='{% trans "Apply Filter" %}' />