diff --git a/catalog/templates/_item_comments.html b/catalog/templates/_item_comments.html
index e5ca2235..9e10b7db 100644
--- a/catalog/templates/_item_comments.html
+++ b/catalog/templates/_item_comments.html
@@ -55,7 +55,6 @@
         {% endif %}
       </span>
       <span>
-        {% if comment.rating_grade %}{{ comment.rating_grade|rating_star }}{% endif %}
         <a href="{{ comment.owner.url }}"
            class="nickname"
            title="@{{ comment.owner.handle }}">{{ comment.owner.display_name }}</a>
@@ -69,7 +68,12 @@
       {% if comment.item != item %}
         <a href="{{ comment.item_url }}">{{ comment.item.title }}</a><small class="title_deco">{{ comment.item.title_deco }}</small>
       {% endif %}
-      <div class="tldr" _="on click toggle .tldr on me">{{ comment.html|safe }}</div>
+      <div class="tldr" _="on click toggle .tldr on me">
+        <span>
+          {% if comment.rating_grade %}{{ comment.rating_grade|rating_star }}{% endif %}
+        </span>
+        {{ comment.html|safe }}
+      </div>
       {% if comment.latest_post %}<div id="replies_{{ comment.latest_post.pk }}"></div>{% endif %}
     </section>
   {% else %}
diff --git a/common/static/scss/_rating.scss b/common/static/scss/_rating.scss
index e8f3cbc5..32faa607 100644
--- a/common/static/scss/_rating.scss
+++ b/common/static/scss/_rating.scss
@@ -94,7 +94,8 @@
 // Rating Star with Font Awesome
 .rating-star {
   position: relative;
-  vertical-align: middle;
+  vertical-align: bottom;
+  color: var(--pico-mark-background-color);
   font-family: FontAwesome;
   display: inline-block;
 }
diff --git a/common/templates/common_libs.html b/common/templates/common_libs.html
index 2f5bae43..1369fd11 100644
--- a/common/templates/common_libs.html
+++ b/common/templates/common_libs.html
@@ -45,7 +45,7 @@
     style.innerHTML = ".solo-hidden {display: none;}";
     document.head.appendChild(style);
   }
-  $('html').attr('data-theme', localStorage.getItem("theme_color"))
+  $('html').attr('data-theme', localStorage.getItem("theme_color")||null)
 })();
 </script>
 <link rel="icon" href="{{ site_icon }}">
diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html
index 091fb19b..355d530a 100644
--- a/users/templates/users/preferences.html
+++ b/users/templates/users/preferences.html
@@ -202,7 +202,7 @@
             </form>
           </details>
           <script>
-            var _c=$('html').attr('data-theme')||null;
+            var _c=$('html').attr('data-theme')||"";
             if (_c=="light") $('input[id=theme_light]').prop('checked', true);
             if (_c=="dark") $('input[id=theme_dark]').prop('checked', true);
             if (!_c) $('input[id=theme_auto]').prop('checked', true);
@@ -210,8 +210,7 @@
             $("#solo_mode").prop("checked", localStorage.getItem("solo_mode")=="1");
             function save_local() {
               var _c=$('input[name=theme_color]:checked').val();
-              if (_c=="") _c=null;
-              $('html').attr('data-theme', _c);
+              $('html').attr('data-theme', _c||"");
               localStorage.setItem("theme_color", _c);
               localStorage.setItem("user_style", $("#user_style").val());
               localStorage.setItem("solo_mode", $("#solo_mode").prop("checked")?"1":"0");