diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d4a492f53..ee2b6e216 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -39,8 +39,24 @@
     @if(Auth::check())
     <div class="d-block d-sm-none mt-5"></div>
     <div class="d-block d-sm-none fixed-bottom">
-        <div class="float-right m-3">
-          <button class="bg-primary rounded-circle text-white box-shadow border-0" data-toggle="modal" data-target="#composeModal" style="width:60px;height: 60px;"><i class="fas fa-plus fa-lg mb-0"></i></button>
+        <div class="card card-body rounded-0 py-2 d-flex align-middle">
+            <ul class="nav nav-pills nav-fill">
+              <li class="nav-item">
+                <a class="nav-link text-muted" href="/"><i class="fas fa-home fa-lg"></i></a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link text-muted" href="/timeline/public"><i class="far fa-map fa-lg"></i></a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link text-primary" data-toggle="modal" data-target="#composeModal"><i class="fas fa-camera-retro fa-2x"></i></a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link text-muted" href="{{route('discover')}}"><i class="far fa-compass fa-lg"></i></a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link text-muted" href="{{Auth::user()->url()}}"><i class="far fa-user fa-lg"></i></a>
+              </li>
+            </ul>
         </div>
     </div>
     <div class="modal" tabindex="-1" role="dialog" id="composeModal">
diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index bab4aeae6..6908651f1 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -22,9 +22,6 @@
             <ul class="navbar-nav mx-auto">
                     <li class="">
                         <a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline">
-                        <span class="d-block d-md-none mr-1" data-toggle="tooltip" title="Home Timeline">
-                            <i class="fas fa-home fa-lg"></i>
-                        </span>
                         <span class="d-none d-md-block">
                             {{__('navmenu.home')}}
                         </span>
@@ -32,16 +29,14 @@
                     </li>
                     <li>
                         <a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public">
-                        <span class="d-block d-md-none mx-2" data-toggle="tooltip" title="Local Timeline">
-                            <i class="far fa-map fa-lg"></i>
-                        </span>
                         <span class="d-none d-md-block">
                              {{__('navmenu.local')}}
                         </span> 
                         </a>
                     </li>
+                    
                     <li class="d-block d-md-none">
-                        <a class="nav-link ml-1" href="/account/activity" data-toggle="tooltip" title="Notifications">
+                        <a class="nav-link" href="/account/activity" data-toggle="tooltip" title="Notifications">
                             <i class="far fa-bell fa-lg"></i>
                         </a>
                     </li>