diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json
index 6dd7f21c..60ca1267 100644
--- a/assets/jsons/translations/de.json
+++ b/assets/jsons/translations/de.json
@@ -806,7 +806,8 @@
                 "add-folder": "Ordner hinzufügen",
                 "link-folder": "Ordner verknüpfen",
                 "unlink-folder": "Ordner-Verknüpfung aufheben",
-                "link-all": "Alle verlinken"
+                "link-all": "Alle verlinken",
+                "remove-from-the-list": "Aus der Liste entfernen"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json
index 67c91592..2b11836a 100644
--- a/assets/jsons/translations/en.json
+++ b/assets/jsons/translations/en.json
@@ -806,7 +806,8 @@
                 "add-folder": "Add Folder",
                 "link-folder": "Link Folder",
                 "unlink-folder": "Unlink Folder",
-                "link-all": "Link all"
+                "link-all": "Link all",
+                "remove-from-the-list": "Remove from the list"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json
index 91b74ed9..553cf1cb 100644
--- a/assets/jsons/translations/es.json
+++ b/assets/jsons/translations/es.json
@@ -806,7 +806,8 @@
                 "add-folder": "Añadir Carpeta",
                 "link-folder": "Enlazar Carpeta",
                 "unlink-folder": "Desenlazar Carpeta",
-                "link-all": "Enlazar todo"
+                "link-all": "Enlazar todo",
+                "remove-from-the-list": "Eliminar de la lista"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json
index 05bd2001..c064e8e8 100644
--- a/assets/jsons/translations/fr.json
+++ b/assets/jsons/translations/fr.json
@@ -807,7 +807,8 @@
                 "add-folder": "Ajouter un dossier",
                 "link-folder": "Lier le dossier",
                 "unlink-folder": "Délier le dossier",
-                "link-all": "Tout lier"
+                "link-all": "Tout lier",
+                "remove-from-the-list": "Retirer de la liste"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json
index d154371c..3f21e71c 100644
--- a/assets/jsons/translations/ja.json
+++ b/assets/jsons/translations/ja.json
@@ -806,7 +806,8 @@
                 "add-folder": "フォルダーを追加",
                 "link-folder": "フォルダーをリンク",
                 "unlink-folder": "フォルダーのリンクを解除",
-                "link-all": "すべてリンク"
+                "link-all": "すべてリンク",
+                "remove-from-the-list": "リストから削除"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/ko.json b/assets/jsons/translations/ko.json
index 82b42dba..68e89ad8 100644
--- a/assets/jsons/translations/ko.json
+++ b/assets/jsons/translations/ko.json
@@ -806,7 +806,8 @@
                 "add-folder": "폴더 추가",
                 "link-folder": "폴더 연결",
                 "unlink-folder": "폴더 연결 해제",
-                "link-all": "모두 연결"
+                "link-all": "모두 연결",
+                "remove-from-the-list": "목록에서 제거"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json
index 8f8c58c8..fea3a471 100644
--- a/assets/jsons/translations/ru.json
+++ b/assets/jsons/translations/ru.json
@@ -806,7 +806,8 @@
                 "add-folder": "Добавить папку",
                 "link-folder": "Связать папку",
                 "unlink-folder": "Отвязать папку",
-                "link-all": "Связать всё"
+                "link-all": "Связать всё",
+                "remove-from-the-list": "Удалить из списка"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json
index 1c4d5b8a..631d5ad1 100644
--- a/assets/jsons/translations/zh-tw.json
+++ b/assets/jsons/translations/zh-tw.json
@@ -806,7 +806,8 @@
                 "add-folder": "新增文件夾",
                 "link-folder": "關聯文件夾",
                 "unlink-folder": "取消關聯文件夾",
-                "link-all": "關聯所有"
+                "link-all": "關聯所有",
+                "remove-from-the-list": "從列表中移除"
             }
         },
         "adding-shared-folder": {
diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json
index 9418be26..0779d711 100644
--- a/assets/jsons/translations/zh.json
+++ b/assets/jsons/translations/zh.json
@@ -806,7 +806,8 @@
                 "add-folder": "添加文件夹",
                 "link-folder": "关联文件夹",
                 "unlink-folder": "取消关联文件夹",
-                "link-all": "关联所有"
+                "link-all": "关联所有",
+                "remove-from-the-list": "从列表中移除"
             }
         },
         "adding-shared-folder": {
diff --git a/src/renderer/components/modal/modal-types/share-folders-modal.component.tsx b/src/renderer/components/modal/modal-types/share-folders-modal.component.tsx
index d5ca412d..db4eca3a 100644
--- a/src/renderer/components/modal/modal-types/share-folders-modal.component.tsx
+++ b/src/renderer/components/modal/modal-types/share-folders-modal.component.tsx
@@ -216,7 +216,7 @@ const FolderItem = ({ version, relativeFolder, onDelete }: FolderProps) => {
                 {name}
             </span>
             <div className="flex flex-row gap-1.5">
-                <Tippy placement="left" content={t.text(`modals.shared-folders.buttons.${state === FolderLinkState.Linked ? "unlink-folder" : "link-folder"}`)} arrow={false}>
+                <Tippy placement="top" theme="default" content={t.text(`modals.shared-folders.buttons.${state === FolderLinkState.Linked ? "unlink-folder" : "link-folder"}`)}>
                     <LinkButton
                         className="p-0.5 h-7 shrink-0 aspect-square blur-0 cursor-pointer hover:brightness-75"
                         state={state}
@@ -241,15 +241,17 @@ const FolderItem = ({ version, relativeFolder, onDelete }: FolderProps) => {
                         );
                     }
                     return (
-                        <BsmButton
-                            className="aspect-square h-7 rounded-md p-1"
-                            icon="trash"
-                            withBar={false}
-                            onClick={e => {
-                                e.preventDefault();
-                                onDelete?.();
-                            }}
-                        />
+                        <Tippy content={t.text("modals.shared-folders.buttons.remove-from-the-list")} theme="default" hideOnClick={false} placement="top">
+                            <BsmButton
+                                className="aspect-square h-7 rounded-md p-1"
+                                icon="trash"
+                                withBar={false}
+                                onClick={e => {
+                                    e.preventDefault();
+                                    onDelete?.();
+                                }}
+                            />
+                        </Tippy>
                     );
                 })()}
             </div>
diff --git a/src/renderer/components/shared/link-button.component.tsx b/src/renderer/components/shared/link-button.component.tsx
index 3f8446d7..dce72ee7 100644
--- a/src/renderer/components/shared/link-button.component.tsx
+++ b/src/renderer/components/shared/link-button.component.tsx
@@ -1,9 +1,9 @@
 import { motion } from "framer-motion";
 import { useThemeColor } from "renderer/hooks/use-theme-color.hook";
 import { BsmIcon } from "../svgs/bsm-icon.component";
-import { useTranslation } from "renderer/hooks/use-translation.hook";
+import { useTranslationV2 } from "renderer/hooks/use-translation.hook";
 import { FolderLinkState } from "renderer/services/version-folder-linker.service";
-import React from "react";
+import React, { forwardRef } from "react";
 
 export type LinkBtnProps = {
     className?: string;
@@ -12,8 +12,8 @@ export type LinkBtnProps = {
     onClick?: () => unknown;
 };
 
-export function LinkButton({className, title, state, onClick}: LinkBtnProps) {
-    const t = useTranslation();
+export const LinkButton = forwardRef<HTMLDivElement, LinkBtnProps>(({className, title, state, onClick}, forwardedRef) => {
+    const { text: t } = useTranslationV2();
 
     const color = useThemeColor("first-color");
     const disabled = state === FolderLinkState.Processing || state === FolderLinkState.Pending;
@@ -41,6 +41,7 @@ export function LinkButton({className, title, state, onClick}: LinkBtnProps) {
 
     return (
         <motion.div
+            ref={forwardedRef}
             variants={{ hover: { rotate: 22.5 }, tap: { rotate: 45 } }}
             whileHover="hover"
             whileTap="tap"
@@ -55,4 +56,4 @@ export function LinkButton({className, title, state, onClick}: LinkBtnProps) {
             <BsmIcon className="p-1 absolute top-0 left-0 h-full w-full !bg-transparent -rotate-45 brightness-150" icon={state === FolderLinkState.Linked ? "link" : "unlink"} style={{ color: btnColor() }} />
         </motion.div>
     );
-}
+});