diff --git a/messages/bn.json b/messages/bn.json
index 3997fb1a..39f2a512 100644
--- a/messages/bn.json
+++ b/messages/bn.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "সমাধান",
-      "search-by-time": "⏱︎ সময় দ্বারা খুঁজুন",
-      "finalize-session": "সেশন চূড়ান্ত করুন",
-      "eliminate-session": "সেশন বাদ দিন",
-      "archive-sessions-legend": "এই ক্রিয়া একই বিভাগের সব চলমান সেশন আর্কাইভ করবে।",
-      "delete-session-legend": "এই ক্রিয়া শুধুমাত্র নির্বাচিত কিউব সহ আপনার বর্তমান সমাধানগুলি মুছে ফেলবে।",
       "archive": "আর্কাইভ",
       "unarchive": "আনআর্কাইভ",
       "copy": "কপি",
@@ -35,8 +30,7 @@
       "enter-a-comment": "একটি মন্তব্য প্রবেশ করুন",
       "session": "সেশন",
       "all": "সব",
-      "no-cube-selection": "কোনও কিউব নির্বাচিত হয়নি, একটি বেছে নিন...",
-      "no-solves": "দেখানোর জন্য কোনও সমাধান নেই!"
+      "no-cube-selection": "কোনও কিউব নির্বাচিত হয়নি, একটি বেছে নিন..."
     },
     "StatsPage": {
       "title": "পরিসংখ্যান",
@@ -68,8 +62,6 @@
       "add-cube": "কিউব যোগ করুন",
       "favorites": "প্রিয়",
       "list": "তালিকা",
-      "trash-all": "সব মুছুন",
-      "move-all": "সব সরান",
       "create": "তৈরি করুন",
       "confirm": "নিশ্চিত করুন",
       "cancel": "বাতিল করুন",
diff --git a/messages/cs.json b/messages/cs.json
index 5f50937b..21daa6d1 100644
--- a/messages/cs.json
+++ b/messages/cs.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Řešení",
-      "search-by-time": "⏱︎ Hledat podle času",
-      "finalize-session": "Dokončit relaci",
-      "eliminate-session": "Odstranit relaci",
-      "archive-sessions-legend": "Tato akce archivuje všechny probíhající relace ve stejné kategorii.",
-      "delete-session-legend": "Tato akce odstraní pouze vaše aktuální řešení s vybranou kostkou.",
       "archive": "Archivovat",
       "unarchive": "Zrušit archivaci",
       "copy": "Kopírovat",
@@ -35,8 +30,7 @@
       "enter-a-comment": "Zadejte komentář",
       "session": "Relace",
       "all": "Vše",
-      "no-cube-selection": "Není vybrána žádná kostka, vyberte jednu...",
-      "no-solves": "Nejsou k dispozici žádná řešení!"
+      "no-cube-selection": "Není vybrána žádná kostka, vyberte jednu..."
     },
     "StatsPage": {
       "title": "Statistiky",
@@ -68,8 +62,6 @@
       "add-cube": "Přidat kostku",
       "favorites": "Oblíbené",
       "list": "Seznam",
-      "trash-all": "Smazat vše",
-      "move-all": "Přesunout vše",
       "create": "Vytvořit",
       "confirm": "Potvrdit",
       "cancel": "Zrušit",
diff --git a/messages/de.json b/messages/de.json
index 3c95cde5..6e3827e5 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Lösungen",
-      "search-by-time": "⏱︎ Suche nach Zeit",
-      "finalize-session": "Sitzung abschließen",
-      "eliminate-session": "Sitzung löschen",
-      "archive-sessions-legend": "Diese Aktion archiviert alle laufenden Sitzungen derselben Kategorie.",
-      "delete-session-legend": "Diese Aktion löscht nur Ihre aktuellen Lösungen mit dem ausgewählten Würfel.",
       "archive": "Archivieren",
       "unarchive": "Archivierung aufheben",
       "copy": "Kopieren",
@@ -35,8 +30,7 @@
       "enter-a-comment": "Kommentar eingeben",
       "session": "Sitzung",
       "all": "Alle",
-      "no-cube-selection": "Kein Würfel ausgewählt, wählen Sie einen...",
-      "no-solves": "Es gibt keine Lösungen anzuzeigen!"
+      "no-cube-selection": "Kein Würfel ausgewählt, wählen Sie einen..."
     },
     "StatsPage": {
       "title": "Statistiken",
@@ -68,8 +62,6 @@
       "add-cube": "Würfel hinzufügen",
       "favorites": "Favoriten",
       "list": "Liste",
-      "trash-all": "Alles löschen",
-      "move-all": "Alles verschieben",
       "create": "Erstellen",
       "confirm": "Bestätigen",
       "cancel": "Abbrechen",
diff --git a/messages/en.json b/messages/en.json
index 9446e246..38d70c2d 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -23,30 +23,42 @@
     },
     "SolvesPage": {
       "title": "Solves",
-      "search-by-time": "⏱︎ Search by time",
-      "finalize-session": "Finalize session",
-      "eliminate-session": "Eliminate session",
-      "archive-sessions-legend": "This action will archive all ongoing sessions from the same category.",
-      "delete-session-legend": "This action will delete only your current solves with the selected cube.",
-      "archive": "Archive",
-      "unarchive": "Unarchive",
-      "copy": "Copy",
-      "remove": "Remove",
-      "enter-a-comment": "Enter a comment",
       "session": "Session",
-      "all": "All",
-      "no-cube-selection": "No cube selected, choose one...",
-      "no-solves": "There's no solves to show!",
+      "historial": "Historial",
+      "filter-by-time": "Filter by time",
+      "tooltips": {
+        "move-to-history": "Move solves to history"
+      },
+
+      "dialogs": {
+        "move-to-history": "Move solves to history?",
+        "move-to-history-para": "You will be able to access them by tapping the history switch."
+      },
+
+      "toast": {
+        "unable-action": "Unable action",
+        "warning-select-cube": "Please select a cube before.",
+        "success-copy": "Copied successfully",
+        "success-copy-description": "Has been copied to your clipboard."
+      },
+
+      "alert": {
+        "title": "Attention!",
+        "empty-cubes": "No cube selected. Please choose one."
+      },
+
+      "empty-solves": "Nothing here yet!",
+      "empty-solves-description": "Tap the switch at the top of the screen to see your history.",
+
+      "sort": "Sort",
       "time": "Time",
       "date": "Date",
+      "order": "Order",
       "ascending": "Ascending",
       "descending": "Descending",
-      "sort-by": "Sort by...",
-      "share": "Share...",
-      "share-stats-title": "Generated by NexusTimer",
-      "average": "Average",
-      "list-of-times": "List of times",
-      "last": "Last"
+      "share": "Share",
+      "last": "Last",
+      "all": "All"
     },
     "StatsPage": {
       "title": "Stats",
@@ -105,8 +117,7 @@
       "add-cube": "Add cube",
       "favorites": "Favorites",
       "list": "List",
-      "trash-all": "Trash All",
-      "move-all": "Move All",
+      "move": "Move",
       "create": "Create",
       "confirm": "Confirm",
       "cancel": "Cancel",
@@ -114,6 +125,14 @@
       "delete": "Delete",
       "none": "None"
     },
+
+    "tooltips": {
+      "plus-two": "+2 Penalty",
+      "delete": "Delete",
+      "bookmark": "Bookmark",
+      "copy": "Copy"
+    },
+
     "Settings-menu": {
       "title": "Settings",
       "locale": "Region",
diff --git a/messages/es.json b/messages/es.json
index e2269797..20cfd7e1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Soluciones",
-      "search-by-time": "⏱︎ Buscar por tiempo",
-      "finalize-session": "Finalizar sesión",
-      "eliminate-session": "Eliminar sesión",
-      "archive-sessions-legend": "Esta acción archivará todas las sesiones en curso de la misma categoría.",
-      "delete-session-legend": "Esta acción eliminará solo tus soluciones actuales con el cubo seleccionado.",
       "archive": "Archivar",
       "unarchive": "Desarchivar",
       "copy": "Copiar",
@@ -36,16 +31,12 @@
       "session": "Sesión",
       "all": "Todos",
       "no-cube-selection": "No se ha seleccionado ningún cubo, elige uno...",
-      "no-solves": "¡No hay soluciones para mostrar!",
       "ascending": "Ascendente",
       "date": "Fecha",
       "descending": "Descendente",
       "sort-by": "Ordenar por...",
       "time": "Tiempo",
-      "share-stats-title": "Generado por NexusTimer",
-      "average": "Promedio",
       "share": "Compartir...",
-      "list-of-times": "Lista de tiempos",
       "last": "Último"
     },
     "StatsPage": {
@@ -78,8 +69,6 @@
       "add-cube": "Agregar cubo",
       "favorites": "Favoritos",
       "list": "Lista",
-      "trash-all": "Eliminar Todo",
-      "move-all": "Mover Todo",
       "create": "Crear",
       "confirm": "Confirmar",
       "cancel": "Cancelar",
diff --git a/messages/et.json b/messages/et.json
index b2841ef4..8555cbdc 100644
--- a/messages/et.json
+++ b/messages/et.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Lahendused",
-      "search-by-time": "⏱︎ Otsi aja järgi",
-      "finalize-session": "Lõpeta sessioon",
-      "eliminate-session": "Kustuta sessioon",
-      "archive-sessions-legend": "See toiming arhiveerib kõik samast kategooriast pärinevad hetkel toimuvad sessioonid.",
-      "delete-session-legend": "See toiming kustutab ainult teie praegused lahendused valitud kuubiga.",
       "archive": "Arhiveeri",
       "unarchive": "Arhiivita",
       "copy": "Kopeeri",
@@ -36,7 +31,6 @@
       "session": "Sessioon",
       "all": "Kõik",
       "no-cube-selection": "Kuupi pole valitud, valige üks...",
-      "no-solves": "Lahendusi pole näidata!",
       "ascending": "Kasvav",
       "date": "Kuupäev",
       "descending": "Langevad",
@@ -73,8 +67,6 @@
       "add-cube": "Lisa kuup",
       "favorites": "Lemmikud",
       "list": "Nimekiri",
-      "trash-all": "Prügikast kõik",
-      "move-all": "Liiguta kõik",
       "create": "Loo",
       "confirm": "Kinnita",
       "cancel": "Tühista",
diff --git a/messages/fi.json b/messages/fi.json
index 9d9296e8..c48d10c4 100644
--- a/messages/fi.json
+++ b/messages/fi.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Ratkaisut",
-      "search-by-time": "⏱︎ Etsi ajan perusteella",
-      "finalize-session": "Päätä istunto",
-      "eliminate-session": "Poista istunto",
-      "archive-sessions-legend": "Tämä toiminto arkistoi kaikki saman luokan parhaillaan käynnissä olevat istunnot.",
-      "delete-session-legend": "Tämä toiminto poistaa vain nykyiset ratkaisusi valitulla kuutiolla.",
       "archive": "Arkistoi",
       "unarchive": "Poista arkisto",
       "copy": "Kopioi",
@@ -36,7 +31,6 @@
       "session": "Istunto",
       "all": "Kaikki",
       "no-cube-selection": "Ei valittua kuutiota, valitse yksi...",
-      "no-solves": "Ei ratkaisuja näytettäväksi!",
       "ascending": "Nouseva",
       "date": "Päivämäärä",
       "descending": "Laskeva",
@@ -73,8 +67,6 @@
       "add-cube": "Lisää kuutio",
       "favorites": "Suosikit",
       "list": "Lista",
-      "trash-all": "Roskakori kaikki",
-      "move-all": "Siirrä kaikki",
       "create": "Luo",
       "confirm": "Vahvista",
       "cancel": "Peruuta",
diff --git a/messages/fr.json b/messages/fr.json
index dbfe8fd5..ddbfb979 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Résolutions",
-      "search-by-time": "⏱︎ Recherche par temps",
-      "finalize-session": "Finaliser la session",
-      "eliminate-session": "Éliminer la session",
-      "archive-sessions-legend": "Cette action archivera toutes les sessions en cours de la même catégorie.",
-      "delete-session-legend": "Cette action supprimera uniquement vos résolutions actuelles avec le cube sélectionné.",
       "archive": "Archiver",
       "unarchive": "Désarchiver",
       "copy": "Copier",
@@ -36,7 +31,6 @@
       "session": "Session",
       "all": "Tout",
       "no-cube-selection": "Aucun cube sélectionné, choisissez-en un...",
-      "no-solves": "Il n'y a pas de résolutions à afficher !",
       "ascending": "Ascendant",
       "date": "Date",
       "descending": "Descendant",
@@ -73,8 +67,6 @@
       "add-cube": "Ajouter un cube",
       "favorites": "Favoris",
       "list": "Liste",
-      "trash-all": "Tout supprimer",
-      "move-all": "Tout déplacer",
       "create": "Créer",
       "confirm": "Confirmer",
       "cancel": "Annuler",
diff --git a/messages/hi.json b/messages/hi.json
index 47977369..cd7f6ee9 100644
--- a/messages/hi.json
+++ b/messages/hi.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "समाधान",
-      "search-by-time": "समय द्वारा खोजें",
-      "finalize-session": "सत्ताकरण सत्र",
-      "eliminate-session": "सत्र को निकालें",
-      "archive-sessions-legend": "यह कार्रवाई एक ही श्रेणी की सभी चल रही सत्रों को संग्रहीत करेगी।",
-      "delete-session-legend": "यह कार्रवाई केवल चयनित क्यूब के साथ आपके वर्तमान समाधानों को हटा देगी।",
       "archive": "संग्रहीत",
       "unarchive": "संग्रह रद्द करें",
       "copy": "प्रतिलिपि",
@@ -36,7 +31,6 @@
       "session": "सत्र",
       "all": "सभी",
       "no-cube-selection": "कोई क्यूब चयनित नहीं है, कोई एक चुनें...",
-      "no-solves": "दिखाने के लिए कोई समाधान नहीं है!",
       "ascending": "आरोही",
       "date": "तारीख",
       "descending": "अवरोही",
@@ -73,8 +67,6 @@
       "add-cube": "क्यूब जोड़ें",
       "favorites": "पसंती",
       "list": "सूची",
-      "trash-all": "सभी को अपशिष्ट करें",
-      "move-all": "सभी को हटाएं",
       "create": "बनाएं",
       "confirm": "पुष्टि करें",
       "cancel": "रद्द करें",
diff --git a/messages/hu.json b/messages/hu.json
index 39835bcd..fdc98eb0 100644
--- a/messages/hu.json
+++ b/messages/hu.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Megoldások",
-      "search-by-time": "⏱︎ Keresés idő szerint",
-      "finalize-session": "Munkamenet befejezése",
-      "eliminate-session": "Munkamenet törlése",
-      "archive-sessions-legend": "Ezzel az intézkedéssel minden azonos kategóriájú folyamatban lévő munkamenetet archivál.",
-      "delete-session-legend": "Ezzel az intézkedéssel csak az aktuális megoldások törlődnek a kiválasztott kockával.",
       "archive": "Archiválás",
       "unarchive": "Archiválás megszüntetése",
       "copy": "Másolás",
@@ -36,7 +31,6 @@
       "session": "Munkamenet",
       "all": "Mind",
       "no-cube-selection": "Nincs kiválasztott kocka, válasszon egyet...",
-      "no-solves": "Nincsenek megoldások megjelenítésre!",
       "ascending": "Emelkedő",
       "date": "Dátum",
       "descending": "Csökkenő",
@@ -73,8 +67,6 @@
       "add-cube": "Kocka hozzáadása",
       "favorites": "Kedvencek",
       "list": "Lista",
-      "trash-all": "Összes kidobása",
-      "move-all": "Összes mozgatása",
       "create": "Létrehoz",
       "confirm": "Megerősít",
       "cancel": "Mégse",
diff --git a/messages/id.json b/messages/id.json
index 20c94413..bc92875a 100644
--- a/messages/id.json
+++ b/messages/id.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Penyelesaian",
-      "search-by-time": "⏱︎ Cari berdasarkan waktu",
-      "finalize-session": "Selesaikan sesi",
-      "eliminate-session": "Hapus sesi",
-      "archive-sessions-legend": "Tindakan ini akan mengarsipkan semua sesi yang sedang berlangsung dari kategori yang sama.",
-      "delete-session-legend": "Tindakan ini hanya akan menghapus penyelesaian Anda saat ini dengan kubus yang dipilih.",
       "archive": "Arsip",
       "unarchive": "Buka arsip",
       "copy": "Salin",
@@ -36,7 +31,6 @@
       "session": "Sesi",
       "all": "Semua",
       "no-cube-selection": "Tidak ada kubus yang dipilih, pilih satu...",
-      "no-solves": "Tidak ada penyelesaian untuk ditampilkan!",
       "time": "Waktu",
       "sort-by": "Sortir dengan...",
       "descending": "Menurun",
@@ -73,8 +67,6 @@
       "add-cube": "Tambahkan kubus",
       "favorites": "Favorit",
       "list": "Daftar",
-      "trash-all": "Buang Semua",
-      "move-all": "Pindahkan Semua",
       "create": "Buat",
       "confirm": "Konfirmasi",
       "cancel": "Batal",
diff --git a/messages/it.json b/messages/it.json
index d166f805..4588d9b8 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Risoluzioni",
-      "search-by-time": "⏱︎ Cerca per tempo",
-      "finalize-session": "Concludi sessione",
-      "eliminate-session": "Elimina sessione",
-      "archive-sessions-legend": "Questa azione archivierà tutte le sessioni in corso della stessa categoria.",
-      "delete-session-legend": "Questa azione eliminerà solo le tue risoluzioni attuali con il cubo selezionato.",
       "archive": "Archivia",
       "unarchive": "Rimuovi dall'archivio",
       "copy": "Copia",
@@ -36,7 +31,6 @@
       "session": "Sessione",
       "all": "Tutto",
       "no-cube-selection": "Nessun cubo selezionato, scegline uno...",
-      "no-solves": "Non ci sono risoluzioni da mostrare!",
       "time": "Tempo",
       "sort-by": "Ordina per...",
       "descending": "Discendente",
@@ -73,8 +67,6 @@
       "add-cube": "Aggiungi cubo",
       "favorites": "Preferiti",
       "list": "Lista",
-      "trash-all": "Elimina tutto",
-      "move-all": "Sposta tutto",
       "create": "Crea",
       "confirm": "Conferma",
       "cancel": "Annulla",
diff --git a/messages/ja.json b/messages/ja.json
index 12ac9b41..17e4692c 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "解答",
-      "search-by-time": "⏱︎ 時間で検索",
-      "finalize-session": "セッションを終了",
-      "eliminate-session": "セッションを削除",
-      "archive-sessions-legend": "この操作は同じカテゴリのすべての進行中のセッションをアーカイブします。",
-      "delete-session-legend": "この操作は選択したキューブの現在の解答のみを削除します。",
       "archive": "アーカイブ",
       "unarchive": "アーカイブ解除",
       "copy": "コピー",
@@ -36,7 +31,6 @@
       "session": "セッション",
       "all": "すべて",
       "no-cube-selection": "キューブが選択されていません。選択してください...",
-      "no-solves": "表示する解答はありません！",
       "time": "時間",
       "sort-by": "並べ替え...",
       "descending": "降順",
@@ -73,8 +67,6 @@
       "add-cube": "キューブを追加",
       "favorites": "お気に入り",
       "list": "リスト",
-      "trash-all": "すべて削除",
-      "move-all": "すべて移動",
       "create": "作成",
       "confirm": "確認",
       "cancel": "キャンセル",
diff --git a/messages/ko.json b/messages/ko.json
index 0ba34949..84627dc2 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "해결",
-      "search-by-time": "⏱︎ 시간별 검색",
-      "finalize-session": "세션 완료",
-      "eliminate-session": "세션 제거",
-      "archive-sessions-legend": "이 작업은 동일한 카테고리의 모든 진행 중인 세션을 아카이브합니다.",
-      "delete-session-legend": "이 작업은 선택한 큐브의 현재 해결만 삭제합니다.",
       "archive": "아카이브",
       "unarchive": "아카이브 해제",
       "copy": "복사",
@@ -36,7 +31,6 @@
       "session": "세션",
       "all": "모두",
       "no-cube-selection": "큐브가 선택되지 않았습니다. 하나를 선택하세요...",
-      "no-solves": "표시할 해결이 없습니다!",
       "sort-by": "정렬 기준...",
       "descending": "내림차순",
       "date": "날짜",
@@ -73,8 +67,6 @@
       "add-cube": "큐브 추가",
       "favorites": "즐겨찾기",
       "list": "목록",
-      "trash-all": "모두 삭제",
-      "move-all": "모두 이동",
       "create": "생성",
       "confirm": "확인",
       "cancel": "취소",
diff --git a/messages/ms.json b/messages/ms.json
index cd5df107..22e46943 100644
--- a/messages/ms.json
+++ b/messages/ms.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Penyelesaian",
-      "search-by-time": "⏱︎ Cari mengikut masa",
-      "finalize-session": "Selesai sesi",
-      "eliminate-session": "Hapus sesi",
-      "archive-sessions-legend": "Tindakan ini akan mengarkibkan semua sesi yang sedang berlangsung dari kategori yang sama.",
-      "delete-session-legend": "Tindakan ini hanya akan memadam penyelesaian semasa anda dengan kubus yang dipilih.",
       "archive": "Arkib",
       "unarchive": "Buka arkib",
       "copy": "Salin",
@@ -36,7 +31,6 @@
       "session": "Sesi",
       "all": "Semua",
       "no-cube-selection": "Tiada pemilihan kubus, pilih satu...",
-      "no-solves": "Tiada penyelesaian untuk dipaparkan!",
       "time": "Masa",
       "sort-by": "Disusun mengikut...",
       "descending": "Menurun",
@@ -73,8 +67,6 @@
       "add-cube": "Tambah kubus",
       "favorites": "Kegemaran",
       "list": "Senarai",
-      "trash-all": "Buang Semua",
-      "move-all": "Pindahkan Semua",
       "create": "Cipta",
       "confirm": "Sahkan",
       "cancel": "Batal",
diff --git a/messages/nl.json b/messages/nl.json
index 3a9199b4..627af7b7 100644
--- a/messages/nl.json
+++ b/messages/nl.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Oplossingen",
-      "search-by-time": "⏱︎ Zoek op tijd",
-      "finalize-session": "Sessie afronden",
-      "eliminate-session": "Sessie verwijderen",
-      "archive-sessions-legend": "Deze actie zal alle lopende sessies van dezelfde categorie archiveren.",
-      "delete-session-legend": "Deze actie verwijdert alleen uw huidige oplossingen met de geselecteerde kubus.",
       "archive": "Archiveren",
       "unarchive": "De-archiveren",
       "copy": "Kopiëren",
@@ -36,7 +31,6 @@
       "session": "Sessie",
       "all": "Alle",
       "no-cube-selection": "Geen kubus geselecteerd, kies er een...",
-      "no-solves": "Er zijn geen oplossingen om te tonen!",
       "time": "Tijd",
       "sort-by": "Sorteer op...",
       "descending": "Aflopend",
@@ -73,8 +67,6 @@
       "add-cube": "Kubus Toevoegen",
       "favorites": "Favorieten",
       "list": "Lijst",
-      "trash-all": "Alles Verwijderen",
-      "move-all": "Alles Verplaatsen",
       "create": "Creëren",
       "confirm": "Bevestigen",
       "cancel": "Annuleren",
diff --git a/messages/no.json b/messages/no.json
index 2687cd60..c53dcc7b 100644
--- a/messages/no.json
+++ b/messages/no.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Løsninger",
-      "search-by-time": "⏱︎ Søk etter tid",
-      "finalize-session": "Fullfør økt",
-      "eliminate-session": "Fjern økt",
-      "archive-sessions-legend": "Denne handlingen vil arkivere alle pågående økter fra samme kategori.",
-      "delete-session-legend": "Denne handlingen vil bare slette dine gjeldende løsninger med den valgte kuben.",
       "archive": "Arkiv",
       "unarchive": "Avarkiv",
       "copy": "Kopiere",
@@ -36,7 +31,6 @@
       "session": "Økt",
       "all": "Alle",
       "no-cube-selection": "Ingen kube valgt, velg en...",
-      "no-solves": "Det er ingen løsninger å vise!",
       "time": "Tid",
       "sort-by": "Sorter etter...",
       "descending": "Synkende",
@@ -73,8 +67,6 @@
       "add-cube": "Legg til kube",
       "favorites": "Favoritter",
       "list": "Liste",
-      "trash-all": "Kast Alt",
-      "move-all": "Flytt Alt",
       "create": "Opprett",
       "confirm": "Bekreft",
       "cancel": "Avbryt",
diff --git a/messages/pl.json b/messages/pl.json
index 982bb7e8..ece057f2 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Rozwiązania",
-      "search-by-time": "⏱︎ Szukaj według czasu",
-      "finalize-session": "Zakończ sesję",
-      "eliminate-session": "Usuń sesję",
-      "archive-sessions-legend": "Ta czynność spowoduje zarchiwizowanie wszystkich trwających sesji z tej samej kategorii.",
-      "delete-session-legend": "Ta czynność usunie tylko Twoje aktualne rozwiązania z wybranej kostki.",
       "archive": "Archiwum",
       "unarchive": "Usuń z archiwum",
       "copy": "Kopiuj",
@@ -36,7 +31,6 @@
       "session": "Sesja",
       "all": "Wszystkie",
       "no-cube-selection": "Nie wybrano kostki, wybierz jedną...",
-      "no-solves": "Brak rozwiązań do wyświetlenia!",
       "time": "Czas",
       "descending": "Malejąco",
       "date": "Data",
@@ -73,8 +67,6 @@
       "add-cube": "Dodaj kostkę",
       "favorites": "Ulubione",
       "list": "Lista",
-      "trash-all": "Wyrzuć wszystko",
-      "move-all": "Przenieś wszystko",
       "create": "Utwórz",
       "confirm": "Potwierdź",
       "cancel": "Anuluj",
diff --git a/messages/pt.json b/messages/pt.json
index ee80825f..0bc0a547 100644
--- a/messages/pt.json
+++ b/messages/pt.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Soluções",
-      "search-by-time": "⏱︎ Pesquisar por tempo",
-      "finalize-session": "Finalizar sessão",
-      "eliminate-session": "Eliminar sessão",
-      "archive-sessions-legend": "Esta ação arquivará todas as sessões em andamento da mesma categoria.",
-      "delete-session-legend": "Esta ação excluirá apenas suas soluções atuais com o cubo selecionado.",
       "archive": "Arquivar",
       "unarchive": "Desarquivar",
       "copy": "Copiar",
@@ -36,7 +31,6 @@
       "session": "Sessão",
       "all": "Todos",
       "no-cube-selection": "Nenhum cubo selecionado, escolha um...",
-      "no-solves": "Não há soluções para mostrar!",
       "time": "Tempo",
       "sort-by": "Ordenar por...",
       "descending": "descendente",
@@ -73,8 +67,6 @@
       "add-cube": "Adicionar cubo",
       "favorites": "Favoritos",
       "list": "Lista",
-      "trash-all": "Excluir todos",
-      "move-all": "Mover todos",
       "create": "Criar",
       "confirm": "Confirmar",
       "cancel": "Cancelar",
diff --git a/messages/ro.json b/messages/ro.json
index 3956d296..9fac89f0 100644
--- a/messages/ro.json
+++ b/messages/ro.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Soluții",
-      "search-by-time": "⏱️ Căutați după timp",
-      "finalize-session": "Finalizați sesiunea",
-      "eliminate-session": "Eliminați sesiunea",
-      "archive-sessions-legend": "Această acțiune va arhiva toate sesiunile în curs din aceeași categorie.",
-      "delete-session-legend": "Această acțiune va șterge doar soluțiile curente cu cubul selectat.",
       "archive": "Arhivă",
       "unarchive": "Dezarhivare",
       "copy": "Copiere",
@@ -36,7 +31,6 @@
       "session": "Sesiune",
       "all": "Toate",
       "no-cube-selection": "Niciun cub selectat, alegeți unul...",
-      "no-solves": "Nu sunt soluții de afișat!",
       "time": "Timp",
       "sort-by": "Filtrează după...",
       "descending": "Descendentă",
@@ -73,8 +67,6 @@
       "add-cube": "Adăugați cub",
       "favorites": "Favorite",
       "list": "Listă",
-      "trash-all": "Aruncă tot",
-      "move-all": "Mută tot",
       "create": "Creează",
       "confirm": "Confirmare",
       "cancel": "Anulare",
diff --git a/messages/ru.json b/messages/ru.json
index b147a531..14b70b60 100644
--- a/messages/ru.json
+++ b/messages/ru.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Решения",
-      "search-by-time": "⏱️ Поиск по времени",
-      "finalize-session": "Завершить сессию",
-      "eliminate-session": "Удалить сессию",
-      "archive-sessions-legend": "Это действие архивирует все текущие сессии из той же категории.",
-      "delete-session-legend": "Это действие удалит только ваши текущие решения с выбранным кубом.",
       "archive": "Архивировать",
       "unarchive": "Разархивировать",
       "copy": "Копировать",
@@ -36,16 +31,12 @@
       "session": "Сессия",
       "all": "Все",
       "no-cube-selection": "Куб не выбран, выберите один...",
-      "no-solves": "Нет решений для отображения!",
       "ascending": "Восходящий",
       "date": "Дата",
       "descending": "По убыванию",
       "sort-by": "Сортировать по...",
       "time": "Время",
       "share": "Поделиться...",
-      "share-stats-title": "Сгенерировано с помощью NexusTimer",
-      "average": "Среднее из",
-      "list-of-times": "Список времен",
       "last": "Последнее"
     },
     "StatsPage": {
@@ -78,8 +69,6 @@
       "add-cube": "Добавить кубик",
       "favorites": "Избранное",
       "list": "Список",
-      "trash-all": "Удалить все",
-      "move-all": "Переместить все",
       "create": "Создать",
       "confirm": "Подтвердить",
       "cancel": "Отмена",
diff --git a/messages/sk.json b/messages/sk.json
index 02c564fc..50fe96fd 100644
--- a/messages/sk.json
+++ b/messages/sk.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Riešenia",
-      "search-by-time": "⏱️ Hľadať podľa času",
-      "finalize-session": "Dokončiť reláciu",
-      "eliminate-session": "Odstrániť reláciu",
-      "archive-sessions-legend": "Táto akcia archivuje všetky aktuálne relácie z rovnakej kategórie.",
-      "delete-session-legend": "Táto akcia vymaže iba vaše aktuálne riešenia s vybranou kockou.",
       "archive": "Archív",
       "unarchive": "Obnoviť archív",
       "copy": "Kopírovať",
@@ -36,7 +31,6 @@
       "session": "Relácia",
       "all": "Všetky",
       "no-cube-selection": "Nevybrali ste kocku, vyberte jednu...",
-      "no-solves": "Nie sú žiadne riešenia na zobrazenie!",
       "ascending": "Vzostupne",
       "date": "Dátum",
       "descending": "Zostupne",
@@ -73,8 +67,6 @@
       "add-cube": "Pridať kocku",
       "favorites": "Obľúbené",
       "list": "Zoznam",
-      "trash-all": "Zahodiť všetko",
-      "move-all": "Presunúť všetko",
       "create": "Vytvoriť",
       "confirm": "Potvrdiť",
       "cancel": "Zrušiť",
diff --git a/messages/sv.json b/messages/sv.json
index 9979c152..0708df62 100644
--- a/messages/sv.json
+++ b/messages/sv.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Lösningar",
-      "search-by-time": "⏱️ Sök efter tid",
-      "finalize-session": "Avsluta session",
-      "eliminate-session": "Eliminera session",
-      "archive-sessions-legend": "Denna åtgärd kommer att arkivera alla pågående sessioner från samma kategori.",
-      "delete-session-legend": "Denna åtgärd kommer endast att radera dina nuvarande lösningar med den valda kuben.",
       "archive": "Arkiv",
       "unarchive": "Avarkivera",
       "copy": "Kopiera",
@@ -36,7 +31,6 @@
       "session": "Session",
       "all": "Alla",
       "no-cube-selection": "Ingen kub vald, välj en...",
-      "no-solves": "Det finns inga lösningar att visa!",
       "descending": "Nedåtgående",
       "date": "Datum",
       "ascending": "Stigande",
@@ -73,8 +67,6 @@
       "add-cube": "Lägg till kub",
       "favorites": "Favoriter",
       "list": "Lista",
-      "trash-all": "Kasta alla",
-      "move-all": "Flytta alla",
       "create": "Skapa",
       "confirm": "Bekräfta",
       "cancel": "Avbryt",
diff --git a/messages/tr.json b/messages/tr.json
index 739dec66..f2a65395 100644
--- a/messages/tr.json
+++ b/messages/tr.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Çözümler",
-      "search-by-time": "⏱️ Zamana göre arama",
-      "finalize-session": "Oturumu sonlandır",
-      "eliminate-session": "Oturumu sil",
-      "archive-sessions-legend": "Bu işlem, aynı kategorideki tüm devam eden oturumları arşivleyecektir.",
-      "delete-session-legend": "Bu işlem, yalnızca seçilen küp ile mevcut çözümlerinizi silecektir.",
       "archive": "Arşiv",
       "unarchive": "Arşivden çıkar",
       "copy": "Kopyala",
@@ -36,7 +31,6 @@
       "session": "Oturum",
       "all": "Tümü",
       "no-cube-selection": "Hiçbir küp seçilmedi, bir tane seçin...",
-      "no-solves": "Gösterilecek çözüm yok!",
       "descending": "Azalan",
       "ascending": "Artan",
       "date": "Tarih",
@@ -73,8 +67,6 @@
       "add-cube": "Küp ekle",
       "favorites": "Favoriler",
       "list": "Liste",
-      "trash-all": "Tümünü sil",
-      "move-all": "Tümünü taşı",
       "create": "Oluştur",
       "confirm": "Onayla",
       "cancel": "İptal",
diff --git a/messages/uk.json b/messages/uk.json
index a661533b..8cfcf3a6 100644
--- a/messages/uk.json
+++ b/messages/uk.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Розв'язки",
-      "search-by-time": "⏱️ Пошук за часом",
-      "finalize-session": "Завершити сеанс",
-      "eliminate-session": "Вилучити сеанс",
-      "archive-sessions-legend": "Ця дія архівує всі поточні сеанси з тієї ж категорії.",
-      "delete-session-legend": "Ця дія видалить лише ваші поточні розв'язки з вибраним кубом.",
       "archive": "Архівувати",
       "unarchive": "Розархівувати",
       "copy": "Копіювати",
@@ -36,7 +31,6 @@
       "session": "Сеанс",
       "all": "Bci",
       "no-cube-selection": "Ky6 не вибрано, виберіть один...",
-      "no-solves": "Немає розв'язків для відображення!",
       "ascending": "Висхідний",
       "date": "Дата",
       "descending": "Спускається",
@@ -73,8 +67,6 @@
       "add-cube": "Додати куб",
       "favorites": "Вподобані",
       "list": "Список",
-      "trash-all": "Викинути все",
-      "move-all": "Перемістити все",
       "create": "Створити",
       "confirm": "Підтвердити",
       "cancel": "Скасувати",
diff --git a/messages/vi.json b/messages/vi.json
index d9747fc9..ba32d0e5 100644
--- a/messages/vi.json
+++ b/messages/vi.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "Giải quyết",
-      "search-by-time": "⏱️ Tìm kiếm theo thời gian",
-      "finalize-session": "Hoàn thành phiên",
-      "eliminate-session": "Loại bỏ phiên",
-      "archive-sessions-legend": "Hành động này sẽ lưu trữ tất cả các phiên đang diễn ra từ cùng một danh mục.",
-      "delete-session-legend": "Hành động này sẽ chỉ xóa các giải quyết hiện tại của bạn với khối đã chọn.",
       "archive": "Lưu trữ",
       "unarchive": "Bỏ lưu trữ",
       "copy": "Sao chép",
@@ -36,7 +31,6 @@
       "session": "Phiên",
       "all": "Tất cả",
       "no-cube-selection": "Không có khối nào được chọn, hãy chọn một...",
-      "no-solves": "Không có giải pháp để hiển thị!",
       "ascending": "Tăng dần",
       "date": "Ngày",
       "descending": "Giảm dần",
@@ -73,8 +67,6 @@
       "add-cube": "Thêm khối",
       "favorites": "Yêu thích",
       "list": "Danh sách",
-      "trash-all": "Xóa tất cả",
-      "move-all": "Di chuyển tất cả",
       "create": "Tạo",
       "confirm": "Xác nhận",
       "cancel": "Hủy",
diff --git a/messages/zh.json b/messages/zh.json
index fec0ffc9..1d84ce6a 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -23,11 +23,6 @@
     },
     "SolvesPage": {
       "title": "解决方案",
-      "search-by-time": "⏱️ 按时间搜索",
-      "finalize-session": "完成会话",
-      "eliminate-session": "消除会话",
-      "archive-sessions-legend": "此操作将存档同一类别中的所有正在进行的会话。",
-      "delete-session-legend": "此操作将仅删除所选魔方的当前解决方案。",
       "archive": "存档",
       "unarchive": "取消存档",
       "copy": "复制",
@@ -36,7 +31,6 @@
       "session": "会话",
       "all": "全部",
       "no-cube-selection": "未选择魔方，请选择一个...",
-      "no-solves": "没有解决方案可显示！",
       "ascending": "上升",
       "date": "日期",
       "descending": "降序",
@@ -73,8 +67,6 @@
       "add-cube": "添加魔方",
       "favorites": "收藏夹",
       "list": "列表",
-      "trash-all": "清空全部",
-      "move-all": "全部移动",
       "create": "创建",
       "confirm": "确认",
       "cancel": "取消",
diff --git a/src/app/[locale]/solves/page.tsx b/src/app/[locale]/solves/page.tsx
index ca55e363..1cf6c8c7 100644
--- a/src/app/[locale]/solves/page.tsx
+++ b/src/app/[locale]/solves/page.tsx
@@ -23,12 +23,14 @@ import {
 import { useState } from "react";
 import DialogMoveHistorial from "@/components/dialogs/dialog-move-historial/dialog-move-historial";
 import { Dialog } from "@/components/ui/dialog";
+import { useTranslations } from "next-intl";
 
 export default function Page() {
   const { isDialogSolveOpen, handleCloseDialogSolve } = useDialogSolve();
   const { handleSearch, handleChangeTab, tab } = useSolveFiltersStore();
   const { selectedCube } = useTimerStore();
   const [isOpen, setIsOpen] = useState(false); // Used for move-historial button
+  const t = useTranslations("Index");
   return (
     <>
       {/* container */}
@@ -36,7 +38,7 @@ export default function Page() {
         {/* header */}
         <Card className="w-full mb-2 border p-3 flex flex-col gap-2">
           <div className="flex justify-between gap-10">
-            <h2 className="font-black text-xl">Solves</h2>
+            <h2 className="font-black text-xl">{t("SolvesPage.title")}</h2>
             <div className="flex items-center gap-2 w-full justify-end">
               <MainCubeSelector />
             </div>
@@ -49,13 +51,17 @@ export default function Page() {
               onValueChange={(e: any) => handleChangeTab(e)}
             >
               <TabsList>
-                <TabsTrigger value="session">Session</TabsTrigger>
-                <TabsTrigger value="all">Historial</TabsTrigger>
+                <TabsTrigger value="session">
+                  {t("SolvesPage.session")}
+                </TabsTrigger>
+                <TabsTrigger value="all">
+                  {t("SolvesPage.historial")}
+                </TabsTrigger>
               </TabsList>
             </Tabs>
 
             <Input
-              placeholder="Filter by time"
+              placeholder={t("SolvesPage.filter-by-time")}
               onChange={(e) => handleSearch(e.target.value)}
             />
             <TooltipProvider delayDuration={100}>
@@ -66,7 +72,7 @@ export default function Page() {
                   </Button>
                 </TooltipTrigger>
                 <TooltipContent>
-                  <p>Move solves to history</p>
+                  <p>{t("SolvesPage.tooltips.move-to-history")}</p>
                 </TooltipContent>
               </Tooltip>
             </TooltipProvider>
diff --git a/src/components/MainCubeSelector.tsx b/src/components/MainCubeSelector.tsx
index 1262f2b6..1eb2e61e 100644
--- a/src/components/MainCubeSelector.tsx
+++ b/src/components/MainCubeSelector.tsx
@@ -7,9 +7,11 @@ import {
 } from "@/components/ui/select";
 import { cubeCollection } from "@/lib/const/cubeCollection";
 import { useTimerStore } from "@/store/timerStore";
+import { useTranslations } from "next-intl";
 import Image from "next/image";
 
 export default function MainCubeSelector() {
+  const t = useTranslations("Index");
   const { cubes, setSelectedCube, setNewScramble, setLastSolve, selectedCube } =
     useTimerStore();
   const handleChangeValue = (e: any) => {
@@ -23,7 +25,7 @@ export default function MainCubeSelector() {
     <>
       <Select defaultValue={selectedCube?.id} onValueChange={handleChangeValue}>
         <SelectTrigger className="max-w-96">
-          <SelectValue placeholder="Select an option" />
+          <SelectValue placeholder={t("Inputs.select")} />
         </SelectTrigger>
         <SelectContent>
           {cubes
diff --git a/src/components/dialogs/dialog-move-historial/dialog-move-historial.tsx b/src/components/dialogs/dialog-move-historial/dialog-move-historial.tsx
index 99afc7ea..4a2b69aa 100644
--- a/src/components/dialogs/dialog-move-historial/dialog-move-historial.tsx
+++ b/src/components/dialogs/dialog-move-historial/dialog-move-historial.tsx
@@ -8,8 +8,8 @@ import {
 } from "@/components/ui/dialog";
 import { getAllCubes, getCubeById } from "@/db/dbOperations";
 import finishSession from "@/lib/finishSession";
-import { useSolveFiltersStore } from "@/store/SolvesFilters";
 import { useTimerStore } from "@/store/timerStore";
+import { useTranslations } from "next-intl";
 import { toast } from "sonner";
 
 export default function DialogMoveHistorial({
@@ -17,9 +17,9 @@ export default function DialogMoveHistorial({
 }: {
   handleClose: () => void;
 }) {
+  const t = useTranslations("Index");
   const { selectedCube, cubes, setCubes, setSelectedCube, setTimerStatistics } =
     useTimerStore();
-  const { tab } = useSolveFiltersStore();
 
   const handleMoveSessionToHistorial = async () => {
     if (selectedCube) {
@@ -33,8 +33,8 @@ export default function DialogMoveHistorial({
       return;
     }
 
-    toast("Unable action", {
-      description: "Please select a cube before.",
+    toast(t("SolvesPage.toast.unable-action"), {
+      description: t("SolvesPage.toast.warning-select-cube"),
     });
   };
 
@@ -42,17 +42,17 @@ export default function DialogMoveHistorial({
     <>
       <DialogContent className="max-w-96 rounded-md">
         <DialogHeader>
-          <DialogTitle>Move solves to history?</DialogTitle>
+          <DialogTitle>{t("SolvesPage.dialogs.move-to-history")}</DialogTitle>
           <DialogDescription>
-            You will be able to access them by tapping the history switch.
+            {t("SolvesPage.dialogs.move-to-history-para")}
           </DialogDescription>
           <DialogFooter>
-            <div className="flex gap-1 mt-5">
+            <div className="flex justify-end gap-1 mt-5">
               <Button variant={"ghost"} onClick={handleClose}>
-                Cancel
+                {t("Inputs.cancel")}
               </Button>
               <Button variant={"ghost"} onClick={handleMoveSessionToHistorial}>
-                Move
+                {t("Inputs.move")}
               </Button>
             </div>
           </DialogFooter>
diff --git a/src/components/dropdowns/dropdown-filter-options/dropdown-filter-options.tsx b/src/components/dropdowns/dropdown-filter-options/dropdown-filter-options.tsx
index 50b940e3..ff770a39 100644
--- a/src/components/dropdowns/dropdown-filter-options/dropdown-filter-options.tsx
+++ b/src/components/dropdowns/dropdown-filter-options/dropdown-filter-options.tsx
@@ -21,9 +21,11 @@ import {
   DragHandleVerticalIcon,
   Share1Icon,
 } from "@radix-ui/react-icons";
+import { useTranslations } from "next-intl";
 import { toast } from "sonner";
 
 export default function DropdownFilterSolves() {
+  const t = useTranslations("Index");
   const { sortType, order, handleChangeOrder, handleChangeSortType, tab } =
     useSolveFiltersStore();
   const { selectedCube } = useTimerStore();
@@ -47,12 +49,12 @@ export default function DropdownFilterSolves() {
         formattedLast5Solves,
         formattedLast12Solves
       );
-      toast("Copied successfully", {
-        description: "Has been copied to your clipboard.",
+      toast(t("SolvesPage.toast.success-copy"), {
+        description: t("SolvesPage.toast.success-copy-description"),
       });
     } else {
-      toast("Unable to copy", {
-        description: "Please select a cube before attempting to copy.",
+      toast(t("SolvesPage.toast.unable-action"), {
+        description: t("SolvesPage.toast.warning-select-cube"),
       });
     }
   };
@@ -66,12 +68,12 @@ export default function DropdownFilterSolves() {
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent>
-          {/* sort - time */}
+          {/* sort - type */}
           <DropdownMenuSub>
             <DropdownMenuSubTrigger>
               <div className="flex items-center gap-2">
                 <DragHandleHorizontalIcon />
-                <p>Sort</p>
+                <p>{t("SolvesPage.sort")}</p>
               </div>
             </DropdownMenuSubTrigger>
             <DropdownMenuPortal>
@@ -83,22 +85,22 @@ export default function DropdownFilterSolves() {
                   }}
                 >
                   <DropdownMenuRadioItem value="time">
-                    Time
+                    {t("SolvesPage.time")}
                   </DropdownMenuRadioItem>
                   <DropdownMenuRadioItem value="date">
-                    Date
+                    {t("SolvesPage.date")}
                   </DropdownMenuRadioItem>
                 </DropdownMenuRadioGroup>
               </DropdownMenuSubContent>
             </DropdownMenuPortal>
           </DropdownMenuSub>
 
-          {/* sort - date */}
+          {/* sort - direction */}
           <DropdownMenuSub>
             <DropdownMenuSubTrigger>
               <div className="flex items-center gap-2">
                 <DragHandleVerticalIcon />
-                <p>Order</p>
+                <p>{t("SolvesPage.order")}</p>
               </div>
             </DropdownMenuSubTrigger>
             <DropdownMenuPortal>
@@ -110,10 +112,10 @@ export default function DropdownFilterSolves() {
                   }}
                 >
                   <DropdownMenuRadioItem value="asc">
-                    Ascending
+                    {t("SolvesPage.ascending")}
                   </DropdownMenuRadioItem>
                   <DropdownMenuRadioItem value="desc">
-                    Descending
+                    {t("SolvesPage.descending")}
                   </DropdownMenuRadioItem>
                 </DropdownMenuRadioGroup>
               </DropdownMenuSubContent>
@@ -125,20 +127,20 @@ export default function DropdownFilterSolves() {
             <DropdownMenuSubTrigger>
               <div className="flex items-center gap-2">
                 <Share1Icon />
-                <p>Share</p>
+                <p>{t("SolvesPage.share")}</p>
               </div>
             </DropdownMenuSubTrigger>
             <DropdownMenuPortal>
               <DropdownMenuSubContent>
-                <DropdownMenuItem disabled>Share...</DropdownMenuItem>
-                <DropdownMenuSeparator />
                 <DropdownMenuItem onClick={handleShare}>
-                  Last Ao5
+                  {t("SolvesPage.last")} Ao5
                 </DropdownMenuItem>
                 <DropdownMenuItem onClick={handleShare}>
-                  Last Ao12
+                  {t("SolvesPage.last")} Ao12
+                </DropdownMenuItem>
+                <DropdownMenuItem onClick={handleShare}>
+                  {t("SolvesPage.all")}
                 </DropdownMenuItem>
-                <DropdownMenuItem onClick={handleShare}>All</DropdownMenuItem>
               </DropdownMenuSubContent>
             </DropdownMenuPortal>
           </DropdownMenuSub>
diff --git a/src/components/menu-solve-options/menu-solve-options.tsx b/src/components/menu-solve-options/menu-solve-options.tsx
index 32d38fb3..71c74442 100644
--- a/src/components/menu-solve-options/menu-solve-options.tsx
+++ b/src/components/menu-solve-options/menu-solve-options.tsx
@@ -14,8 +14,10 @@ import {
   CopyIcon,
   Cross1Icon,
 } from "@radix-ui/react-icons";
+import { useTranslations } from "next-intl";
 
 export default function MenuSolveOptions({ solve }: { solve: Solve | null }) {
+  const t = useTranslations("Index");
   const { selectedCube, cubes, mergeUpdateSelectedCube } = useTimerStore();
   if (!solve && !selectedCube) return null;
 
@@ -66,7 +68,7 @@ export default function MenuSolveOptions({ solve }: { solve: Solve | null }) {
               </Button>
             </TooltipTrigger>
             <TooltipContent>
-              <p>Delete</p>
+              <p>{t("tooltips.delete")}</p>
             </TooltipContent>
           </Tooltip>
           <Tooltip>
@@ -80,7 +82,7 @@ export default function MenuSolveOptions({ solve }: { solve: Solve | null }) {
               </Button>
             </TooltipTrigger>
             <TooltipContent>
-              <p>+2 Penalty</p>
+              <p>{t("tooltips.plus-two")}</p>
             </TooltipContent>
           </Tooltip>
           <Tooltip>
@@ -90,7 +92,7 @@ export default function MenuSolveOptions({ solve }: { solve: Solve | null }) {
               </Button>
             </TooltipTrigger>
             <TooltipContent>
-              <p>Bookmark</p>
+              <p>{t("tooltips.bookmark")}</p>
             </TooltipContent>
           </Tooltip>
           <Tooltip>
@@ -100,7 +102,7 @@ export default function MenuSolveOptions({ solve }: { solve: Solve | null }) {
               </Button>
             </TooltipTrigger>
             <TooltipContent>
-              <p>Copy</p>
+              <p>{t("tooltips.copy")}</p>
             </TooltipContent>
           </Tooltip>
         </TooltipProvider>
diff --git a/src/components/solves/ContextMenu.tsx b/src/components/solves/ContextMenu.tsx
deleted file mode 100644
index a21a757a..00000000
--- a/src/components/solves/ContextMenu.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Solve } from "@/interfaces/Solve";
-import { SolveTab } from "@/interfaces/types/SolveTabs";
-import formatTime from "@/lib/formatTime";
-import moveSolve from "@/lib/moveSolve";
-import updateSolve from "@/lib/updateSolve";
-import { useSolvesStore } from "@/store/SolvesStore";
-import { useTimerStore } from "@/store/timerStore";
-import {
-  ArchiveBoxArrowDownIcon,
-  DocumentDuplicateIcon,
-  TrashIcon,
-} from "@heroicons/react/24/outline";
-import { AnimatePresence, motion } from "framer-motion";
-import { useTranslations } from "next-intl";
-import React from "react";
-import { twMerge } from "tailwind-merge";
-
-interface ContextMenuProps extends React.HTMLAttributes<HTMLDivElement> {
-  currentTab: SolveTab;
-  submenuRef: React.RefObject<HTMLDivElement>;
-  solve: Solve | null;
-  setShowOptions?: () => void;
-}
-
-export default function ContextMenu({
-  currentTab,
-  submenuRef,
-  solve,
-  className,
-  setShowOptions,
-  ...rest
-}: ContextMenuProps) {
-  const t = useTranslations("Index.SolvesPage");
-  const { setStatus } = useSolvesStore();
-  const { selectedCube, mergeUpdateSelectedCube, cubes } = useTimerStore();
-
-  const handleMove = async (solve: Solve, currentTab: SolveTab) => {
-    if (!selectedCube) return;
-    const updatedCube = await moveSolve({
-      solve,
-      selectedCube,
-      type: currentTab,
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setStatus(false);
-    if (typeof setShowOptions === "function") {
-      setShowOptions();
-    }
-  };
-
-  const handleDelete = async (solve: Solve) => {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "DELETE",
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setStatus(false);
-    if (typeof setShowOptions === "function") {
-      setShowOptions();
-    }
-  };
-
-  const handleCopyToClipboard = async (text: string) => {
-    if ("clipboard" in navigator) {
-      await navigator.clipboard.writeText(text);
-    }
-    setStatus(false);
-    if (typeof setShowOptions === "function") {
-      setShowOptions();
-    }
-  };
-
-  return (
-    <>
-      <AnimatePresence>
-        {solve && (
-          <motion.div
-            initial={{ y: 0, scale: 0.9, opacity: 0 }}
-            animate={{ y: 0, scale: 1, opacity: 1 }}
-            exit={{ x: 0, scale: 0.9, opacity: 0 }}
-            ref={submenuRef}
-            className={twMerge(
-              "absolute w-full flex flex-col gap-3 py-2 mt-1 bg-white rounded-md text-xs text-black",
-              className
-            )}
-          >
-            <div
-              className="flex items-center gap-1 py-1 transition duration-200 ps-2 hover:text-neutral-500 hover:cursor-pointer"
-              onClick={() =>
-                currentTab === "Session"
-                  ? handleMove(solve, "Session")
-                  : handleMove(solve, "All")
-              }
-            >
-              <div className="w-4 h-4">
-                <ArchiveBoxArrowDownIcon className="w-4 h-4 fill-none stroke-black" />
-              </div>
-              <div>
-                {currentTab === "Session" ? t("archive") : t("unarchive")}
-              </div>
-            </div>
-            <div
-              className="flex items-center gap-1 py-1 transition duration-200 ps-2 hover:text-neutral-500  hover:cursor-pointer"
-              onClick={() =>
-                handleCopyToClipboard(
-                  `[${formatTime(solve.time)}s] - ${solve.scramble}`
-                )
-              }
-            >
-              <div className="w-4 h-4">
-                <DocumentDuplicateIcon className="w-4 h-4 fill-none stroke-black" />
-              </div>
-              <div>{t("copy")}</div>
-            </div>
-            <div
-              className="flex items-center gap-1 py-1 transition duration-200 ps-2 hover:text-neutral-500 hover:cursor-pointer"
-              onClick={() => handleDelete(solve)}
-            >
-              <div className="w-4 h-4">
-                <TrashIcon className="w-4 h-4 fill-none stroke-black" />
-              </div>
-              <div>{t("remove")}</div>
-            </div>
-          </motion.div>
-        )}
-      </AnimatePresence>
-    </>
-  );
-}
diff --git a/src/components/solves/EmptySolves.tsx b/src/components/solves/EmptySolves.tsx
index 9e1a7b43..466b5a81 100644
--- a/src/components/solves/EmptySolves.tsx
+++ b/src/components/solves/EmptySolves.tsx
@@ -1,3 +1,4 @@
+import { useTranslations } from "next-intl";
 import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
 
 export default function EmptySolves({
@@ -7,11 +8,12 @@ export default function EmptySolves({
   message: string;
   icon: React.ReactNode;
 }) {
+  const t = useTranslations("Index");
   return (
     <>
       <Alert variant={"destructive"}>
         {icon}
-        <AlertTitle className="ms-2">Heads up!</AlertTitle>
+        <AlertTitle className="ms-2">{t("SolvesPage.alert.title")}</AlertTitle>
         <AlertDescription className="ms-2">{message}</AlertDescription>
       </Alert>
     </>
diff --git a/src/components/solves/Filter.tsx b/src/components/solves/Filter.tsx
deleted file mode 100644
index 4e168cf2..00000000
--- a/src/components/solves/Filter.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import ToggleSolvesButton from "@/components/solves/ToggleSolvesButton";
-import { SolveTab } from "@/interfaces/types/SolveTabs";
-import { useTranslations } from "next-intl";
-
-interface Filter {
-  currentTab: SolveTab;
-  handleClick: (clickedTab: SolveTab) => void;
-}
-
-export function Filter({ currentTab, handleClick }: Filter) {
-  const t = useTranslations("Index.SolvesPage");
-  return (
-    <>
-      <div className="flex w-auto gap-1 p-1 font-medium rounded-md h-9 light:bg-neutral-200 light:text-neutral-700 dark:bg-zinc-800">
-        <ToggleSolvesButton
-          handleClick={() => handleClick("Session")}
-          active={currentTab === "Session"}
-          label={t("session")}
-        />
-        <ToggleSolvesButton
-          handleClick={() => handleClick("All")}
-          active={currentTab === "All"}
-          label={t("all")}
-        />
-      </div>
-    </>
-  );
-}
diff --git a/src/components/solves/ModalSolve.tsx b/src/components/solves/ModalSolve.tsx
deleted file mode 100644
index 2dde9df5..00000000
--- a/src/components/solves/ModalSolve.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-import updateSolve from "@/lib/updateSolve";
-import { useSolvesStore } from "@/store/SolvesStore";
-import { useTimerStore } from "@/store/timerStore";
-import formatTime from "@/lib/formatTime";
-import { ScrambleDisplay } from "@/components/scramble-display/index";
-import useEscape from "@/hooks/useEscape";
-import { useEffect, useState, useRef } from "react";
-import { AnimatePresence, motion } from "framer-motion";
-import useClickOutside from "@/hooks/useClickOutside";
-import { Solve } from "@/interfaces/Solve";
-import { SolveTab } from "@/interfaces/types/SolveTabs";
-import { useLocale, useTranslations } from "next-intl";
-import {
-  CalendarDaysIcon,
-  ChevronDownIcon,
-  ChevronUpIcon,
-  CubeTransparentIcon,
-  EllipsisHorizontalIcon,
-  StarIcon,
-} from "@heroicons/react/24/solid";
-import {
-  StarIcon as StarIconO,
-  ChatBubbleBottomCenterIcon as ChatBubbleBottomCenterIconO,
-} from "@heroicons/react/24/outline";
-import ContextMenu from "./ContextMenu";
-import { DateTime } from "luxon";
-
-export default function ModalSolve({ currentTab }: { currentTab: SolveTab }) {
-  const [showOptions, setShowOptions] = useState<boolean>(false);
-  const [showScramble, setShowScramble] = useState<boolean>(false);
-  const { status, solve, setStatus } = useSolvesStore();
-  const { selectedCube, mergeUpdateSelectedCube, cubes } = useTimerStore();
-  const t = useTranslations("Index.SolvesPage");
-  const submenuRef = useRef<HTMLDivElement | null>(null);
-
-  const locale = useLocale();
-
-  useEffect(() => {
-    setShowOptions(false);
-    setShowScramble(false);
-  }, [status, solve]);
-
-  useClickOutside(submenuRef, () => setShowOptions(false));
-
-  useEscape(() => setStatus(false));
-
-  const handlePlusTwo = async (solve: Solve) => {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "+2",
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setStatus(false);
-  };
-
-  const handleComment = async (comment: string, solve: Solve) => {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "COMMENT",
-      comment: comment,
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setStatus(false);
-  };
-
-  const handleBookmark = async (solve: Solve) => {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "BOOKMARK",
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setStatus(false);
-  };
-
-  return (
-    <>
-      <AnimatePresence>
-        {solve && status ? (
-          <div
-            className="fixed top-0 left-0 z-50 flex flex-col items-center justify-center w-full h-screen px-4 py-10 overflow-x-hidden overflow-y-auto bg-black bg-opacity-10 md:inset-0 text-neutral-950"
-            onClick={(e) => {
-              if (e.target === e.currentTarget) setStatus(false);
-            }}
-          >
-            <motion.div
-              initial={{ y: 0, scale: 0.9, opacity: 0 }}
-              animate={{ y: 0, scale: 1, opacity: 1 }}
-              exit={{ x: 0, scale: 0.9, opacity: 0 }}
-              className="relative w-full h-auto text-xs bg-white rounded-md sm:w-96"
-            >
-              <div className="flex items-center justify-between px-3 py-2 border-b border-neutral-200">
-                <div className="flex items-center ">
-                  <div className="tracking-wider">
-                    <span className="text-3xl font-semibold">
-                      {formatTime(solve.time).split(".")[0]}
-                    </span>
-                    <span className="text-2xl font-semibold">
-                      .{formatTime(solve.time).split(".")[1]}
-                    </span>
-                  </div>
-                  <span className="text-sm font-bold text-red-500">
-                    {solve.plus2 ? "+2" : null}
-                  </span>
-                </div>
-                <div className="flex items-center gap-3 text-neutral-500">
-                  <CalendarDaysIcon className="w-6 h-6" />
-                  <div className="flex flex-col text-end">
-                    <div>
-                      {DateTime.fromMillis(solve.endTime)
-                        .setLocale(locale)
-                        .toLocaleString()}
-                    </div>
-                    <div className="text-start">
-                      {new Date(solve.endTime).getHours()}:
-                      {new Date(solve.endTime).getMinutes()}
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div className="flex flex-col items-center justify-between p-3 font-medium border-b border-neutral-200 text-md">
-                <div
-                  className="flex items-center justify-between w-full gap-5 md:gap-5"
-                  onClick={() => setShowScramble(!showScramble)}
-                >
-                  <div>
-                    <CubeTransparentIcon className="w-4 h-4" />
-                  </div>
-                  <div
-                    className={`${
-                      solve.scramble.length > 100 ? "text-sm" : "text-base"
-                    } font-normal text-justify`}
-                  >
-                    {solve.scramble}
-                  </div>
-                  <div className="transition duration-200 hover:text-neutral-500 hover:cursor-pointer">
-                    {showScramble ? (
-                      <ChevronUpIcon className="w-4 h-4" />
-                    ) : (
-                      <ChevronDownIcon className="w-4 h-4" />
-                    )}
-                  </div>
-                </div>
-                {showScramble && (
-                  <ScrambleDisplay
-                    className="w-full h-32 my-3"
-                    show={status}
-                    scramble={solve.scramble}
-                    event={
-                      solve && selectedCube ? selectedCube.category : "3x3"
-                    }
-                  ></ScrambleDisplay>
-                )}
-                <div>{solve.comment}</div>
-              </div>
-
-              <div className="flex items-center justify-between gap-3 px-3 py-2 text-black">
-                <div>
-                  <div
-                    className="w-5 h-5 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-                    onClick={() => {
-                      setShowOptions(!showOptions);
-                      setShowScramble(false);
-                    }}
-                  >
-                    <EllipsisHorizontalIcon className="w-5 h-5" />
-                  </div>
-                </div>
-                <div className="flex items-center justify-center gap-3">
-                  <div
-                    className="w-5 h-5 transition duration-200 hover:text-neutral-500 text-neutral-700 hover:cursor-pointer flex justify-center items-center"
-                    onClick={() => handleBookmark(solve)}
-                  >
-                    {solve.bookmark ? (
-                      <StarIcon className="w-4 h-4" />
-                    ) : (
-                      <StarIconO className="w-4 h-4" />
-                    )}
-                  </div>
-                  <div
-                    className="w-5 h-5 transition duration-200 hover:text-neutral-500 text-neutral-700 hover:cursor-pointer flex justify-center items-center"
-                    onClick={() => {
-                      const comment = window.prompt(`${t("enter-a-comment")}`);
-                      if (comment) {
-                        handleComment(comment, solve);
-                      }
-                    }}
-                  >
-                    <ChatBubbleBottomCenterIconO className="w-4 h-4" />
-                  </div>
-                  <div
-                    className="text-lg font-medium transition duration-200 hover:text-neutral-500 hover:cursor-pointer text-neutral-700"
-                    onClick={async () => await handlePlusTwo(solve)}
-                  >
-                    +2
-                  </div>
-                </div>
-              </div>
-              {/* options menu */}
-              {showOptions && (
-                <ContextMenu
-                  submenuRef={submenuRef}
-                  currentTab={currentTab}
-                  solve={solve}
-                  className="max-w-32"
-                />
-              )}
-            </motion.div>
-          </div>
-        ) : null}
-      </AnimatePresence>
-    </>
-  );
-}
diff --git a/src/components/solves/SolveFilters.tsx b/src/components/solves/SolveFilters.tsx
deleted file mode 100644
index dc2a833d..00000000
--- a/src/components/solves/SolveFilters.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-interface SolveFilters {
-  children: React.ReactNode;
-}
-
-export function SolveFilters({ children }: SolveFilters) {
-  return (
-    <>
-      <div className="z-10 flex flex-col justify-between w-full gap-3 px-3 py-2 text-sm rounded-b-lg shadow-sm light:shadow-neutral-200 dark:shadow-zinc-800 md:flex-row light:bg-neutral-100 dark:bg-zinc-900">
-        {children}
-      </div>
-    </>
-  );
-}
diff --git a/src/components/solves/SolvesArea.tsx b/src/components/solves/SolvesArea.tsx
index 7c6f33ae..dcf353e0 100644
--- a/src/components/solves/SolvesArea.tsx
+++ b/src/components/solves/SolvesArea.tsx
@@ -30,7 +30,7 @@ export function SolvesArea({ displaySolves }: SolvesArea) {
   useRemoveGridHeight();
 
   if (!selectedCube) {
-    return <EmptySolves message={t("no-cube-selection")} icon={<CubeIcon />} />;
+    return <EmptySolves message={t("alert.empty-cubes")} icon={<CubeIcon />} />;
   }
 
   if (!displaySolves || displaySolves.length === 0) {
@@ -44,10 +44,8 @@ export function SolvesArea({ displaySolves }: SolvesArea) {
             height={200}
             className="object-scale-down my-20"
           />
-          <div>Nothing here yet!</div>
-          <div>
-            Tap the switch at the top of the screen to see your history.
-          </div>
+          <div>{t("empty-solves")}</div>
+          <div>{t("empty-solves-description")}</div>
         </div>
       </>
     );
diff --git a/src/components/solves/SolvesOptionsDropdown.tsx b/src/components/solves/SolvesOptionsDropdown.tsx
deleted file mode 100644
index 666080a7..00000000
--- a/src/components/solves/SolvesOptionsDropdown.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from "react";
-import { BarsArrowDownIcon, ShareIcon } from "@heroicons/react/24/outline";
-import { PlayIcon } from "@heroicons/react/24/solid";
-import { useTranslations } from "next-intl";
-
-interface SolvesOptionsDropdownProps {
-  solveMenuRef: React.RefObject<HTMLDivElement>;
-  setSortModal: (sort: boolean) => void;
-  setShareSolveModal: (share: boolean) => void;
-}
-
-export default function SolvesOptionsDropdown({
-  solveMenuRef,
-  setSortModal,
-  setShareSolveModal,
-}: SolvesOptionsDropdownProps) {
-  const t = useTranslations("Index.SolvesPage");
-
-  return (
-    <div
-      className="w-40 p-2 z-50 flex flex-col gap-1 mt-1 bg-white rounded-md text-xs text-black"
-      ref={solveMenuRef}
-    >
-      <div
-        className="flex justify-between items-center p-0 gap-1 py-2 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-        onClick={() => setSortModal(true)}
-      >
-        <div className="flex flex-row p-0">
-          <BarsArrowDownIcon className="w-4 h-4" />
-          <span className="mx-1.5">{t("sort-by")}</span>
-        </div>
-        <div>
-          <PlayIcon className="w-2 h-2 -mx-6" />
-        </div>
-      </div>
-
-      <div
-        className="flex justify-between items-center p-0 gap-1 py-1 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-        onClick={() => setShareSolveModal(true)}
-      >
-        <div className="flex flex-row p-0">
-          <ShareIcon className="w-4 h-4" />
-          <span className="mx-1.5">{t("share")}</span>
-        </div>
-        <div>
-          <PlayIcon className="w-2 h-2 -mx-6" />
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/solves/SortModeMenu.tsx b/src/components/solves/SortModeMenu.tsx
deleted file mode 100644
index f3192a22..00000000
--- a/src/components/solves/SortModeMenu.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from "react";
-import { ClockIcon, CalendarIcon } from "@heroicons/react/24/outline";
-import { PlayIcon } from "@heroicons/react/24/solid";
-import { Modes } from "@/lib/SortSolves";
-import { useTranslations } from "next-intl";
-
-interface SortModeMenuProps {
-  submenuRef: React.RefObject<HTMLDivElement>;
-  onSelectSortMode: (mode: Modes) => void;
-}
-
-export default function SortModeMenu({
-  submenuRef,
-  onSelectSortMode,
-}: SortModeMenuProps) {
-  const t = useTranslations("Index.SolvesPage");
-
-  return (
-    <div
-      className="w-40 p-2 z-50 flex  flex-col gap-1 mt-1 bg-white rounded-md text-xs text-black"
-      ref={submenuRef}
-    >
-      <p className="text-sm font-semibold">{t("sort-by")}</p>
-
-      <div
-        className="flex justify-between items-center p-0 gap-1 py-2 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-        onClick={() => onSelectSortMode("Time")}
-      >
-        <div className="flex flex-row p-0">
-          <ClockIcon className="w-4 h-4" />
-          <span className="mx-1.5">{t("time")}</span>
-        </div>
-        <div>
-          <PlayIcon className="w-2 h-2 -mx-6" />
-        </div>
-      </div>
-
-      <div
-        className="flex justify-between items-center p-0 gap-1 py-1 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-        onClick={() => onSelectSortMode("Date")}
-      >
-        <div className="flex flex-row p-0">
-          <CalendarIcon className="w-4 h-4" />
-          <span className="mx-1.5">{t("date")}</span>
-        </div>
-        <div>
-          <PlayIcon className="w-2 h-2 -mx-6" />
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/solves/SortOrderMenu.tsx b/src/components/solves/SortOrderMenu.tsx
deleted file mode 100644
index f345a3f7..00000000
--- a/src/components/solves/SortOrderMenu.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Orders } from "@/lib/SortSolves";
-import { ArrowDownIcon, ArrowUpIcon } from "@heroicons/react/24/outline";
-import { useTranslations } from "next-intl";
-import React from "react";
-
-interface SortOrderMenuProps {
-  submenuRef: React.RefObject<HTMLDivElement>;
-  title: string;
-  onSelectSortOrder: (order: Orders) => void;
-}
-
-export default function SortOrderMenu({
-  submenuRef,
-  title,
-  onSelectSortOrder,
-}: SortOrderMenuProps) {
-  const t = useTranslations("Index.SolvesPage");
-
-  let headerTitle = "";
-
-  switch (title) {
-    case "Time":
-      headerTitle = t("time");
-      break;
-    case "Date":
-      headerTitle = t("date");
-      break;
-  }
-  return (
-    <div
-      className="w-40 p-2 flex flex-col gap-1 mt-1 bg-white rounded-md text-xs text-black"
-      ref={submenuRef}
-    >
-      <p className="text-sm font-semibold">{headerTitle}</p>
-      <div
-        className="flex justify-start items-center p-0 gap-1 py-2 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-        onClick={() => onSelectSortOrder("Ascending")}
-      >
-        <div>
-          <ArrowUpIcon className="w-4 h-4" />
-        </div>
-        <div>{t("ascending")}</div>
-      </div>
-
-      <div
-        className="flex justify-start items-center p-0 gap-1 py-1 transition duration-200 hover:text-neutral-500 hover:cursor-pointer"
-        onClick={() => onSelectSortOrder("Descending")}
-      >
-        <div>
-          <ArrowDownIcon className="w-4 h-4" />
-        </div>
-        <div>{t("descending")}</div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/solves/ToggleSolvesButton.tsx b/src/components/solves/ToggleSolvesButton.tsx
deleted file mode 100644
index 6049f61c..00000000
--- a/src/components/solves/ToggleSolvesButton.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-interface ToggleSolvesButton {
-  label: string;
-  handleClick: () => void;
-  active?: boolean;
-}
-
-export default function ToggleSolvesButton({
-  label,
-  handleClick,
-  active,
-}: ToggleSolvesButton) {
-  return (
-    <>
-      <button
-        onClick={() => handleClick()}
-        type="button"
-        className={`grow w-auto px-4 appearance-none rounded-md ${
-          active
-            ? "light:bg-neutral-100 light:text-neutral-950 dark:bg-zinc-950"
-            : "dark:bg-transparent"
-        }`}
-      >
-        {label}
-      </button>
-    </>
-  );
-}
diff --git a/src/components/timer/ManualMode.tsx b/src/components/timer/ManualMode.tsx
index ccb3390b..b3e25a33 100644
--- a/src/components/timer/ManualMode.tsx
+++ b/src/components/timer/ManualMode.tsx
@@ -4,7 +4,6 @@ import formatTime from "@/lib/formatTime";
 import genId from "@/lib/genId";
 import { useTimerStore } from "@/store/timerStore";
 import { useState } from "react";
-import SolveOptions from "./SolveOptions";
 import { useSettingsModalStore } from "@/store/SettingsModalStore";
 import { Themes } from "@/interfaces/types/Themes";
 import { saveCube } from "@/db/dbOperations";
@@ -96,9 +95,9 @@ export default function ManualMode() {
             {t("preview")}: {formatTime(convertToMs(value))}{" "}
           </div>
         ) : null}
-        {lastSolve && settings.features.quickActionButtons.status ? (
+        {/* {lastSolve && settings.features.quickActionButtons.status ? (
           <SolveOptions solve={lastSolve} />
-        ) : null}
+        ) : null} */}
       </form>
     </>
   );
diff --git a/src/components/timer/SolveOptions.tsx b/src/components/timer/SolveOptions.tsx
deleted file mode 100644
index 82da4ddc..00000000
--- a/src/components/timer/SolveOptions.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Solve } from "@/interfaces/Solve";
-import updateSolve from "@/lib/updateSolve";
-import { useTimerStore } from "@/store/timerStore";
-import {
-  ChatBubbleBottomCenterIcon,
-  FlagIcon,
-  NoSymbolIcon,
-} from "@heroicons/react/24/outline";
-import { useTranslations } from "next-intl";
-
-export default function SolveOptions({ solve }: { solve: Solve }) {
-  const {
-    setLastSolve,
-    selectedCube,
-    setSolvingTime,
-    solvingTime,
-    mergeUpdateSelectedCube,
-    cubes,
-  } = useTimerStore();
-  const t = useTranslations("Index.SolvesPage");
-
-  async function handleDeleteSolve() {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "DELETE",
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setSolvingTime(0);
-    setLastSolve(null);
-  }
-
-  async function handlePlusTwo() {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "+2",
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setSolvingTime(solvingTime + 2000);
-    setLastSolve(null);
-  }
-
-  async function handleBookmark() {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "BOOKMARK",
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-    setLastSolve(null);
-  }
-
-  async function handleComment(comment: string) {
-    if (!selectedCube) return;
-    const updatedCube = await updateSolve({
-      selectedCube: selectedCube,
-      solveId: solve.id,
-      type: "COMMENT",
-      comment: comment,
-    });
-    mergeUpdateSelectedCube(updatedCube, cubes);
-  }
-
-  const classButton =
-    "flex items-center justify-center w-12 h-8 p-1 font-normal transition duration-200 bg-transparent border border-transparent rounded-md dark:text-neutral-300 light:text-neutral-500 light:hover:text-neutral-900 dark:hover:text-neutral-100";
-
-  if (!selectedCube) return null;
-  return (
-    <>
-      <div
-        className="flex items-center justify-center gap-3 p-3 mt-3"
-        id="quick-action-buttons"
-      >
-        <button
-          type="button"
-          className={classButton}
-          onClick={handleDeleteSolve}
-          onTouchStart={handleDeleteSolve}
-        >
-          <NoSymbolIcon className="w-4 h-4" />
-        </button>
-        <button
-          type="button"
-          className={classButton}
-          onClick={handlePlusTwo}
-          onTouchStart={handlePlusTwo}
-        >
-          +2
-        </button>
-
-        <button
-          type="button"
-          className={classButton}
-          onClick={handleBookmark}
-          onTouchStart={handleBookmark}
-        >
-          <FlagIcon className="w-4 h-4" />
-        </button>
-
-        <button
-          type="button"
-          className={classButton}
-          onClick={() => {
-            const comment = window.prompt(`${t("enter-a-comment")}`);
-            if (comment) {
-              handleComment(comment);
-            }
-          }}
-          onTouchStart={() => {
-            const comment = window.prompt(`${t("enter-a-comment")}`);
-            if (comment) {
-              handleComment(comment);
-            }
-          }}
-        >
-          <ChatBubbleBottomCenterIcon className="w-4 h-4" />
-        </button>
-      </div>
-    </>
-  );
-}
diff --git a/src/components/timer/Timer.tsx b/src/components/timer/Timer.tsx
index 1b955f34..ae0c3009 100644
--- a/src/components/timer/Timer.tsx
+++ b/src/components/timer/Timer.tsx
@@ -1,5 +1,4 @@
 import { useTimerStore } from "@/store/timerStore";
-import SolveOptions from "./SolveOptions";
 import { useSettingsModalStore } from "@/store/SettingsModalStore";
 import formatTime from "@/lib/formatTime";
 import useTimer from "@/hooks/useTimer";
@@ -82,9 +81,9 @@ export default function Timer() {
             }
             config={confettiConfig}
           />
-          {lastSolve &&
+          {/* {lastSolve &&
             settings.features.quickActionButtons.status &&
-            timerStatus === "IDLE" && <SolveOptions solve={lastSolve} />}
+            timerStatus === "IDLE" && <SolveOptions solve={lastSolve} />} */}
         </div>
       </>
     )