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

diff --combined app/helpers/user_roles_helper.rb
index bdae9ffaf8dbca0404cfd4e0c6af8d84edeffb9e,449b4e1286e8f699e0f38e3dca9c22b6b1ac2d84..e839c0ae65f27f5af07df0d03b43f046914800a5
--- 1/app/helpers/user_roles_helper.rb
--- 2/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@@ -24,7 -24,7 +24,7 @@@ module UserRolesHelpe
    def role_icon_svg_tag(role, blank, title, **options)
      role_colors = {
        "administrator" => "#f69e42",
 -      "moderator" => "#0606ff",
 +      "moderator" => "#447eff",
        "importer" => "#38e13a"
      }
      color = role_colors[role] || "currentColor"
@@@ -32,8 -32,11 +32,11 @@@
      path_data = "M 10,2 8.125,8 2,8 6.96875,11.71875 5,18 10,14 15,18 13.03125,11.71875 18,8 11.875,8 10,2 z"
      tag.svg(:width => 20, :height => 20, **options) do
        concat tag.title(title)
-       concat tag.path(:d => path_data, :fill => color, :stroke => color, "stroke-width" => 2, "stroke-linejoin" => "round")
-       concat tag.path(:d => path_data, :fill => "#fff") if blank
+       concat tag.path(:d => path_data,
+                       :fill => blank ? "none" : color,
+                       :stroke => color,
+                       "stroke-width" => blank ? 1.5 : 2,
+                       "stroke-linejoin" => "round")
      end
    end
  end