Index: openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl,v
diff -u -r1.27.2.6 -r1.27.2.7
--- openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	1 Sep 2022 14:50:49 -0000	1.27.2.6
+++ openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	20 Nov 2022 10:58:46 -0000	1.27.2.7
@@ -167,25 +167,29 @@
                 set key [string range $parsed_template [lindex $key 0] [lindex $key 1]]
                 lassign [split $key "."] package_key message_key
 
+                set locale [ad_conn locale]
                 set edit_url [export_vars -base "${apm_package_url}admin/edit-localized-message" {
-                    { locale {[ad_conn locale]} } package_key message_key { return_url [ad_return_url] } }]
+                    { locale {$locale} } package_key message_key { return_url [ad_return_url] } }]
 
-                if { [lang::message::message_exists_p [ad_conn locale] $key] } {
-                    set edit_link [subst {<a class="acs-lang-localized" href="[ns_quotehtml $edit_url]" title="$key"></a>}]
+                if { [lang::message::message_exists_p $locale $key] } {
+                    set edit_link [subst {<a class="acs-lang-localized" href="[ns_quotehtml $edit_url]"
+                        title="$key"><adp:icon name="check" title="Message Key '$key': available in current locale $locale"></a>}]
                 } else {
                     if { [lang::message::message_exists_p "en_US" $key] } {
                         # Translation missing in this locale
-                        set edit_link [subst {<a class="acs-lang-us_only" href="[ns_quotehtml $edit_url]" title="$key"></a>}]
+                        set edit_link [subst {<a class="acs-lang-us_only" href="[ns_quotehtml $edit_url]"
+                            title="$key"><adp:icon name="warn" title="Message Key $key: missing in $locale"></a>}]
                     } else {
                         # Message key missing entirely
                         set new_url [export_vars -base "${apm_package_url}admin/localized-message-new" {
                             { locale en_US } package_key message_key { return_url [ad_return_url] }
                         }]
-                        set edit_link [subst {<a class="acs-lang-missing" href="[ns_quotehtml $new_url]" title="$key"></a>}]
+                        set edit_link [subst {<a class="acs-lang-missing" href="[ns_quotehtml $new_url]"
+                            title="$key"><adp:icon name="warn" title="Message Key '$key': undefined"></a>}]
                     }
                 }
 
-                set parsed_template "${before}${edit_link}${after}"
+                set parsed_template "${before}[::template::adp_parse_tags ${edit_link}]${after}"
             }
         }
 
Index: openacs-4/packages/openacs-bootstrap3-theme/www/resources/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/resources/css/main.css,v
diff -u -r1.2.2.7 -r1.2.2.8
--- openacs-4/packages/openacs-bootstrap3-theme/www/resources/css/main.css	12 Mar 2021 19:07:53 -0000	1.2.2.7
+++ openacs-4/packages/openacs-bootstrap3-theme/www/resources/css/main.css	20 Nov 2022 10:58:46 -0000	1.2.2.8
@@ -267,18 +267,18 @@
 a.acs-lang-missing {
     padding: 0px 0px 0px 0px !important;
 }
-a.acs-lang-localized::after {
+a.acs-lang-localized:link,
+a.acs-lang-localized:visited,
+a.acs-lang-localized:hover {
     color: green;
-    font-family: 'Glyphicons Halflings';
-    content: "\e013"; /* glyphicon-ok */
 }
-a.acs-lang-us_only::after {
+a.acs-lang-us_only:link,
+a.acs-lang-us_only:visited,
+a.acs-lang-us_only:hover {
     color: orange;
-    font-family: 'Glyphicons Halflings';
-    content: "\e136"; /* glyphicon-wrench */
 }
-a.acs-lang-missing::after {
+a.acs-lang-missing:link,
+a.acs-lang-missing:visited,
+a.acs-lang-missing:hover {
     color: red;
-    font-family: 'Glyphicons Halflings';
-    content:  "\e209"; /* glyphicon-alert */
 }
Index: openacs-4/packages/openacs-bootstrap5-theme/www/resources/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/www/resources/css/main.css,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/openacs-bootstrap5-theme/www/resources/css/main.css	21 Jun 2022 17:25:20 -0000	1.1.2.4
+++ openacs-4/packages/openacs-bootstrap5-theme/www/resources/css/main.css	20 Nov 2022 10:58:46 -0000	1.1.2.5
@@ -242,20 +242,22 @@
 a.acs-lang-missing {
     padding: 0px 0px 0px 0px !important;
 }
-a.acs-lang-localized::after {
+a.acs-lang-localized:link,
+a.acs-lang-localized:visited,
+a.acs-lang-localized:hover {
+    border-radius: 25px;
+    border: 1px solid green;
     color: green;
-    font-family: 'bootstrap-icons' !important;
-    content: "\f26e"; /* bi-check */
 }
-a.acs-lang-us_only::after {
+a.acs-lang-us_only:link,
+a.acs-lang-us_only:visited,
+a.acs-lang-us_only:hover {
     color: orange;
-    font-family: 'bootstrap-icons' !important;
-    content: "\f621"; /* bi-wrench */
 }
-a.acs-lang-missing::after {
+a.acs-lang-missing:link,
+a.acs-lang-missing:visited,
+a.acs-lang-missing:hover {
     color: red;
-    font-family: 'bootstrap-icons' !important;
-    content:  "\f33a"; /* bi-exclamation-triangle-fill */
 }
 
 body ul.action-links li:before {
Index: openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css	29 Jul 2019 20:08:23 -0000	1.16.2.1
+++ openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css	20 Nov 2022 10:58:46 -0000	1.16.2.2
@@ -726,22 +726,21 @@
 a.acs-lang-missing {
     padding: 1px 1px 1px 1px;
     text-decoration: none;
-    border: 1px solid red;
 }
-a.acs-lang-localized::after {
+a.acs-lang-localized {
+    border-radius: 25px;
+    border: 1px solid green;
     color: green;
-    font-weight: bold;
-    content: "o";
 }
-a.acs-lang-us_only::after {
+a.acs-lang-us_only {
+    border-radius: 25px;
+    border: 1px solid orange;
     color: orange;
-    font-weight: bold;
-    content: "*"; 
 }
-a.acs-lang-missing::after {
+a.acs-lang-missing {
+    border-radius: 25px;
+    border: 1px solid red;
     color: red;
-    font-weight: bold;
-    content:  "*"; 
 }