diff --git a/lib/mv_web/live/components/payment_filter_component.ex b/lib/mv_web/live/components/payment_filter_component.ex
index 47556dd..1ba9d8b 100644
--- a/lib/mv_web/live/components/payment_filter_component.ex
+++ b/lib/mv_web/live/components/payment_filter_component.ex
@@ -77,7 +77,7 @@ defmodule MvWeb.Components.PaymentFilterComponent do
             phx-target={@myself}
           >
             <.icon name="hero-users" class="h-4 w-4" />
-            {gettext("All")}
+            {gettext("All payment statuses")}
           </button>
         </li>
         <li role="none">
@@ -140,7 +140,7 @@ defmodule MvWeb.Components.PaymentFilterComponent do
   defp parse_filter(_), do: nil
 
   # Get display label for current filter
-  defp filter_label(nil), do: gettext("All")
+  defp filter_label(nil), do: gettext("All payment statuses")
   defp filter_label(:paid), do: gettext("Paid")
   defp filter_label(:not_paid), do: gettext("Not paid")
 end
diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex
index 8f63bf8..ccae3c6 100644
--- a/lib/mv_web/live/custom_field_live/index_component.ex
+++ b/lib/mv_web/live/custom_field_live/index_component.ex
@@ -5,7 +5,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
   ## Features
   - List all custom fields
   - Display type information (name, value type, description)
-  - Show immutable and required flags
+  - Show required flag
   - Create new custom fields
   - Edit existing custom fields
   - Delete custom fields with confirmation (cascades to all custom field values)
@@ -30,7 +30,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
               phx-click="new_custom_field"
               phx-target={@myself}
             >
-              <.icon name="hero-plus" /> {gettext("New Custom field")}
+              <.icon name="hero-plus" /> {gettext("New Custom Field")}
             </.button>
           </div>
         </div>
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 25f685d..81653a4 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -282,11 +282,6 @@ msgstr "Benutzer*in bearbeiten"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Immutable"
-msgstr "Unveränderlich"
-
 #: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Logout"
@@ -760,11 +755,6 @@ msgstr[1] "%{count} E-Mail-Adressen in die Zwischenablage kopiert"
 msgid "Copy email addresses of selected members"
 msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Copy emails"
-msgstr "E-Mails kopieren"
-
 #: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
@@ -796,7 +786,6 @@ msgid "This field cannot be empty"
 msgstr "Dieses Feld darf nicht leer bleiben"
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr "Alle"
@@ -1389,14 +1378,10 @@ msgid "Failed to delete custom field: %{error}"
 msgstr "Konnte Feld nicht löschen: %{error}"
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "New Custom Field"
-msgstr "Benutzerdefiniertes Feld speichern"
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format, fuzzy
-msgid "New Custom field"
-msgstr "Benutzerdefiniertes Feld speichern"
+msgid "New Custom Field"
+msgstr "Neues Benutzerdefiniertes Feld"
 
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
@@ -1438,6 +1423,16 @@ msgstr "Textfeld"
 msgid "Yes/No-Selection"
 msgstr "Ja/Nein-Auswahl"
 
+#: lib/mv_web/live/components/payment_filter_component.ex
+#, elixir-autogen, elixir-format
+msgid "All payment statuses"
+msgstr "Jeder Zahlungs-Zustand"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Copy email addresses"
+msgstr "E-Mail-Adressen kopieren"
+
 #~ #: lib/mv_web/live/custom_field_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Auto-generated identifier (immutable)"
@@ -1449,6 +1444,11 @@ msgstr "Ja/Nein-Auswahl"
 #~ msgid "Birth Date"
 #~ msgstr "Geburtsdatum"
 
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Copy emails"
+#~ msgstr "E-Mails kopieren"
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
@@ -1471,6 +1471,16 @@ msgstr "Ja/Nein-Auswahl"
 #~ msgid "Id"
 #~ msgstr "ID"
 
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Immutable"
+#~ msgstr "Unveränderlich"
+
+#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "New Custom field"
+#~ msgstr "Benutzerdefiniertes Feld speichern"
+
 #~ #: lib/mv_web/live/user_live/form.ex
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index a7ab36b..451e2b5 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -283,11 +283,6 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Immutable"
-msgstr ""
-
 #: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Logout"
@@ -761,11 +756,6 @@ msgstr[1] ""
 msgid "Copy email addresses of selected members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Copy emails"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
@@ -797,7 +787,6 @@ msgid "This field cannot be empty"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
@@ -1390,13 +1379,9 @@ msgid "Failed to delete custom field: %{error}"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "New Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
-msgid "New Custom field"
+msgid "New Custom Field"
 msgstr ""
 
 #: lib/mv_web/live/global_settings_live.ex
@@ -1438,3 +1423,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Yes/No-Selection"
 msgstr ""
+
+#: lib/mv_web/live/components/payment_filter_component.ex
+#, elixir-autogen, elixir-format
+msgid "All payment statuses"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Copy email addresses"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index e2a1876..5995656 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -283,11 +283,6 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format
-msgid "Immutable"
-msgstr ""
-
 #: lib/mv_web/components/layouts/navbar.ex
 #, elixir-autogen, elixir-format
 msgid "Logout"
@@ -761,11 +756,6 @@ msgstr[1] ""
 msgid "Copy email addresses of selected members"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Copy emails"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "No email addresses found"
@@ -797,7 +787,6 @@ msgid "This field cannot be empty"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/payment_filter_component.ex
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
@@ -1390,13 +1379,9 @@ msgid "Failed to delete custom field: %{error}"
 msgstr ""
 
 #: lib/mv_web/live/custom_field_live/form_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "New Custom Field"
-msgstr ""
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format, fuzzy
-msgid "New Custom field"
+msgid "New Custom Field"
 msgstr ""
 
 #: lib/mv_web/live/global_settings_live.ex
@@ -1439,6 +1424,16 @@ msgstr ""
 msgid "Yes/No-Selection"
 msgstr ""
 
+#: lib/mv_web/live/components/payment_filter_component.ex
+#, elixir-autogen, elixir-format
+msgid "All payment statuses"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Copy email addresses"
+msgstr ""
+
 #~ #: lib/mv_web/live/custom_field_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Auto-generated identifier (immutable)"
@@ -1450,6 +1445,11 @@ msgstr ""
 #~ msgid "Birth Date"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Copy emails"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
@@ -1471,6 +1471,16 @@ msgstr ""
 #~ msgid "Id"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/custom_field_live/form_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Immutable"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "New Custom field"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Not set"