diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_en.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_en.properties
index da90117b31..ccf4342cde 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_en.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_en.properties
@@ -1,3 +1,2 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
 client_localized-client=Přespříliš lokalizovaný klient
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_test.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_test.properties
index 41173f4cc4..b2cc17b5a0 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_test.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme-preview/account/messages/messages_test.properties
@@ -1,4 +1,3 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
 accountManagementWelcomeMessage=Vítejte v Keycloaku
 personalInfoHtmlTitle=Osobní údaje
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_en.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_en.properties
index da90117b31..ccf4342cde 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_en.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_en.properties
@@ -1,3 +1,2 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
 client_localized-client=Přespříliš lokalizovaný klient
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_test.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_test.properties
index 41173f4cc4..b2cc17b5a0 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_test.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/account/messages/messages_test.properties
@@ -1,4 +1,3 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
 accountManagementWelcomeMessage=Vítejte v Keycloaku
 personalInfoHtmlTitle=Osobní údaje
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_en.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_en.properties
index d5ac3fa3ad..fc49db6b0a 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_en.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_en.properties
@@ -1,2 +1 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_test.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_test.properties
index 363f47efd0..0eda2dc94c 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_test.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/email/messages/messages_test.properties
@@ -1,2 +1 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_en.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_en.properties
index d5ac3fa3ad..fc49db6b0a 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_en.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_en.properties
@@ -1,2 +1 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_test.properties b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_test.properties
index 42f3e4a00c..555e51305d 100644
--- a/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_test.properties
+++ b/testsuite/integration-arquillian/tests/other/base-ui/src/main/resources/themes/localized-theme/login/messages/messages_test.properties
@@ -1,4 +1,3 @@
-#encoding: utf-8
 locale_test=Přísný jazyk
 termsText=[TEST LOCALE] souhlas s podmínkami
 notMatchPasswordMessage=[TEST LOCALE] hesla se neshodují
diff --git a/themes/src/main/resources-community/theme/base/account/messages/messages_th.properties b/themes/src/main/resources-community/theme/base/account/messages/messages_th.properties
index d5c5ce3a4d..7e11fc77ce 100644
--- a/themes/src/main/resources-community/theme/base/account/messages/messages_th.properties
+++ b/themes/src/main/resources-community/theme/base/account/messages/messages_th.properties
@@ -1,4 +1,3 @@
-# encoding: utf-8
 doSave=บันทึก
 doCancel=ยกเลิก
 doLogOutAllSessions=ออกจากระบบทุกเซสชัน
diff --git a/themes/src/main/resources-community/theme/base/email/messages/messages_th.properties b/themes/src/main/resources-community/theme/base/email/messages/messages_th.properties
index c276362fed..dc3d181f3d 100644
--- a/themes/src/main/resources-community/theme/base/email/messages/messages_th.properties
+++ b/themes/src/main/resources-community/theme/base/email/messages/messages_th.properties
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 emailVerificationSubject=ตรวจสอบอีเมล
 emailVerificationBody=มีคนสร้างบัญชี {2} ด้วยที่อยู่อีเมลนี้ หากคุณเป็นผู้สร้างบัญชี คลิกที่ลิงก์ด้านล่างเพื่อยืนยันที่อยู่อีเมลของคุณ\n\n{0}\n\nลิงก์นี้จะหมดอายุภายใน {3}.\n\nถ้าคุณไม่ได้สร้างบัญชี ไม่ต้องสนใจข้อความนี้
 emailVerificationBodyHtml=<p>มีคนสร้างบัญชี {2} ด้วยที่อยู่อีเมลนี้ หากคุณเป็นผู้สร้างบัญชี คลิกที่ลิงก์ด้านล่างเพื่อยืนยันที่อยู่อีเมลของคุณ</p><p><a href="{0}">ลิงก์สำหรับการตรวจสอบที่อยู่อีเมล</a></p><p>ลิงก์นี้จะหมดอายุภายใน {3}.</p><p>ถ้าคุณไม่ได้สร้างบัญชี ไม่ต้องสนใจข้อความนี้</p>
diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties
index 6b5d160558..77d23dd2d4 100644
--- a/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties
+++ b/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 doLogIn=เข้าสู่ระบบ
 doRegister=ลงทะเบียน
 doCancel=ยกเลิก
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_ca.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_ca.properties
index 6b207ef999..5b57fc1fcc 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_ca.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_ca.properties
@@ -1,5 +1,3 @@
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=No s''ha trobat la pàgina
 forbidden=Prohibit
 needAccessRights=No teniu permisos d''accés a aquesta petició. Contacteu amb l''administrador.
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_de.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_de.properties
index 3bc37b6c6a..ac97ab1102 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_de.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_de.properties
@@ -1,5 +1,3 @@
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=Seite nicht gefunden
 forbidden=Verboten
 needAccessRights=Sie haben keine Zugriffsrechte auf diese Anfrage.  Wenden Sie sich an Ihren Administrator.
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_el.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_el.properties
index bb1b2804e2..11eb3af23a 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_el.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_el.properties
@@ -167,6 +167,4 @@ actionRequiresIDP=Αυτή η ενέργεια απαιτεί ανακατεύθ
 invalidRoute=Το {0} δεν είναι μια έγκυρη διαδρομή.
 needAccessRights=Δεν έχετε άδειες πρόσβασης για αυτή την αίτηση.  Επικοινωνήστε με το διαχειριστή σας.
 forbidden=Απαγορεύεται
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=Η σελίδα δε βρέθηκε
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_fa.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_fa.properties
index 5b181d8547..8438a7706c 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_fa.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_fa.properties
@@ -1,6 +1,3 @@
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
-
 pageNotFound=صفحه یافت نشد
 forbidden=غیرمجاز
 needAccessRights=شما مجوز دسترسی به این درخواست را ندارید. لطفا با مدیریت خود صحبت کنید.
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_hu.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_hu.properties
index 8b67ce7a67..c117761b5a 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_hu.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_hu.properties
@@ -1,5 +1,3 @@
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=Az oldal nem található
 forbidden=Hozzáférés megtagadva
 needAccessRights=Nincs jogosultsága a művelet elvégzéséhez. Kérem, vegye fel a kapcsolatot az alkalmazás adminisztrátorával.
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_pt_BR.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_pt_BR.properties
index 096681d068..dd34bac347 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_pt_BR.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_pt_BR.properties
@@ -1,5 +1,3 @@
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=Página Não Encontrada
 forbidden=Proibido
 needAccessRights=Você não tem as permissões de acesso para esta solicitação. Entre em contato com um administrador.
diff --git a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_th.properties b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_th.properties
index c4cfac3d25..7b437b5042 100644
--- a/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_th.properties
+++ b/themes/src/main/resources-community/theme/keycloak.v2/account/messages/messages_th.properties
@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=ไม่พบหน้า
 forbidden=ไม่มีสิทธิ์
 needAccessRights=คุณไม่มีสิทธิ์เข้าถึงคำขอนี้ ติดต่อผู้ดูแลระบบของคุณ
diff --git a/themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties b/themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties
index 45f8bdad68..fcc289d8ff 100644
--- a/themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties
+++ b/themes/src/main/resources/theme/keycloak.v2/account/messages/messages_en.properties
@@ -1,5 +1,3 @@
-# Put new messages for Account Console Here
-# Feel free to use any existing messages from the base theme
 pageNotFound=Page not found
 forbidden=Forbidden
 needAccessRights=You do not have access rights to this request.  Contact your administrator.