diff --git a/share/templates/customer/details.tt b/share/templates/customer/details.tt
index 743897851c..d33debd33f 100644
--- a/share/templates/customer/details.tt
+++ b/share/templates/customer/details.tt
@@ -80,7 +80,8 @@
             </td>
             <td class="ngcp-actions-column">
                 <div class="sw_actions">
-                    <a class="btn btn-primary btn-small" href="[% c.uri_for_action("/subscriber/preferences", [subscriber.id]) %]"><i class="icon-list"></i> Preferences</a>
+                    <a class="btn btn-primary btn-small" href="[% c.uri_for_action("/subscriber/details", [subscriber.id]) %]"><i class="icon-th-list"></i> Details</a>
+                    <a class="btn btn-tertiary btn-small" href="[% c.uri_for_action("/subscriber/preferences", [subscriber.id]) %]"><i class="icon-list"></i> Preferences</a>
                 </div>
             </td>
         </tr>
diff --git a/share/templates/subscriber/list.tt b/share/templates/subscriber/list.tt
index a7cc16af14..b418c2978f 100644
--- a/share/templates/subscriber/list.tt
+++ b/share/templates/subscriber/list.tt
@@ -14,7 +14,7 @@
 
     helper.dt_buttons = [
         { name = 'Terminate', uri = "/subscriber/'+full.id+'/terminate", class = 'btn-small btn-secondary', icon = 'icon-trash', condition = 'full.status != "terminated"' },
-        { name = 'Preferences', uri = "/subscriber/'+full.id+'/preferences", class = 'btn-small btn-tertiary', icon = 'icon-list', condition = 'full.status != "terminated"' },
+        { name = 'Details', uri = "/subscriber/'+full.id+'/details", class = 'btn-small btn-tertiary', icon = 'icon-th-list', condition = 'full.status != "terminated"' },
         { name = 'Customer', uri = "/customer/'+full.contract_id+'/details", class = 'btn-small btn-tertiary', icon = 'icon-user' },
     ];
     helper.top_buttons = [
diff --git a/share/templates/subscriber/master.tt b/share/templates/subscriber/master.tt
index 6d7029e3df..34f41b03da 100644
--- a/share/templates/subscriber/master.tt
+++ b/share/templates/subscriber/master.tt
@@ -1,5 +1,12 @@
 [% site_config.title = 'Subscriber ' _ subscriber.username _ '@' _ subscriber.domain.domain  -%]
 
+<div class="row">
+    <span class="pull-left" style="margin:0 5px 0 5px;">
+        <a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/preferences', [ subscriber.id ]) %]"><i class="icon-list"></i> Preferences</a>
+        <a class="btn btn-primary btn-large" href="[% c.uri_for_action('/customer/details', [ subscriber.contract_id ]) %]"><i class="icon-user"></i> Customer</a>
+    </span>
+</div>
+
 [% IF messages -%]
 <div class="row">
     [% FOREACH m IN messages -%]
@@ -32,7 +39,7 @@
                             <td>[% subscriber.contract.id %]</td>
                             <td class="ngcp-actions-column">
                                 <div class="sw_actions">
-                                    <a class="btn btn-primary btn-small" href="[% c.uri_for_action("/customer/details", [subscriber.contract_id]) %]"><i class="icon-list"></i> Customer Details</a>
+                                    <a class="btn btn-primary btn-small" href="[% c.uri_for_action("/customer/details", [subscriber.contract_id]) %]"><i class="icon-user"></i> Customer</a>
                                 </div>
                             </td>
                         </tr>