diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 16266f9c..a6ca2810 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -794,7 +794,6 @@ button.action-button {
 .term-expression-current-indicator {
     pointer-events: none;
     position: absolute;
-    font-size: calc(1em / var(--expression-font-size-no-units));
     left: calc(-1 * var(--main-content-horizontal-padding));
     top: 0;
     bottom: 0;
@@ -804,6 +803,9 @@ button.action-button {
         opacity var(--entry-current-indicator-transition-duration) linear,
         visibility 0s linear var(--entry-current-indicator-transition-duration);
 }
+.term-expression-text .term-expression-current-indicator {
+    font-size: calc(1em / var(--expression-font-size-no-units));
+}
 .entry.entry-current .term-expression-current-indicator {
     opacity: 1;
     visibility: visible;
@@ -1185,6 +1187,10 @@ button.action-button {
 
 
 /* Kanji */
+.kanji-glyph-container {
+    display: block;
+    position: relative;
+}
 .kanji-glyph {
     font-family: kanji-stroke-orders;
     font-size: 8.5em;
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 3f6437ee..26252634 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -57,7 +57,7 @@
 <template id="term-pitch-accent-character-template"><span class="term-pitch-accent-character"><span class="term-pitch-accent-character-inner"></span></span></template>
 
 <!-- Kanji entry templates -->
-<template id="kanji-entry-template"><div class="entry" data-type="kanji">
+<template id="kanji-entry-template" data-remove-whitespace-text="true"><div class="entry" data-type="kanji">
     <div class="entry-current-indicator" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)"><span class="entry-current-indicator-inner"></span></div>
     <div class="entry-header1">
         <div class="entry-header2">
@@ -67,7 +67,10 @@
                     <button class="action-button action-add-note" hidden disabled data-icon="add-term-kanji" data-mode="kanji" title="Add Kanji (Alt + K)"></button>
                     <span class="entry-current-indicator-icon" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)"></span>
                 </div>
-                <div class="kanji-glyph source-text"></div>
+                <div class="kanji-glyph-container">
+                    <span class="term-expression-current-indicator"></span>
+                    <div class="kanji-glyph source-text"></div>
+                </div>
             </div>
         </div>
         <div class="frequencies"></div>