diff --git a/resources/views/profile/partial/user-info.blade.php b/resources/views/profile/partial/user-info.blade.php
index 4720c2da3..14575f18a 100644
--- a/resources/views/profile/partial/user-info.blade.php
+++ b/resources/views/profile/partial/user-info.blade.php
@@ -8,11 +8,16 @@
       </div>
       <div class="col-12 col-md-8 d-flex align-items-center">
         <div class="profile-details">
-          <div class="username-bar pb-2  d-flex align-items-center">
+          <div class="username-bar pb-2 d-flex align-items-center">
             <span class="font-weight-ultralight h1">{{$user->username}}</span>
+            @if($is_admin == true)
+            <span class="pl-4">
+              <span class="btn btn-outline-danger font-weight-bold py-0">ADMIN</span>
+            </span>
+            @endif
             @if($owner == true)
-            <span class="h5 pl-2 b-0">
-            <a class="icon-settings text-muted" href="{{route('settings')}}"></a>
+            <span class="pl-4">
+            <a class="fas fa-cog fa-lg text-muted" href="{{route('settings')}}"></a>
             </span>
             @elseif ($is_following == true)
             <span class="pl-4">
diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php
index f731da04e..d9fa85c54 100644
--- a/resources/views/profile/show.blade.php
+++ b/resources/views/profile/show.blade.php
@@ -32,10 +32,10 @@
           <div class="info-overlay-text">
             <h5 class="text-white m-auto font-weight-bold">
               <span class="pr-4">
-              <span class="icon-heart pr-1"></span> {{$status->likes_count}}
+              <span class="far fa-heart fa-lg pr-1"></span> {{$status->likes_count}}
               </span>
               <span>
-              <span class="icon-speech pr-1"></span> {{$status->comments_count}}
+              <span class="far fa-comment fa-lg pr-1"></span> {{$status->comments_count}}
               </span>
             </h5>
           </div>
diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php
index 09e3a6004..e43215bf8 100644
--- a/resources/views/status/template.blade.php
+++ b/resources/views/status/template.blade.php
@@ -7,7 +7,7 @@
           <div class="text-right" style="flex-grow:1;">
             <div class="dropdown">
               <button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
-              <span class="icon-options"></span>
+              <span class="fas fa-ellipsis-v fa-lg text-muted"></span>
               </button>
               <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
                 <a class="dropdown-item" href="{{$item->url()}}">Go to post</a>
@@ -28,9 +28,20 @@
             </div>
           </div>
         </div>
+        @if($item->is_nsfw)
+        <details>
+          <p>
+            <summary>NSFW / Hidden Image</summary>
+            <a class="max-hide-overflow" href="{{$item->url()}}">
+              <img class="card-img-top" src="{{$item->mediaUrl()}}">
+            </a>
+          </p>
+        </details>
+        @else
         <a class="max-hide-overflow" href="{{$item->url()}}">
           <img class="card-img-top" src="{{$item->mediaUrl()}}">
         </a>
+        @endif
         <div class="card-body">
           <div class="reactions h3">
             <form class="like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$item->id}}" data-action="like" data-count="{{$item->likes_count}}">