diff --git a/src/common/component/ForwardModal/index.tsx b/src/common/component/ForwardModal/index.tsx
index 0f62aed8..af79d727 100644
--- a/src/common/component/ForwardModal/index.tsx
+++ b/src/common/component/ForwardModal/index.tsx
@@ -75,11 +75,11 @@ const ForwardModal: FC<IProps> = ({ mids, closeModal }) => {
     (selectedChannels.length == 0 && selectedMembers.length == 0) || forwarding;
   return (
     <Modal>
-      <div className="flex max-h-[514px] min-h-[400px] bg-white drop-shadow rounded-lg overflow-hidden">
+      <div className="flex max-h-[514px] min-h-[400px] bg-white dark:bg-slate-900 drop-shadow rounded-lg overflow-hidden">
         <div className="w-[271px] shadow-[inset_-1px_0px_0px_rgba(0,_0,_0,_0.1)] overflow-y-scroll bg-inherit">
           <div className="sticky top-0 bg-inherit z-[90] p-4 w-[calc(100%_-_1px)]">
             <input
-              className="px-2 py-2.5 text-sm bg-black/10 rounded-lg w-full"
+              className="px-2 py-2.5 text-sm dark:text-white bg-black/10 rounded-lg w-full"
               value={input}
               onChange={handleSearchChange}
               placeholder="Search user or channel"
@@ -138,14 +138,14 @@ const ForwardModal: FC<IProps> = ({ mids, closeModal }) => {
             })}
             {selectedMembers.map((uid) => {
               return (
-                <li key={uid} className="item">
+                <li key={uid} className="relative">
                   <User key={uid} uid={uid} interactive={false} />
-                  <CloseIcon className="remove" onClick={removeSelected.bind(null, uid, "user")} />
+                  <CloseIcon className="cursor-pointer absolute right-1 top-1/2 -translate-y-1/2" onClick={removeSelected.bind(null, uid, "user")} />
                 </li>
               );
             })}
           </ul>
-          <div className="rounded-lg p-2 max-h-[200px] overflow-auto bg-slate-100 w-[280px] mb-1">
+          <div className="rounded-lg p-2 max-h-[200px] overflow-auto bg-slate-100 dark:bg-slate-800 w-[280px] mb-1">
             {mids.map((mid) => (
               <Reply key={mid} mid={mid} interactive={false} />
             ))}
diff --git a/src/common/component/InviteModal/index.tsx b/src/common/component/InviteModal/index.tsx
index cb5abb7f..28303321 100644
--- a/src/common/component/InviteModal/index.tsx
+++ b/src/common/component/InviteModal/index.tsx
@@ -25,8 +25,8 @@ const InviteModal: FC<Props> = ({ type = "server", cid, title = "", closeModal }
   const finalTitle = type == "server" ? server.name : `#${title || channel?.name}`;
   return (
     <Modal>
-      <div className="flex flex-col bg-white dark:bg-gray-900 rounded-lg p-4  md:min-w-[408px]">
-        <h2 className="flex items-center justify-between text-lg text-gray-700 dark:text-gray-50 ">
+      <div className="flex flex-col bg-white dark:bg-gray-900 rounded-lg p-4 max-h-[85vh] overflow-y-scroll  md:min-w-[408px] relative">
+        <h2 className="flex items-center justify-between text-lg text-gray-700 dark:text-gray-50">
           {t("invite_title", { name: finalTitle })}
           <CloseIcon className="cursor-pointer dark:fill-white" onClick={closeModal} />
         </h2>
diff --git a/src/routes/chat/Layout/NewMessageBottomTip.tsx b/src/routes/chat/Layout/NewMessageBottomTip.tsx
index 71b4e228..6e8557a8 100644
--- a/src/routes/chat/Layout/NewMessageBottomTip.tsx
+++ b/src/routes/chat/Layout/NewMessageBottomTip.tsx
@@ -43,7 +43,6 @@ const NewMessageBottomTip = ({ context, id, scrollToBottom }: Props) => {
                                 bg-gradient-to-tl from-[#3C8CE7] to-[#00EAFF]`,
             unreads > 0 ? "flex" : "hidden")}>
             <button onClick={scrollToBottom}>{t("new_msg", { num: unreads })}</button>
-            <span className='absolute -left-1 -translate-x-full'>👇</span>
         </aside>
     );
 };
diff --git a/src/routes/setting/License/index.tsx b/src/routes/setting/License/index.tsx
index b479cecd..e6ad0a93 100644
--- a/src/routes/setting/License/index.tsx
+++ b/src/routes/setting/License/index.tsx
@@ -47,7 +47,7 @@ export default function License() {
         <div className={clsx('relative w-full p-3 rounded border-solid border flex flex-col gap-4 shadow', reachLimit ? "border-red-600 bg-red-200/50" : "border-green-600 bg-green-100 dark:bg-green-900")}>
           <Item label={t("license.signed")} data={licenseInfo?.sign ? "Yes" : "Not Yet"} />
           <Item label={t("license.domain")} data={licenseInfo?.domains} />
-          <Item label={t("license.user_limit")} data={licenseInfo?.user_limit == 99999 ? "No Limit" : licenseInfo?.user_limit} />
+          <Item label={t("license.user_limit")} data={(licenseInfo?.user_limit ?? 0) >= 999999 ? "No Limit" : licenseInfo?.user_limit} />
           <Item label={t("license.expire")} data={dayjs(licenseInfo?.expired_at).format("YYYY-MM-DD h:mm:ss A")} />
           <Item label={t("license.create")} data={dayjs(licenseInfo?.created_at).format("YYYY-MM-DD h:mm:ss A")} />
           <Item label={t("license.value")} data={licenseInfo?.base58} foldable={base58Fold} title={base58Fold ? "Click to see full text" : "Click to fold text"}