Merge remote-tracking branch 'upstream/pull/4667'

diff --cc app/assets/stylesheets/common.scss
Simple merge

diff --cc app/views/layouts/_header.html.erb
index 13a4aa65e99ffa3eb1d2f8e88bdab3cc392750aa,f61d0806f36bd4ab704651a6f8b60f542bffbde2..eeed7de4229feb00cbb4cedc680b427f89272765
--- 1/app/views/layouts/_header.html.erb
--- 2/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -81,8 -81,8 +81,8 @@@
      </ul>
      <% if current_user && current_user.id %>
        <div class='d-inline-flex dropdown user-menu logged-in'>
-         <button class='dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-white text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+         <button class='dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
 -          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1") %>
 +          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
            <%= render :partial => "layouts/inbox" %>
            <span class="user-button">
              <span class='username'>