diff --git a/Teknik/Areas/Contact/Views/Contact/Index.cshtml b/Teknik/Areas/Contact/Views/Contact/Index.cshtml
index 531e166..9278e6f 100644
--- a/Teknik/Areas/Contact/Views/Contact/Index.cshtml
+++ b/Teknik/Areas/Contact/Views/Contact/Index.cshtml
@@ -31,7 +31,7 @@
                                 </label>
                                 <div class="input-group">
                                     <span class="input-group-addon">
-                                        <span class="glyphicon glyphicon-envelope"></span>
+                                        <span class="fa fa-envelope"></span>
                                     </span>
                                     <input type="email" class="form-control" id="Email" name="Email" placeholder="Enter email" required="required" value="@((User.Identity.IsAuthenticated) ? User.Identity.Name + "@" + Config.Host : string.Empty)" />
                                 </div>
@@ -68,7 +68,7 @@
         </div>
         <div class="col-md-4">
             <!form>
-                <legend><span class="glyphicon glyphicon-globe"></span> Where to find us</legend>
+                <legend><span class="fa fa-globe"></span> Where to find us</legend>
                 <address>
                     <strong>Customer Support</strong><br>
                     <a href="mailto:@Config.SupportEmail">@Config.SupportEmail</a>
diff --git a/Teknik/Areas/Error/Views/Error/Exception.cshtml b/Teknik/Areas/Error/Views/Error/Exception.cshtml
index 0a7adb1..9702979 100644
--- a/Teknik/Areas/Error/Views/Error/Exception.cshtml
+++ b/Teknik/Areas/Error/Views/Error/Exception.cshtml
@@ -13,7 +13,7 @@
                     <p>Uh oh!  You aren't supposed to be seeing this.  Something went horribly wrong.</p>
                     <div class="error-actions">
                         <a href="@Url.SubRouteUrl("www", "Home.Index")" class="btn btn-default btn-lg">
-                            <span class="glyphicon glyphicon-home"></span>
+                            <span class="fa fa-home"></span>
                             Take Me Home
                         </a>
                         @if (Model != null && Model.Exception != null)
diff --git a/Teknik/Areas/Error/Views/Error/Http401.cshtml b/Teknik/Areas/Error/Views/Error/Http401.cshtml
index 9a17c10..1971810 100644
--- a/Teknik/Areas/Error/Views/Error/Http401.cshtml
+++ b/Teknik/Areas/Error/Views/Error/Http401.cshtml
@@ -11,11 +11,11 @@
                 <br />
                 <div class="error-actions">
                     <a href="@Url.SubRouteUrl("www", "Home.Index")" class="btn btn-primary btn-lg">
-                        <span class="glyphicon glyphicon-home"></span>
+                        <span class="fa fa-home"></span>
                         Take Me Home
                     </a>
                     <a href="@Url.SubRouteUrl("contact", "Contact.Index")" class="btn btn-default btn-lg">
-                        <span class="glyphicon glyphicon-envelope"></span> 
+                        <span class="fa fa-envelope"></span> 
                         Contact Support 
                     </a>
                 </div>
diff --git a/Teknik/Areas/Error/Views/Error/Http403.cshtml b/Teknik/Areas/Error/Views/Error/Http403.cshtml
index ad3c47c..832b7c1 100644
--- a/Teknik/Areas/Error/Views/Error/Http403.cshtml
+++ b/Teknik/Areas/Error/Views/Error/Http403.cshtml
@@ -12,11 +12,11 @@
                 <br />
                 <div class="error-actions">
                     <a href="@Url.SubRouteUrl("www", "Home.Index")" class="btn btn-primary btn-lg">
-                        <span class="glyphicon glyphicon-home"></span>
+                        <span class="fa fa-home"></span>
                         Take Me Home
                     </a>
                     <a href="@Url.SubRouteUrl("contact", "Contact.Index")" class="btn btn-default btn-lg">
-                        <span class="glyphicon glyphicon-envelope"></span> 
+                        <span class="fa fa-envelope"></span> 
                         Contact Support 
                     </a>
                 </div>
diff --git a/Teknik/Areas/Error/Views/Error/Http404.cshtml b/Teknik/Areas/Error/Views/Error/Http404.cshtml
index e2a7b60..a0d5171 100644
--- a/Teknik/Areas/Error/Views/Error/Http404.cshtml
+++ b/Teknik/Areas/Error/Views/Error/Http404.cshtml
@@ -12,11 +12,11 @@
                 <br />
                 <div class="error-actions">
                     <a href="@Url.SubRouteUrl("www", "Home.Index")" class="btn btn-primary btn-lg">
-                        <span class="glyphicon glyphicon-home"></span>
+                        <span class="fa fa-home"></span>
                         Take Me Home
                     </a>
                     <a href="@Url.SubRouteUrl("contact", "Contact.Index")" class="btn btn-default btn-lg">
-                        <span class="glyphicon glyphicon-envelope"></span> 
+                        <span class="fa fa-envelope"></span> 
                         Contact Support 
                     </a>
                 </div>
diff --git a/Teknik/Areas/Error/Views/Error/Http500.cshtml b/Teknik/Areas/Error/Views/Error/Http500.cshtml
index 79d1aee..a75a341 100644
--- a/Teknik/Areas/Error/Views/Error/Http500.cshtml
+++ b/Teknik/Areas/Error/Views/Error/Http500.cshtml
@@ -14,7 +14,7 @@
                     <p>Sorry, a server error occured.  Please contact an Administrator about this error.</p>
                     <div class="error-actions">
                         <a href="@Url.SubRouteUrl("www", "Home.Index")" class="btn btn-default btn-lg">
-                            <span class="glyphicon glyphicon-home"></span>
+                            <span class="fa fa-home"></span>
                             Take Me Home
                         </a>
                         @if (Model != null && Model.Exception != null)
diff --git a/Teknik/Areas/Error/Views/Error/HttpGeneral.cshtml b/Teknik/Areas/Error/Views/Error/HttpGeneral.cshtml
index 600ed01..e95f468 100644
--- a/Teknik/Areas/Error/Views/Error/HttpGeneral.cshtml
+++ b/Teknik/Areas/Error/Views/Error/HttpGeneral.cshtml
@@ -12,9 +12,9 @@
                 <br />
                 <div class="error-actions">
                     <a href="@Url.SubRouteUrl("www", "Home.Index")" class="btn btn-primary btn-lg">
-                        <span class="glyphicon glyphicon-home"></span>
+                        <span class="fa fa-home"></span>
                         Take Me Home
-                    </a><a href="@Url.SubRouteUrl("contact", "Contact.Index")" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-envelope"></span> Contact Support </a>
+                    </a><a href="@Url.SubRouteUrl("contact", "Contact.Index")" class="btn btn-default btn-lg"><span class="fa fa-envelope"></span> Contact Support </a>
                 </div>
             </div>
         </div>