diff --git a/app/views/hosts/_header.html.erb b/app/views/hosts/_header.html.erb
index 505c035..3d78b94 100644
--- a/app/views/hosts/_header.html.erb
+++ b/app/views/hosts/_header.html.erb
@@ -1,31 +1,19 @@
-<div class="row right">
-  <% if @host.can_be_disabled? %>
-    <%= link_to 'Disable client', disable_host_path(@host), method: :post,
-      data: { confirm: 'This will disable the client. Are you sure?' },
-      class: "btn btn-warning", role: "button" %>
-  <% end %>
-
-  <%= link_to 'Remove client', host_path(@host), method: :delete,
-    data: { confirm: 'This will remove your client from the Backup service. Are you sure?' },
-    class: "btn btn-danger", role: "button" %>
-</div>
-
 <h2>Configuration for <%= @host.name %>
   <%= host_status_label(@host) %>
 </h2>
 
 <br/>
 
 <ul class="nav nav-tabs" role='tablist'>
   <li role="presentation" class="active">
     <a aria-controls='details'  role='tab' data-toggle='tab' href="#details">Client Details</a>
   </li>
   <li role="presentation">
     <a aria-controls='jobs' role='tab' data-toggle='tab' href="#jobs">Jobs</a>
   </li>
   <li role="presentation">
     <a aria-controls='fd-config'role='tab' data-toggle='tab' href="#fd-config">FD Config</a>
   </li>
 </ul>
 
 <br/>
diff --git a/app/views/hosts/_host_details.html.erb b/app/views/hosts/_host_details.html.erb
index 32b319c..54e0e8f 100644
--- a/app/views/hosts/_host_details.html.erb
+++ b/app/views/hosts/_host_details.html.erb
@@ -1,79 +1,105 @@
 <div class="col-xs-4">
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <tr>
         <td><b>Name</b></td>
         <td><%= @host.name %></td>
       </tr>
       <tr>
         <td><b>FQDN</b></td>
         <td><%= @host.fqdn %></td>
       </tr>
       <tr>
         <td><b>FDPort</b></td>
         <td><%= @host.port %></td>
       </tr>
       <tr>
         <td><b>Token</b></td>
         <td>********</td>
       </tr>
       <tr>
         <td data-toggle="tooltip" title="Defines the length of time that the File records will be available">
           <b>File Retention</b> <label class="glyphicon glyphicon-question-sign"></label>
         </td>
         <td><%= @host.file_retention %> days</td>
       </tr>
       <tr>
         <td data-toggle="tooltip" title="Defines the length of time that the Job records will be available">
           <b>Job Retention</b> <label class="glyphicon glyphicon-question-sign"></label>
         </td>
         <td><%= @host.job_retention %> days</td>
       </tr>
       <tr>
         <td data-toggle="tooltip" title="Determines if a client is backups approved">
           <b>Verified</b> <label class="glyphicon glyphicon-question-sign"></label>
         </td>
         <td>
           <% if @host.verified? %>
             <span class="label label-success">yes</span>
           <% else %>
             <span class="label label-danger">no</span>
           <% end %>
         </td>
       </tr>
       <tr>
         <td><b>Created</b></td>
         <td><%= I18n.l(@host.created_at, format: :long) %></td>
       </tr>
     </table>
   </div>
 
   <div class='row'>
     <div class='col-xs-2'>
-      <%= link_to 'Edit', edit_host_path(@host), class: "btn btn-primary", role: "button" %>
+      <%= link_to edit_host_path(@host), class: "btn btn-default", role: "button" do %>
+        <label class="glyphicon glyphicon-edit text-primary"></label>
+        Edit
+      <% end %>
+    </div>
+
+    <% if @host.can_be_disabled? %>
+      <div class='col-xs-2'>
+        <%= link_to disable_host_path(@host), method: :post,
+          data: { confirm: 'This will disable the client. Are you sure?' },
+          class: "btn btn-default", role: "button" do %>
+          <label class="glyphicon glyphicon-ban-circle text-warning"></label>
+          Disable
+        <% end %>
+      </div>
+    <% end %>
+
+    <div class='col-xs-2'>
+      <%= link_to host_path(@host), method: :delete,
+        data: { confirm: 'This will remove your client from the Backup service. Are you sure?' },
+        class: "btn btn-default", role: "button" do %>
+        <label class="glyphicon glyphicon-trash text-danger"></label>
+        Remove
+      <% end %>
     </div>
 
     <% if @host.needs_dispatch? %>
       <div class='col-xs-4 pull-right text-right'>
-        <%= link_to 'Deploy Changes', submit_config_host_path(@host), method: :post,
-                    class: 'btn btn-success', role: 'button' %>
+        <%= link_to submit_config_host_path(@host), method: :post,
+                    class: 'btn btn-success', role: 'button' do %>
+          <label class="glyphicon glyphicon-cloud-upload"></label>
+          Deploy Changes
+        <% end %>
       </div>
     <% end %>
     <% if @host.needs_revoke? %>
       <div class='col-xs-4 pull-right text-right'>
         <%= link_to 'Remove From Backup service', revoke_host_path(@host), method: :delete,
                     class: 'btn btn-danger', role: 'button' %>
       </div>
     <% end %>
   </div>
 
   <br />
 
   <div class='row'>
     <% if @host.client %>
       <div class='col-xs-12 text-right'>
         <%= link_to "Back to <b>#{@host.name}</b> client".html_safe, client_path(@host.client) %>
       </div>
     <% end %>
   </div>
 </div>