diff --git a/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html b/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
index 2931841c7bbcaf90d35b54bec4abbc5d34cd5202..af449006848f8dad6ba7948a4eb822b745f49a9d 100644
--- a/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
+++ b/smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.html
@@ -87,7 +87,7 @@
   <button id="generatedAccessTokenButton" *ngIf="isAccessTokenType && !isReadOnly" [disabled]="!credentialForm.valid " mat-raised-button color="primary"
           (click)="generatedAccessToken()">
     <mat-icon>key</mat-icon>
-    <span>Generate new access token</span>
+    <span>Generate new Access token</span>
   </button>
 
 
@@ -106,7 +106,7 @@
 
   <button id="copyButton" *ngIf="isAccessTokenType && isReadOnly" [cdkCopyToClipboard]="accessTokenValue" mat-raised-button>
     <mat-icon>content_copy</mat-icon>
-    <span>Copy</span>
+    <span>Copy Access token value</span>
   </button>
 
 </mat-dialog-actions>
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.html b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.html
index 182091a3421af501b9939996ecd92ff7782ecc77..18ea11f3463619fb43759eebcfa435d4430d19d9 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.html
+++ b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.html
@@ -3,7 +3,7 @@
               text="You can generate a access token for each application you use that needs access to the DomiSMP API."
               [labelColumnContent]="commonToolbar">
 
-    <table mat-table id="access-token-table" [dataSource]="dataSource" class="panel smp-data-panel" >
+    <table mat-table id="user-access-token-table" [dataSource]="dataSource" class="panel smp-data-panel" >
       <ng-container matColumnDef="accessTokens">
         <th mat-header-cell *matHeaderCellDef> Access Tokens </th>
         <td mat-cell *matCellDef="let token"
@@ -14,8 +14,8 @@
                               [credential]="token"></access-token-panel>
 
         </td>
-        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-        <tr mat-row *matRowDef="let myRowData; columns: displayedColumns"></tr>
+        <tr mat-header-row class="user-access-token-table-header" *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row class="user-access-token-table-data" *matRowDef="let myRowData; columns: displayedColumns"></tr>
       </ng-container>
     </table>
 
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.scss b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.scss
index 63e96ca051370441e79b36b752795e5625b9b435..bde62fecdac7bff9df60de91601e44f25d8564b3 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.scss
+++ b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.scss
@@ -13,3 +13,16 @@
   width: 100%;
   margin-top: auto;
 }
+
+#user-access-token-table {
+  padding: 0;
+  border: none;
+}
+
+.user-access-token-table-header {
+  display: none;
+}
+
+.user-access-token-table-data td {
+  padding: 0;
+}