diff --git a/apps/mobile/app/screens/manage-tags/index.tsx b/apps/mobile/app/screens/manage-tags/index.tsx
index ffcd993e7..9373f4b5f 100644
--- a/apps/mobile/app/screens/manage-tags/index.tsx
+++ b/apps/mobile/app/screens/manage-tags/index.tsx
@@ -112,7 +112,7 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
     if (query && query.trim() !== "") {
       db.lookup
         .tags(query)
-        .sorted()
+        .sorted(db.settings.getGroupOptions("tags"))
         .then((items) => {
           setTags(items);
         });
@@ -249,6 +249,7 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
       }}
     >
       <Header title={strings.manageTags()} canGoBack />
+
       <View
         style={{
           paddingHorizontal: DefaultAppStyles.GAP
diff --git a/packages/editor-mobile/src/components/editor.tsx b/packages/editor-mobile/src/components/editor.tsx
index 8b14fde8c..02e9b7d57 100644
--- a/packages/editor-mobile/src/components/editor.tsx
+++ b/packages/editor-mobile/src/components/editor.tsx
@@ -570,14 +570,15 @@ const Tiptap = ({
                   justifyContent: "space-between",
                   display: "flex",
                   alignItems: "center",
-                  padding: "0px 16px"
+                  padding: "0px 16px",
+                  paddingBottom: "6px"
                 }}
               >
-                <Tags settings={settings} loading={controller.loading} />
                 <StatusBar
                   container={containerRef}
                   loading={controller.loading}
                 />
+                <Tags settings={settings} loading={controller.loading} />
               </div>
 
               <Title
diff --git a/packages/editor-mobile/src/components/header.tsx b/packages/editor-mobile/src/components/header.tsx
index 5a0200ae7..718064a09 100644
--- a/packages/editor-mobile/src/components/header.tsx
+++ b/packages/editor-mobile/src/components/header.tsx
@@ -158,7 +158,7 @@ function Header({
         position: "sticky",
         width: "100vw",
         zIndex: 999,
-        borderBottom: "0.5px solid var(--nn_primary_separator)"
+        borderBottom: "0.5px solid var(--nn_primary_border)"
       }}
     >
       {noHeader ? null : (
diff --git a/packages/editor-mobile/src/components/statusbar.tsx b/packages/editor-mobile/src/components/statusbar.tsx
index 06832faf4..28225e07a 100644
--- a/packages/editor-mobile/src/components/statusbar.tsx
+++ b/packages/editor-mobile/src/components/statusbar.tsx
@@ -81,14 +81,22 @@ function StatusBar({
   };
 
   return (
-    <p
-      onMouseDown={(e) => {
-        setShowChars(!showChars);
+    <div
+      style={{
+        display: "flex",
+        height: "25px",
+        alignItems: "center"
       }}
-      style={paragraphStyle}
     >
-      {showChars ? strings.characters(chars) : words}
-    </p>
+      <p
+        onMouseDown={(e) => {
+          setShowChars(!showChars);
+        }}
+        style={paragraphStyle}
+      >
+        {showChars ? strings.characters(chars) : words}
+      </p>
+    </div>
   );
 }
 
diff --git a/packages/editor-mobile/src/components/tags.tsx b/packages/editor-mobile/src/components/tags.tsx
index a5cdc4c29..7630a0af8 100644
--- a/packages/editor-mobile/src/components/tags.tsx
+++ b/packages/editor-mobile/src/components/tags.tsx
@@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { strings } from "@notesnook/intl";
 import React, { useEffect, useRef, useState } from "react";
+import { useTabContext } from "../hooks/useTabStore";
 import { Settings } from "../utils";
 import { EditorEvents } from "../utils/editor-events";
 import styles from "./styles.module.css";
-import { useTabContext } from "../hooks/useTabStore";
-
 function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
   const [tags, setTags] = useState<
     { title: string; alias: string; id: string; type: "tag" }[]
@@ -53,20 +53,68 @@ function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
     <div
       className={styles.container}
       style={{
-        display: "flex",
+        display: tags.length === 0 ? "none" : "flex",
+        position: tags.length === 0 ? "absolute" : "relative",
         alignItems: "center",
         overflowX: "scroll",
-        minHeight: "40px",
+        minHeight: "25px",
         opacity: props.loading ? 0 : 1,
         gap: 6
       }}
     >
-      {tags.map((tag) => (
+      {tags.length === 0 ? (
+        <button
+          className={styles.btn}
+          onClick={(e) => {
+            e.preventDefault();
+            openManageTagsSheet();
+          }}
+          style={{
+            border: `none`,
+            backgroundColor: "transparent",
+            borderRadius: 8,
+            padding: "0px 6px",
+            fontFamily: "Inter",
+            display: "flex",
+            alignItems: "center",
+            height: "24px",
+            userSelect: "none",
+            WebkitUserSelect: "none"
+          }}
+        >
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            version="1.1"
+            width={18 * fontScale}
+            height={18 * fontScale}
+            viewBox={`0 0 24 24`}
+          >
+            <path
+              fill="var(--nn_primary_accent)"
+              d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"
+            />
+          </svg>
+
+          <p
+            style={{
+              fontSize: 12,
+              marginLeft: 4,
+              color: "var(--nn_primary_icon)",
+              userSelect: "none"
+            }}
+          >
+            {strings.addTag()}
+          </p>
+        </button>
+      ) : null}
+
+      {tags.slice(0, 2).map((tag, index) => (
         <button
           key={tag.title}
           style={{
-            border: "1px solid var(--nn_primary_border)",
-            backgroundColor: "var(--nn_secondary_background)",
+            border: index !== 0 ? "none" : "1px solid var(--nn_primary_border)",
+            backgroundColor:
+              index !== 0 ? "transparent" : "var(--nn_secondary_background)",
             borderRadius: 6,
             padding: "0px 4px",
             height: "24px",
@@ -81,7 +129,7 @@ function Tags(props: { settings: Settings; loading?: boolean }): JSX.Element {
             openManageTagsSheet();
           }}
         >
-          #{tag.alias}
+          {index > 0 ? `+${tags.length - 1}` : `#${tag.title}`}
         </button>
       ))}
     </div>
diff --git a/packages/editor-mobile/src/components/tiptap.tsx b/packages/editor-mobile/src/components/tiptap.tsx
index ccc34074d..edda09b2a 100644
--- a/packages/editor-mobile/src/components/tiptap.tsx
+++ b/packages/editor-mobile/src/components/tiptap.tsx
@@ -43,7 +43,7 @@ export default function TiptapEditorWrapper(props: {
             sx={{
               display: props.settings.noToolbar ? "none" : "flex",
               overflowY: "hidden",
-              minHeight: "50px",
+              minHeight: "40px",
               ...(globalThis.__PLATFORM__ === "ios" && {
                 position: "absolute",
                 bottom: 0,