diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
index baf09c66b0..a7eec8a057 100644
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Log;
 use \Illuminate\Contracts\View\View;
 use \Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Response;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class AccessoriesFilesController extends Controller
 {
@@ -104,7 +105,7 @@ class AccessoriesFilesController extends Controller
      * @param int $accessoryId
      * @param int $fileId
      */
-    public function show($accessoryId = null, $fileId = null, $download = true) : View | RedirectResponse | Response
+    public function show($accessoryId = null, $fileId = null, $download = true) : View | RedirectResponse | Response | BinaryFileResponse
     {
 
         Log::debug('Private filesystem is: '.config('filesystems.default'));
diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php
index fb7335145f..f7f91e094e 100644
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -110,7 +110,7 @@ class ProfileController extends Controller
             $accessTokenData['id'] = $token->id;
             $accessTokenData['token'] = $accessToken;
             $accessTokenData['name'] = $accessTokenName;
-            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, 'Personal access token '.$accessTokenName.' created successfully'));
+            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, trans('account/general.personal_api_keys_success', ['key' => $accessTokenName])));
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, 'Token could not be created.'));
 
diff --git a/resources/lang/en-US/account/general.php b/resources/lang/en-US/account/general.php
index 1a9e2c03b8..d99e36df82 100644
--- a/resources/lang/en-US/account/general.php
+++ b/resources/lang/en-US/account/general.php
@@ -2,10 +2,14 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/<endpoint>',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
 );
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 98748282fa..60f9af30e1 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -552,5 +552,9 @@ return [
     ],
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
 
 ];
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php
index 8cae9d264c..d4242c7a35 100644
--- a/resources/views/livewire/personal-access-tokens.blade.php
+++ b/resources/views/livewire/personal-access-tokens.blade.php
@@ -1,62 +1,65 @@
 <div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <div class="text-right" style="display: flex; justify-content: space-between; align-items: center;">
-                <a class="btn btn-info btn-sm action-link pull-right"
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <div class="text-right">
+                <a class="btn btn-info btn-sm pull-right"
                    onclick="$('#modal-create-token').modal('show');"
-                   wire:click="$dispatch('openModal')"
-                >
-                    Create New Token
+                   wire:click="$dispatch('openModal')">
+                    {{ trans('general.create') }}
                 </a>
             </div>
         </div>
-        <div class="panel-body">
+        <div class="box-body">
             <!-- No Tokens Notice -->
             @if($tokens->count() === 0)
-                <p class="m-b-none"
-                >
-                    You have not created any personal access tokens.
+                <p>
+                    {{ trans('account/general.no_tokens') }}
                 </p>
             @endif
 
             <!-- Personal Access Tokens -->
-            <table class="table table-borderless m-b-none">
+            <div class="table table-responsive">
+            <table class="table table-striped snipe-table">
                 @if($tokens->count() > 0)
                     <thead>
                     <tr>
-                        <th class="col-md-3">Name</th>
-                        <th class="col-md-2">Created</th>
-                        <th class="col-md-2">Expires</th>
-                        <th class="col-md-2"><span class="sr-only">Delete</span></th>
+                        <th class="col-md-3">{{ trans('general.name') }}</th>
+                        <th class="col-md-2">{{ trans('general.created_at') }}</th>
+                        <th class="col-md-2">{{ trans('general.expires') }}</th>
+                        <th class="col-md-2"><span class="sr-only">{{ trans('general.delete') }}</span></th>
                     </tr>
                     </thead>
+                    <tbody>
                 @endif
                 @foreach($tokens as $token)
-                    <tbody>
+
                     <tr>
-                        <!-- Client Name -->
-                        <td style="vertical-align: middle;">
+                        <td>
                             {{ $token->name }}
                         </td>
 
-                        <td style="vertical-align: middle;">
+                        <td>
                             {{ $token->created_at }}
                         </td>
 
-                        <td style="vertical-align: middle;">
+                        <td>
                             {{ $token->expires_at }}
                         </td>
-                        <!-- Delete Button -->
-                        <td style="vertical-align: middle;" class="text-right">
+                        <td class="text-right">
                             <a class="action-link btn btn-danger btn-sm" wire:click="deleteToken('{{ $token->id }}')"
-                               wire:loading.attr="disabled">
-                                <i class="fas fa-trash"></i>
+                               wire:loading.attr="disabled" data-tooltip="true" title="{{ trans('general.delete') }}">
+                                <i class="fas fa-trash" aria-hidden="true"></i>
+                                <span class="sr-only">
+                                    {{ trans('general.delete') }}
+                                </span>
                             </a>
                         </td>
                     </tr>
-                    </tbody>
+
                 @endforeach
+                    </tbody>
             </table>
+            </div>
         </div>
     </div>
     <!-- Create Token Modal -->
@@ -74,22 +77,23 @@
                 <div class="modal-body">
                     <!-- Form Errors -->
                     @if($errors->has('name'))
-                        <div class="alert alert-danger"
-                        >
-                            <p><strong>Whoops!</strong> Something went wrong!</p>
+                        <div class="alert alert-danger">
+                            <p><strong>{{ trans('general.whoops') }}</strong> {{ trans('general.something_went_wrong') }}</p>
                             <br>
                             <ul>
-                                <li
-                                >
-                                    @error('name') <span class="error">{{ $message }}</span> @enderror
+                                <li>
+                                    @error('name')
+                                    <span class="error">
+                                        {{ $message }}
+                                    </span>
+                                    @enderror
                                 </li>
                             </ul>
                         </div>
                     @endif
 
                     <!-- Create Token Form -->
-                    <form class="form-horizontal" role="form"
-                    >
+                    <form class="form-horizontal" role="form">
                         <!-- Name -->
                         <div class="form-group">
                             <label class="col-md-4 control-label" for="name">Name</label>
@@ -98,7 +102,6 @@
                                 <input id="create-token-name" type="text" aria-label="name" class="form-control"
                                        name="name"
                                        wire:keydown.enter="createToken(name)"
-                                       {{-- defer because it's submitting as i type if i don't --}}
                                        wire:model="name"
                                        autofocus
                                 >
@@ -110,12 +113,10 @@
 
                 <!-- Modal Actions -->
                 <div class="modal-footer">
-                    <button type="button" class="btn primary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn primary" data-dismiss="modal">{{ trans('general.close') }}</button>
 
-                    <button type="button" class="btn btn-primary"
-                            wire:click="createToken(name)"
-                    >
-                        Create
+                    <button type="button" class="btn btn-primary" wire:click="createToken(name)">
+                        {{ trans('general.create') }}
                     </button>
                 </div>
             </div>
@@ -130,14 +131,13 @@
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
                     <h4 class="modal-title">
-                        Personal Access Token
+                        {{ trans('account/general.personal_access_token') }}
                     </h4>
                 </div>
 
                 <div class="modal-body">
                     <p>
-                        Here is your new personal access token. This is the only time it will be shown so don't lose it!
-                        You may now use this token to make API requests.
+                        {{ trans('account/general.here_is_api_key') }}
                     </p>
 
                     <pre><code>{{ $newTokenString }}</code></pre>
@@ -145,7 +145,7 @@
 
                 <!-- Modal Actions -->
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.close') }}</button>
                 </div>
             </div>
         </div>