diff --git a/admin_custom_link_add_modal.php b/admin_custom_link_add_modal.php
index 6250f465..aecda31d 100644
--- a/admin_custom_link_add_modal.php
+++ b/admin_custom_link_add_modal.php
@@ -66,6 +66,7 @@
                             </div>
                             <select class="form-control select2" name="location" required>
                                 <option value="1">Main Side Nav</option>
+                                <option value="2">Top Nav (Icon Required)</option>
                             </select>
                         </div>
                     </div>
diff --git a/admin_custom_link_edit_modal.php b/admin_custom_link_edit_modal.php
index 0107e833..d2be695c 100644
--- a/admin_custom_link_edit_modal.php
+++ b/admin_custom_link_edit_modal.php
@@ -64,6 +64,7 @@
                             </div>
                             <select class="form-control select2" name="location" required>
                                 <option value="1" <?php if ($custom_link_location == 1) { echo "selected"; } ?> >Main Side Nav</option>
+                                <option value="2" <?php if ($custom_link_location == 2) { echo "selected"; } ?> >Top Nav (Icon Required)</option>
                             </select>
                         </div>
                     </div>
diff --git a/side_nav.php b/side_nav.php
index 942f3bb5..fbb3b32b 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -193,7 +193,7 @@
                 
                 <?php
                 $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links WHERE custom_link_location = 1 AND custom_link_archived_at IS NULL
-                    ORDER BY custom_link_order DESC, custom_link_name DESC"
+                    ORDER BY custom_link_order DESC, custom_link_name ASC"
                 );
 
                 while ($row = mysqli_fetch_array($sql_custom_links)) {
diff --git a/top_nav.php b/top_nav.php
index def68516..2d2b3356 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -4,8 +4,7 @@
     <!-- Left navbar links -->
     <ul class="navbar-nav">
         <li class="nav-item">
-            <a class="nav-link" data-widget="pushmenu" data-enable-remember="TRUE" href="#"><i
-                    class="fas fa-bars"></i></a>
+            <a class="nav-link" data-widget="pushmenu" data-enable-remember="TRUE" href="#"><i class="fas fa-bars"></i></a>
         </li>
     </ul>
 
@@ -29,6 +28,34 @@
     <!-- Right navbar links -->
     <ul class="navbar-nav ml-auto">
 
+        <!--Custom Nav Link -->
+        <?php
+        $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links WHERE custom_link_location = 2 AND custom_link_archived_at IS NULL
+            ORDER BY custom_link_order DESC, custom_link_name ASC"
+        );
+
+        while ($row = mysqli_fetch_array($sql_custom_links)) {
+            $custom_link_name = nullable_htmlentities($row['custom_link_name']);
+            $custom_link_uri = nullable_htmlentities($row['custom_link_uri']);
+            $custom_link_icon = nullable_htmlentities($row['custom_link_icon']);
+            $custom_link_new_tab = intval($row['custom_link_new_tab']);
+            if ($custom_link_new_tab == 1) {
+                $target = "target='_blank' rel='noopener noreferrer'";
+            } else {
+                $target = "";
+            }
+
+            ?>
+
+        <li class="nav-item" title="<?php echo $custom_link_name; ?>">
+            <a href="<?php echo $custom_link_uri; ?>" <?php echo $target; ?> class="nav-link">
+                <i class="fas fa-<?php echo $custom_link_icon; ?> nav-icon"></i>
+            </a>
+        </li>
+
+        <?php } ?>
+        <!-- End Custom Nav Links -->
+
         <!-- New Notifications Dropdown -->
         <?php
         $sql_notifications = mysqli_query($mysqli, "SELECT * FROM notifications 
@@ -40,7 +67,7 @@
         ?>
 
         <?php if ($num_notifications > 0) { ?>
-        <li class="nav-item dropdown">
+        <li class="nav-item dropdown" title="Notifications">
             <a class="nav-link" data-toggle="dropdown" href="#">
                 <i class="fas fa-bell"></i>
                 <span class="badge badge-light badge-pill navbar-badge position-absolute" style="top: 1px; right: 3px;"><?php echo $num_notifications; ?></span>