Index: openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp	20 Jun 2019 14:19:11 -0000	1.3.2.1
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/login.adp	11 Jun 2023 13:13:32 -0000	1.3.2.2
@@ -1,6 +1,6 @@
 <if @login_p;literal@ true>
     <li class="dropdown" style="z-index:1100;">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-top:8px;padding-bottom:0;">@photo;noquote@ <em class="glyphicon glyphicon-chevron-down"></em></a>
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-top:8px;padding-bottom:0;">@photo;noquote@ </a>
         <ul class="dropdown-menu">
             <li>
                 <!-- user greeting or login message -->
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.adp	7 Aug 2017 23:48:13 -0000	1.2
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/widgets/navigation.adp	11 Jun 2023 13:13:32 -0000	1.2.2.1
@@ -12,8 +12,7 @@
                         <if @navigation.accesskey@ not nil> accesskey="@navigation.accesskey;noquote@"</if>
                         <if @navigation.tabindex@ not nil> tabindex="@navigation.tabindex;noquote@"</if>>
                         <if @navigation.display_template@ not nil>@navigation.display_template;noquote@</if>
-                        <else>@navigation.label@</else>
-                        <span class="caret"></span></a>
+                        <else>@navigation.label@</else></a>
                         <ul class="dropdown-menu">@navigation.submenu;noquote@</ul>
                     </li>
                 </if>
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.8 -r1.2.2.9
--- openacs-4/packages/openacs-bootstrap3-theme/www/resources/css/main.css	20 Nov 2022 10:58:46 -0000	1.2.2.8
+++ openacs-4/packages/openacs-bootstrap3-theme/www/resources/css/main.css	11 Jun 2023 13:13:33 -0000	1.2.2.9
@@ -282,3 +282,14 @@
 a.acs-lang-missing:hover {
     color: red;
 }
+
+.dropdown-toggle::after {
+    display: inline-block;
+    margin-left: .255em;
+    vertical-align: .255em;
+    content: "";
+    border-top: .3em solid;
+    border-right: .3em solid transparent;
+    border-bottom: 0;
+    border-left: .3em solid transparent;
+}
Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -r1.11.2.30 -r1.11.2.31
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	12 May 2023 18:13:39 -0000	1.11.2.30
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	11 Jun 2023 13:13:33 -0000	1.11.2.31
@@ -96,9 +96,6 @@
       set data_attribute [expr {[::xowiki::CSS toolkit] eq "bootstrap5" ? "data-bs" : "data"}]
       html::a -href "\#" -class $class -$data_attribute-toggle "dropdown" {
         html::t ${:text}
-        if {[xowiki::CSS toolkit] eq "bootstrap"} {
-          html::b -class "caret"
-        }
       }
       html::ul -class "dropdown-menu" {
         foreach dropdownmenuitem [:children] {
Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v
diff -u -r1.23.2.20 -r1.23.2.21
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	22 Feb 2023 12:57:18 -0000	1.23.2.20
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	11 Jun 2023 13:13:33 -0000	1.23.2.21
@@ -382,7 +382,7 @@
       append entry \
           "<a class='dropdown-toggle' data-toggle='dropdown' href='#'>" \
           [ns_quotehtml $label] \
-          "<span class='caret'></span></a>"
+          "</a>"
       set o_atts "class='dropdown'"
       set u_atts "class='dropdown-menu'"