diff --git a/views/_news.erb b/views/_news.erb
index f0b4e4e1..a9de6811 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -114,9 +114,9 @@
 
 <div class="content">
   <% if @page_count > 1 %>
-    <div class="txt-Center content eps">
+    <div class="txt-Center content eps pagination">
       <% if @current_page != 1 %>
-        <a href="#" onclick="getPage(<%= @current_page - 1 %>); return false"><i class="icon-arrow-left" style="text-decoration: none"></i></a>&nbsp;
+        <a href="#" onclick="getPage(<%= @current_page - 1 %>); return false"><i class="fa fa-arrow-left arrow"></i></a>&nbsp;
       <% end %>
 
       <% 1.upto(@page_count) do |num| %>
@@ -129,7 +129,7 @@
       <% end %>
 
       <% if @current_page != @page_count %>
-        <a href="#" onclick="getPage(<%= @current_page + 1 %>); return false"><i class="icon-arrow-right" style="text-decoration: none"></i></a>
+        <a href="#" onclick="getPage(<%= @current_page + 1 %>); return false"><i class="fa fa-arrow-right arrow"></i></a>
       <% end %>
     </div>
   <% end %>
diff --git a/views/browse.erb b/views/browse.erb
index 4e67ba99..cddda5e7 100644
--- a/views/browse.erb
+++ b/views/browse.erb
@@ -75,7 +75,7 @@
         <div class="site-info">
           <div style="float: left">
             <a href="/site/<%= site.username %>" title="Profile">
-              <i class="icon-user"></i>
+              <i class="fa fa-user"></i>
               <%= site.username %>
             </a>
           </div>
diff --git a/views/dashboard.erb b/views/dashboard.erb
index ae62c2d0..3a1afcb2 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -143,13 +143,13 @@
             </a>
             <div class="overlay">
               <% if file[:is_editable] %>
-                <a href="/site_files/text_editor<%= file[:path] %>"><i class="icon-edit" title="Edit"> Edit</i></a>
+                <a href="/site_files/text_editor<%= file[:path] %>"><i class="fa fa-edit" title="Edit"> Edit</i></a>
               <% end %>
               <% if file[:is_directory] %>
-                <a href="?dir=<%= Rack::Utils.escape file[:path] %>"><i class="icon-edit" title="Manage"> Manage</i></a>
+                <a href="?dir=<%= Rack::Utils.escape file[:path] %>"><i class="fa fa-edit" title="Manage"> Manage</i></a>
               <% end %>
               <% if !file[:is_root_index] %>
-                <a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="icon-trash" title="Delete"> Delete</i></a>
+                <a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="fa fa-trash" title="Delete"> Delete</i></a>
               <% end %>
               <a class="link-overlay" href="http://<%= current_site.username %>.neocities.org<%= file[:path] %>" title="View <%= file[:path] %>" target="_blank"></a>
             </div>
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 53b100a8..856765ce 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -74,19 +74,19 @@
   <div class="row">
     <div class="col col-33">
       <div class="txt-Center">
-        <a class="btn-Action" href="/dashboard" <i class="icon-remove"></i>&nbsp;&nbsp;Finish Without Saving</a>
+        <a class="btn-Action" href="/dashboard"><i class="fa fa-remove"></i>&nbsp;&nbsp;Finish Without Saving</a>
       </div>
     </div>
 
     <div class="col col-33">
       <div class="txt-Center">
-        <a class="btn-Action" href="#" onclick="saveTextFile(false); return false" <i class="icon-save"></i>&nbsp;&nbsp;Save Changes</a>
+        <a class="btn-Action" href="#" onclick="saveTextFile(false); return false"><i class="fa fa-save"></i>&nbsp;&nbsp;Save Changes</a>
       </div>
     </div>
 
     <div class="col col-33">
       <div class="txt-Center">
-        <a class="btn-Action" href="#" onclick="saveTextFile(true); return false" <i class="icon-save"></i>&nbsp;&nbsp;Save and Finish</a>
+        <a class="btn-Action" href="#" onclick="saveTextFile(true); return false"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Finish</a>
       </div>
     </div>
   </div>