diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 2092d72cc..6ccec507d 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -532,7 +532,13 @@
                         &> button {
                             height: @toolbar_line-height;
                             width: @toolbar_line-height;
-                            span { font-size: unset; }
+                            span {
+                                .avatar_vars(36px);
+                                font-size: @avatar-font-size;
+                                .animal {
+                                    font-size: @avatar-font-size-animal;
+                                }
+                            }
                         }
                         &> button.cp-avatar.cp-avatar {
                             media-tag {
@@ -862,7 +868,6 @@
                         align-items: center;
                         .animal {
                             font-size: @avatar-font-size-animal;
-
                         }
                     }
                     &.cp-avatar {
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 5996940e4..79d5a87a3 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -162,10 +162,9 @@
             &.cp-cursor.cp-tippy-html {
                 .avatar_vars(20px);
                 background-color: var(--red);
-                // XXX figure out how to inherit this from avatar.less
-                font-size: @avatar-font-size; //var(11px; // 20px / 1.8 as per avatar.less..
+                font-size: @avatar-font-size;
                 &.animal {
-                    font-size: @avatar-font-size-animal; //14px; // 20px / 1.8 * (6/5)...
+                    font-size: @avatar-font-size-animal;
                 }
             }
         }