diff --git a/dev/scss/base/icons.scss b/dev/scss/base/icons.scss
index 749715c..24469c2 100644
--- a/dev/scss/base/icons.scss
+++ b/dev/scss/base/icons.scss
@@ -34,3 +34,4 @@
 $fa-referto:      "\f0c5";
 $fa-redo:         "\f01e";
 $fa-warn:         "\f071";
+$fa-token:        "\1f511";
diff --git a/dev/scss/main/oauth.scss b/dev/scss/main/oauth.scss
index 9dca691..7a7f5fa 100644
--- a/dev/scss/main/oauth.scss
+++ b/dev/scss/main/oauth.scss
@@ -19,6 +19,10 @@
       display:   block;
     }
   }
+
+  input[readonly] {
+      margin: 6pt 0;
+  }
 }
 
 span.client-name {
@@ -32,4 +36,25 @@
     color:     $ids-blue-1;
     font-size: 100%;
   }
-}
\ No newline at end of file
+}
+
+li.token {
+    list-style-type: none;
+}
+
+
+label[for=token] {
+    font-weight: bold;
+
+  &::before {
+    @include icon-font;
+    font-feature-settings: "ss01" on;
+    margin-left: -1.5em;
+    display:   inline-block;
+    width:     1.5em;
+    content:   $fa-token;
+    color:     $ids-blue-1 !important;
+    font-size: 100%;
+    font-weight: 900;
+  }
+}
diff --git a/lib/Kalamar/Plugin/Auth.pm b/lib/Kalamar/Plugin/Auth.pm
index 7313a7f..458a290 100644
--- a/lib/Kalamar/Plugin/Auth.pm
+++ b/lib/Kalamar/Plugin/Auth.pm
@@ -78,6 +78,7 @@
           oauthUnregister => 'Möchten sie <span class="client-name"><%= $client_name %></span> wirklich löschen?',
           loginHint => 'Möglicherweise müssen sie sich zunächst einloggen.',
           oauthIssueToken => 'Erzeuge einen neuen Token für <span class="client-name"><%= $client_name %></span>',
+          accessToken => 'Access Token',
         },
         -en => {
           loginSuccess => 'Login successful',
@@ -106,6 +107,7 @@
           oauthUnregister => 'Do you really want to unregister <span class="client-name"><%= $client_name %></span>?',
           loginHint => 'Maybe you need to log in first?',
           oauthIssueToken => 'Erzeuge einen neuen Token für <span class="client-name"><%= $client_name %></span>',
+          accessToken => 'Access Token',
         }
       }
     }
diff --git a/lib/Kalamar/Plugin/Auth/templates/auth/client.html.ep b/lib/Kalamar/Plugin/Auth/templates/auth/client.html.ep
index 07745e1..60f7870 100644
--- a/lib/Kalamar/Plugin/Auth/templates/auth/client.html.ep
+++ b/lib/Kalamar/Plugin/Auth/templates/auth/client.html.ep
@@ -25,22 +25,22 @@
         </div>
         % };
 
-      </li>
-    </ul>
+        <br />
 
-    <span class="button-group button-panel">
-      %= link_to Unregister => url_for('oauth-unregister', client_id => stash('client_id'))->query('name' => stash('client_name')) => {} => ( class => 'client-unregister' )
-      %= link_to IssueToken => url_for('oauth-issue-token', client_id => stash('client_id'))->query('name' => stash('client_name')) => {} => ( class => 'client-issue-token' )
-    </span>
-    
+        <span class="button-group button-panel">
+          %= link_to Unregister => url_for('oauth-unregister', client_id => stash('client_id'))->query('name' => stash('client_name')) => {} => ( class => 'client-unregister' )
+          %= link_to IssueToken => url_for('oauth-issue-token', client_id => stash('client_id'))->query('name' => stash('client_name')) => {} => ( class => 'client-issue-token' )
+        </span>        
+      </li>
+    </ul>    
 
     % if ($c->stash('tokens')) {
-    <h4>Tokens</h3>
+    <legend>Tokens</legend>
     <ul class="token-list">
       % foreach (@{$c->stash('tokens')}) {
-      <li>
+      <li class="token">
       %= label_for 'token' => loc('Auth_accessToken')
-      %= text_field '', $_->{token}, readonly => 'readonly'
+      %= text_field '', value => $_->{token}, readonly => 'readonly', class => 'show-pwd copy-to-clipboard'
       <p name="created">Created at: <%= $_->{created_date} %></p>
       <p name="expires">Expires in: <%= $_->{expires_in} %></p>
       % if ($_->{scope}) {
@@ -50,14 +50,6 @@
       % }
     </ul>
     % };
-    
-    %# New access token:
-    %# if (stash('access_token')) {
-    %#= label_for 'access_token' => 'Access Token'
-    %#= text_field 'access_token', stash('access_token'), readonly => 'readonly'
-    %# <p name="expires">Expires in: <tt><%= stash 'expires_in' %></tt></p>
-    %# <p name="scope">Scope: <tt><%= stash 'scope' %></tt></p>
-    %# <p name="type">Token-Type: <tt><%= stash 'token_type' %></tt></p>
-    %# }
+
   </fieldset>
 </form>