diff --git a/internal/locale/translations/de_DE.json b/internal/locale/translations/de_DE.json
index 7fa8c99a..da8ffb06 100644
--- a/internal/locale/translations/de_DE.json
+++ b/internal/locale/translations/de_DE.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Geteilte Artikel",
     "search.label": "Suche",
     "search.placeholder": "Suche...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Nächste",
     "pagination.previous": "Vorherige",
     "entry.status.unread": "Ungelesen",
diff --git a/internal/locale/translations/el_EL.json b/internal/locale/translations/el_EL.json
index 9f9338cc..3e51f38c 100644
--- a/internal/locale/translations/el_EL.json
+++ b/internal/locale/translations/el_EL.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Κοινόχρηστες καταχωρήσεις",
     "search.label": "Αναζήτηση",
     "search.placeholder": "Αναζήτηση...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Επόμενη",
     "pagination.previous": "Προηγούμενη",
     "entry.status.unread": "Μη αναγνωσμένο",
diff --git a/internal/locale/translations/en_US.json b/internal/locale/translations/en_US.json
index 63277915..1700567f 100644
--- a/internal/locale/translations/en_US.json
+++ b/internal/locale/translations/en_US.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Shared entries",
     "search.label": "Search",
     "search.placeholder": "Search…",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Next",
     "pagination.previous": "Previous",
     "entry.status.unread": "Unread",
diff --git a/internal/locale/translations/es_ES.json b/internal/locale/translations/es_ES.json
index f123a44a..71b741e3 100644
--- a/internal/locale/translations/es_ES.json
+++ b/internal/locale/translations/es_ES.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Artículos compartidos",
     "search.label": "Buscar",
     "search.placeholder": "Búsqueda...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Siguiente",
     "pagination.previous": "Anterior",
     "entry.status.unread": "No leído",
diff --git a/internal/locale/translations/fi_FI.json b/internal/locale/translations/fi_FI.json
index 7582e5e9..f8b57458 100644
--- a/internal/locale/translations/fi_FI.json
+++ b/internal/locale/translations/fi_FI.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Jaetut artikkelit",
     "search.label": "Haku",
     "search.placeholder": "Hae...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Seuraava",
     "pagination.previous": "Edellinen",
     "entry.status.unread": "Lukematon",
diff --git a/internal/locale/translations/hi_IN.json b/internal/locale/translations/hi_IN.json
index cec5d092..debeee77 100644
--- a/internal/locale/translations/hi_IN.json
+++ b/internal/locale/translations/hi_IN.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "साझा प्रविष्टियां",
     "search.label": "खोजे",
     "search.placeholder": "खोजे...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "अगला",
     "pagination.previous": "पिछला",
     "entry.status.unread": "अपठित",
diff --git a/internal/locale/translations/id_ID.json b/internal/locale/translations/id_ID.json
index a48ce8e7..b37078b4 100644
--- a/internal/locale/translations/id_ID.json
+++ b/internal/locale/translations/id_ID.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Entri yang Dibagikan",
     "search.label": "Cari",
     "search.placeholder": "Cari...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Berikutnya",
     "pagination.previous": "Sebelumnya",
     "entry.status.unread": "Belum dibaca",
diff --git a/internal/locale/translations/it_IT.json b/internal/locale/translations/it_IT.json
index 29ab1fbf..8173771c 100644
--- a/internal/locale/translations/it_IT.json
+++ b/internal/locale/translations/it_IT.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Voci condivise",
     "search.label": "Cerca",
     "search.placeholder": "Cerca...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Successivo",
     "pagination.previous": "Precedente",
     "entry.status.unread": "Da leggere",
diff --git a/internal/locale/translations/ja_JP.json b/internal/locale/translations/ja_JP.json
index 874db803..d835498c 100644
--- a/internal/locale/translations/ja_JP.json
+++ b/internal/locale/translations/ja_JP.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "共有エントリ",
     "search.label": "検索",
     "search.placeholder": "…を検索",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "次",
     "pagination.previous": "前",
     "entry.status.unread": "未読にする",
diff --git a/internal/locale/translations/nl_NL.json b/internal/locale/translations/nl_NL.json
index 49ad1eeb..9ea1c090 100644
--- a/internal/locale/translations/nl_NL.json
+++ b/internal/locale/translations/nl_NL.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Gedeelde vermeldingen",
     "search.label": "Zoeken",
     "search.placeholder": "Zoeken...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Volgende",
     "pagination.previous": "Vorige",
     "entry.status.unread": "Ongelezen",
diff --git a/internal/locale/translations/pl_PL.json b/internal/locale/translations/pl_PL.json
index 3befaacc..a0ec0cd6 100644
--- a/internal/locale/translations/pl_PL.json
+++ b/internal/locale/translations/pl_PL.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Udostępnione wpisy",
     "search.label": "Szukaj",
     "search.placeholder": "Szukaj...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Następny",
     "pagination.previous": "Poprzedni",
     "entry.status.unread": "Nieprzeczytane",
diff --git a/internal/locale/translations/pt_BR.json b/internal/locale/translations/pt_BR.json
index bcae7a8e..d768e7aa 100644
--- a/internal/locale/translations/pt_BR.json
+++ b/internal/locale/translations/pt_BR.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Itens compartilhados",
     "search.label": "Buscar",
     "search.placeholder": "Buscar por...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Próximo",
     "pagination.previous": "Anterior",
     "entry.status.unread": "Não lido",
diff --git a/internal/locale/translations/ru_RU.json b/internal/locale/translations/ru_RU.json
index 69b9abfa..8b8c3663 100644
--- a/internal/locale/translations/ru_RU.json
+++ b/internal/locale/translations/ru_RU.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Общие записи",
     "search.label": "Поиск",
     "search.placeholder": "Поиск…",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Следующая",
     "pagination.previous": "Предыдущая",
     "entry.status.unread": "Не прочитано",
diff --git a/internal/locale/translations/tr_TR.json b/internal/locale/translations/tr_TR.json
index bce8d67e..59cd9761 100644
--- a/internal/locale/translations/tr_TR.json
+++ b/internal/locale/translations/tr_TR.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Paylaşılan iletiler",
     "search.label": "Ara",
     "search.placeholder": "Ara...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Sonraki",
     "pagination.previous": "Önceki",
     "entry.status.unread": "Okunmadı",
diff --git a/internal/locale/translations/uk_UA.json b/internal/locale/translations/uk_UA.json
index 2db483d4..13d7d411 100644
--- a/internal/locale/translations/uk_UA.json
+++ b/internal/locale/translations/uk_UA.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "Спільні записи",
     "search.label": "Пошук",
     "search.placeholder": "Шукати...",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "Вперед",
     "pagination.previous": "Назад",
     "entry.status.unread": "Непрочитане",
diff --git a/internal/locale/translations/zh_CN.json b/internal/locale/translations/zh_CN.json
index 68080271..9fbd7479 100644
--- a/internal/locale/translations/zh_CN.json
+++ b/internal/locale/translations/zh_CN.json
@@ -53,7 +53,7 @@
     "menu.shared_entries": "已分享的文章",
     "search.label": "搜索",
     "search.placeholder": "搜索…",
-    "search.submit": "Submit",
+    "search.submit": "Search",
     "pagination.next": "下一页",
     "pagination.previous": "上一页",
     "entry.status.unread": "标为未读",
diff --git a/internal/template/templates/common/layout.html b/internal/template/templates/common/layout.html
index ea8c1806..ac479fc3 100644
--- a/internal/template/templates/common/layout.html
+++ b/internal/template/templates/common/layout.html
@@ -126,8 +126,8 @@
                     </svg>
                 </summary>
                 <form action="{{ route "searchEntries" }}" aria-labelledby="search-input-label">
-                    <input type="search" name="q" id="search-input" aria-label="{{ t "search.label" }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
-                    <button type="submit">{{ t "search.submit" }}</button>
+                    <input type="search" name="q" id="search-input" aria-label="{{ t "search.label" }}" placeholder="{{ t "search.placeholder" }}" {{ if $.searchQuery }}value="{{ .searchQuery }}"{{ end }} required>
+                    <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.loading" }}">{{ t "search.submit" }}</button>
                 </form>
             </details>
         </search>