diff --git a/resources/views/admin/instances/home.blade.php b/resources/views/admin/instances/home.blade.php
index 32cc867bc..8e73e3398 100644
--- a/resources/views/admin/instances/home.blade.php
+++ b/resources/views/admin/instances/home.blade.php
@@ -118,7 +118,6 @@
 						value: "unlisted",
 					},
 					cw: {
-						text: autocw == 0 ? "CW Media" : "Remove AutoCW",
 						text: autocw == 0 ? "CW Media" : "Remove AutoCW",
 						className: "bg-warning",
 						value: "autocw",
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 251f1a17b..35b796096 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -56,26 +56,24 @@
     @stack('scripts')
     <div class="d-block d-sm-none mt-5"></div>
     <div class="d-block d-sm-none fixed-bottom">
-        <div class="card card-body rounded-0 py-2 d-flex align-items-middle box-shadow" style="border-top:1px solid #F1F5F8">
-            <ul class="nav nav-pills nav-fill">
+        <div class="card card-body rounded-0 py-2 box-shadow" style="border-top:1px solid #F1F5F8">
+            <ul class="nav nav-pills nav-fill d-flex align-items-middle">
               <li class="nav-item">
-                <a class="nav-link {{request()->is('/')?'text-dark':'text-lighter'}}" href="/"><i class="fas fa-home fa-lg"></i></a>
+                <a class="nav-link text-dark" href="/"><i class="fas fa-home fa-lg"></i></a>
               </li>
               <li class="nav-item">
-                <a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a>
+                <a class="nav-link text-dark" href="/discover"><i class="fas fa-search fa-lg"></i></a>
               </li>
               <li class="nav-item">
-                <div class="nav-link text-primary cursor-pointer" onclick="App.util.compose.post()">
-                    <span class="border border-primary rounded p-2 bg-primary">
-                        <i class="fas fa-camera fa-lg text-white" style="color:#fff !important;"></i>
-                    </span>
+                <div class="nav-link cursor-pointer text-dark" onclick="App.util.compose.post()">
+                    <i class="far fa-plus-square fa-2x"></i>
                 </div>
               </li>
               <li class="nav-item">
-                <a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a>
+                <a class="nav-link text-dark" href="/account/activity"><i class="far fa-bell fa-lg"></i></a>
               </li>
               <li class="nav-item">
-                <a class="nav-link text-lighter" href="/i/me"><i class="far fa-user fa-lg"></i></a>
+                <a class="nav-link text-dark" href="/i/me"><i class="far fa-user fa-lg"></i></a>
               </li>
             </ul>
         </div>
diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index dbd93068b..9f336327a 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -39,10 +39,10 @@
                             </a>
                         </li>
                         <li class="nav-item px-md-2 d-none d-md-block">
-                            <a class="nav-link font-weight-bold text-dark" href="/?a=co" title="Compose" data-toggle="tooltip" data-placement="bottom">
+                            <div class="nav-link font-weight-bold text-dark cursor-pointer" title="Compose" data-toggle="tooltip" data-placement="bottom" onclick="App.util.compose.post()">
                                 <i class="far fa-plus-square fa-lg"></i>
                                 <span class="sr-only">Compose</span>
-                            </a>
+                            </div>
                         </li>
                         <li class="nav-item px-md-2">
                             <a class="nav-link font-weight-bold text-dark" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
@@ -52,7 +52,7 @@
                         </li>
                         <li class="nav-item px-md-2 d-none d-md-block">
                             <a class="nav-link font-weight-bold text-dark" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
-                                <i class="far fa-bell fa-lg"></i>
+                                <i class="far fa-bell fa-lg" style="vertical-align: middle;"></i>
                                 <span class="sr-only">Notifications</span>
                             </a>
                         </li>
@@ -64,10 +64,6 @@
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                <a class="d-block d-md-none dropdown-item font-weight-bold" href="/">
-                                    <span class="fas fa-home pr-2 text-lighter"></span>
-                                    Home
-                                </a>
                                 <a class="dropdown-item font-weight-bold" href="{{route('discover')}}">
                                     <span class="far fa-compass pr-2 text-lighter"></span>
                                     {{__('navmenu.discover')}}
diff --git a/resources/views/status/compose.blade.php b/resources/views/status/compose.blade.php
index ff9971b7e..947e38cc0 100644
--- a/resources/views/status/compose.blade.php
+++ b/resources/views/status/compose.blade.php
@@ -2,12 +2,28 @@
 
 @section('content')
 
-<div class="alert alert-info text-center rounded-0">
 <div class="container">
-<span class="font-weight-bold">ComposeUI v3 is deprecated</span>
-<br>
-Please use the <a href="#" onclick="event.preventDefault();window.App.util.compose.post()" class="font-weight-bold">new UI</a> to compose a post.
-</div>
+	<div class="row">
+		<div class="col-12 col-md-6 offset-md-3 mt-md-3 px-0">
+			<compose-modal></compose-modal>
+		</div>
+	</div>
 </div>
+@endsection
 
-@endsection
\ No newline at end of file
+@push('styles')
+<style type="text/css">
+	.card {
+		box-shadow: none;
+		border: 1px solid #ddd;
+	}
+	.card .card-header .fas.fa-times {
+		color: #fff;
+	}
+</style>
+@endpush
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/compose.js') }}"></script>
+<script type="text/javascript">window.App.boot()</script>
+@endpush
\ No newline at end of file