diff --git a/resources/base.scss b/resources/base.scss
index 7cfa09a..62e204a 100644
--- a/resources/base.scss
+++ b/resources/base.scss
@@ -289,7 +289,7 @@ nav {
 
                 &:hover {
                     border-top: 2px solid #9c3706;
-                    color: lightcoral;
+                    color: black;
                     background: rgba(255, 255, 255, 0.25);
                     margin: 0;
                 }
@@ -377,7 +377,8 @@ hr {
 }
 
 #content {
-    margin: 3.2em auto 1em auto;
+    margin: 48px auto 1em auto;
+    padding-top: 1em;
 
     // Header
     width: 90%;
diff --git a/resources/chatbox.scss b/resources/chatbox.scss
index a3d50d9..ae2be84 100644
--- a/resources/chatbox.scss
+++ b/resources/chatbox.scss
@@ -43,12 +43,11 @@
     border-bottom: 0;
 }
 #chat-online-content {
-    margin-top: 0.5em;
     margin-bottom: 0;
     overflow: hidden;
     overflow-wrap: break-word;
     overflow-y: auto;
-    max-height: 77vh;
+    max-height: calc(100% - 44px);
 }
 #chat-box {
     /*border: 1px solid #ccc;*/
@@ -80,7 +79,7 @@
     #chat-container {
         display: flex;
         width: 100%;
-        height: 90vh;
+        height: calc(100vh - 3em);;
         border: 1px solid #ccc;
         /*border-radius: 0 4px 0 0;*/
         border-bottom: 0;
@@ -96,18 +95,13 @@
     font-family: "Noto Sans", Arial, "Lucida Grande", sans-serif;
 }
 .info-pic {
-    height: 90%;
-    border-radius: 50%;
-    padding: 0.05em;
-    border: 0.1px solid #ccc;
-    margin-left: 3em;
-    margin-bottom: 1.5px;
+    height: 100%;
 }
 .info-circle {
     position: absolute;
-    cx: 86%;
-    cy: 80%;
-    r: 6px;
+    cx: 12%;
+    cy: 12%;
+    r: 12%;
     stroke: white;
     stroke-width: 1;
 }
@@ -116,13 +110,17 @@
     font-size: 2em;
     font-weight: bold !important;
     display: flex;
+    align-items: center;
 }
 .info-name a {
     display: table-caption;
 }
 #chat-info {
-    border-bottom: 2px solid darkgray;
     display: flex;
+    align-items: center;
+    box-shadow: 0px 2px 3px rgb(0 0 0 / 20%);
+    position: relative;
+    z-index: 100;
 }
 #refresh-button {
     padding: 0;
@@ -192,9 +190,8 @@
 
 .chat {
     .active-span {
-        margin-top: 1em;
-        margin-right: 1em;
         color: #636363;
+        margin-right: 1em;
     }
 
     .unread-count {
diff --git a/resources/darkmode.css b/resources/darkmode.css
index 8b97bfa..bff07e2 100644
--- a/resources/darkmode.css
+++ b/resources/darkmode.css
@@ -1575,7 +1575,7 @@ nav ul li button:link {
 nav ul li a:hover,
 nav ul li button:hover {
     border-top-color: rgb(199, 70, 8);
-    color: rgb(239, 120, 120);
+    color: rgb(232, 230, 227);
     background-image: initial;
     background-color: rgba(24, 26, 27, 0.25);
 }
@@ -2034,16 +2034,6 @@ ul.problem-list {
 #problem-table th a {
     color: inherit;
 }
-.problem-feed-option-item {
-    background-image: initial;
-    background-color: rgb(49, 53, 55);
-    color: rgb(152, 143, 129);
-}
-.problem-feed-option-item.active {
-    background-image: initial;
-    background-color: rgb(27, 73, 88);
-    color: rgb(121, 170, 255);
-}
 .problem-data-form .bad-file input,
 .problem-data-form .bad-file .select2-selection {
     border-color: rgb(179, 0, 0);
@@ -2479,9 +2469,10 @@ input[type="text"]:focus, input[type="password"]:focus {
 .tabs > ul > li.active > span:hover,
 .tabs > ul > li.active > a,
 .tabs > ul > li.active > span {
-    color: rgb(232, 230, 227);
-    background-color: rgb(24, 26, 27);
-    border-color: rgb(62, 68, 70) rgb(62, 68, 70) transparent;
+    color: rgb(205, 200, 194);
+    border-bottom-color: rgb(126, 117, 103);
+    background-image: initial;
+    background-color: transparent;
 }
 .tabs {
     border-bottom-color: rgb(62, 68, 70);
@@ -2504,10 +2495,13 @@ input[type="text"]:focus, input[type="password"]:focus {
 }
 .tabs > ul > li > a,
 .tabs > ul > li > span {
-    border-color: transparent;
     color: rgb(178, 172, 162);
     text-decoration-color: initial;
 }
+.tabs > ul > li > a:hover,
+.tabs > ul > li > span:hover {
+    border-bottom-color: rgb(0, 217, 0);
+}
 ul.pagination a:hover {
     color: rgb(232, 230, 227);
     background-image: initial;
@@ -2585,17 +2579,15 @@ a.close:hover {
     border-top-color: rgb(53, 57, 59);
 }
 .sidebox h3 {
+    background-image: initial;
+    background-color: rgb(24, 26, 27);
+}
+.sidebox h3 .fa {
     background-image: initial;
     background-color: rgb(3, 66, 54);
     color: rgb(232, 230, 227);
 }
-.sidebox h3 .fa {
-    color: rgb(232, 230, 227);
-}
 .sidebox-content {
-    border-right-color: rgb(62, 68, 70);
-    border-bottom-color: rgb(62, 68, 70);
-    border-left-color: rgb(62, 68, 70);
     border-top-color: initial;
     background-image: initial;
     background-color: rgb(24, 26, 27);
@@ -3029,14 +3021,11 @@ a.voted {
         border-bottom-color: initial;
     }
 }
-.info-pic {
-    border-color: rgb(62, 68, 70);
-}
 .info-circle {
     stroke: rgb(232, 230, 227);
 }
 #chat-info {
-    border-bottom-color: rgb(72, 78, 81);
+    box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 3px;
 }
 #refresh-button {
     background-image: initial;
@@ -3095,7 +3084,7 @@ a.voted {
     color: rgb(232, 230, 227);
 }
 .organization-row {
-    border-bottom-color: rgb(84, 91, 94);
+    border-bottom-color: rgb(62, 68, 70);
     border-top-color: initial;
     color: rgb(232, 230, 227);
 }
@@ -3103,7 +3092,7 @@ a.voted {
     background-color: rgb(31, 33, 35);
 }
 .organization-container {
-    border-color: rgb(84, 91, 94);
+    border-color: rgb(62, 68, 70);
 }
 .ticket-container #content > h2:first-child small {
     color: rgb(168, 160, 149);
diff --git a/resources/organization.scss b/resources/organization.scss
index 148f379..2e49840 100644
--- a/resources/organization.scss
+++ b/resources/organization.scss
@@ -1,49 +1,50 @@
-.leave-organization, .leave-organization:hover {
-    color: red;
-}
-#control-list li {
-    border-bottom: 1px solid black; 
-}
-#pending-count-box {
-    float: right;
-    text-align: center;
-    background: red;
-    color: white;
-    border-radius: 3px;
-    padding-left: 0.3em;
-    padding-right: 0.3em;
-}
-.org-field-wrapper {
-    input[type=text], textarea {
-        width: 100%;
-    }
-    .select2 {
-        width: 100% !important;
-    }
-}
-.org-field-wrapper {
-    margin-top: 0.4em;
-}
-.org-field-wrapper:has(> input[type=checkbox]) {
-    display: contents;
-}
-
-.organization-row {
-    display: block;
-    padding: 0.5em;
-    border-bottom: 1px gray solid;
-    border-top: none;            
-    color: black;
-    font-weight: 500;
-    display: flex;
-    align-items: center;
-}
-
-.organization-row:hover {
-    background-color: #f3f3f3;
-}
-
-.organization-container {
-    border: 1px gray solid;
-    margin-bottom: 3em;
+.leave-organization, .leave-organization:hover {
+    color: red;
+}
+#control-list li {
+    border-bottom: 1px solid black;
+}
+#pending-count-box {
+    float: right;
+    text-align: center;
+    background: red;
+    color: white;
+    border-radius: 3px;
+    padding-left: 0.3em;
+    padding-right: 0.3em;
+}
+.org-field-wrapper {
+    input[type=text], textarea {
+        width: 100%;
+    }
+    .select2 {
+        width: 100% !important;
+    }
+}
+.org-field-wrapper {
+    margin-top: 0.4em;
+}
+.org-field-wrapper:has(> input[type=checkbox]) {
+    display: contents;
+}
+
+.organization-row {
+    display: block;
+    padding: 0.5em;
+    border-bottom: 1px #ccc solid;
+    border-top: none;
+    color: black;
+    font-weight: 500;
+    display: flex;
+    align-items: center;
+}
+
+.organization-row:hover {
+    background-color: #f3f3f3;
+}
+
+.organization-container {
+    border: 1px #ccc solid;
+    margin-bottom: 3em;
+    border-radius: 5px;
 }
\ No newline at end of file
diff --git a/resources/problem.scss b/resources/problem.scss
index 6122e8c..4c323ab 100644
--- a/resources/problem.scss
+++ b/resources/problem.scss
@@ -364,34 +364,10 @@ ul.problem-list {
     }
 }
 
-.problem-feed-option {
-    width: 90%;
-    margin-left: 2.5%;
-    padding-bottom: 1em;
-    border-radius: 5px;
-    display: flex;
-    justify-content: space-between;
-}
-
-.problem-feed-option-item {
-    padding: 10px 15px;
-    border-radius: 1em;
-    font-weight: bold;
-    background: lightgray;
-    margin-right: 1em;
-    color: gray;
-    cursor: pointer;
-}
-
 .pcodecell {
     text-transform: uppercase;
 }
 
-.problem-feed-option-item.active {
-    background: lightblue;
-    color: darkblue;
-}
-
 .problem-data-form {
     .bad-file input, .bad-file .select2-selection {
         border-color: red;
diff --git a/resources/table.scss b/resources/table.scss
index c72149d..704af10 100644
--- a/resources/table.scss
+++ b/resources/table.scss
@@ -90,4 +90,10 @@
 
 #users-table th a {
     color: white;
+}
+
+.feed-table {
+    td, td:first-child, tr:last-child td, tr:last-child td:first-child {
+        border-width: 1px 0 0 0;
+    }
 }
\ No newline at end of file
diff --git a/resources/widgets.scss b/resources/widgets.scss
index a8b0d2d..7d80a13 100644
--- a/resources/widgets.scss
+++ b/resources/widgets.scss
@@ -215,12 +215,11 @@ input {
 
 // Bootstrap-y tabs
 .ul_tab_a_active {
-    color: black;
+    color: #045343;
     cursor: default;
-    background-color: #fff;
-    border: 1px solid $border_gray;
-    border-bottom-color: transparent;
-    border-image: none;
+    font-weight: bold;
+    border-bottom: 3px solid #045343;
+    background: transparent;
 }
 
 .tabs {
@@ -267,7 +266,6 @@ input {
         overflow-y: hidden;
 
         > li {
-            margin-bottom: -1px;
             position: relative;
             display: block;
 
@@ -284,16 +282,19 @@ input {
             }
 
             > a, > span {
-                margin-right: 2px;
+                margin-right: 10px;
                 line-height: 1.42857;
-                border: 1px solid transparent;
-                border-radius: $widget_border_radius $widget_border_radius 0 0;
                 position: relative;
                 display: block;
-                padding: 10px 15px;
+                padding: 5px 5px;
                 color: #555;
                 text-decoration: none;
                 white-space: nowrap;
+                font-weight: bold;
+
+                &:hover {
+                    border-bottom: 3px solid green;
+                }
             }
         }
     }
@@ -474,28 +475,30 @@ ul.select2-selection__rendered {
 }
 
 .sidebox h3 {
-    margin: 0 -5px;
-    background: #045343;
     border-radius: $widget_border_radius $widget_border_radius 0 0;
-    color: white;
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 10px;
+    padding-bottom: 10px;
     padding-left: 7px;
     font-size: 1.3em;
-}
+    font-weight: bold;
+    background: white;
+    display: flex;
 
-.sidebox h3 .fa {
-    color: white;
-    float: right;
-    margin: 0.2em 0.4em 0 0;
+    .fa {
+        background: #045343;
+        color: white;
+        padding: 4px;
+        margin-right: 8px;
+        border-radius: 5px;
+        font-size: smaller;
+    }
 }
 
 .sidebox-content {
-    border: 1px solid $border_gray;
     border-top: none;
-    margin: 0 -5px;
     padding: 1px 0.5em 3px;
     background: white;
+    border-radius: 0 0 $widget_border_radius $widget_border_radius;
 
     &.sidebox-table {
         border: none;
@@ -510,8 +513,7 @@ ul.select2-selection__rendered {
 .sidebox {
     border-top-left-radius: $widget_border_radius;
     border-top-right-radius: $widget_border_radius;
-    padding: 0 5px !important;
-    margin-bottom: 1.5em !important;
+    margin-bottom: 1.5em;
     box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
 }
 
diff --git a/templates/base.html b/templates/base.html
index f69a8a8..1a014af 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -331,7 +331,6 @@
       <noscript>
         <div id="noscript">{{ _('This site works best with JavaScript enabled.') }}</div>
       </noscript>
-      <br>
       <main id="content" class="{{'wrapper' if layout != 'no_wrapper'}}">
         {% block title_row %}
           <h2 class="title-row">
diff --git a/templates/chat/chat.html b/templates/chat/chat.html
index 36c250d..e6ba14f 100644
--- a/templates/chat/chat.html
+++ b/templates/chat/chat.html
@@ -582,13 +582,8 @@
 
     <div id="chat-container">
       <div id="chat-online" class="chat-right-panel sidebox">
-        <h3 style="display:flex">
-          {{_('Online Users')}}
-          <a href="#" id="refresh-button" title="{{_('Refresh')}}">
-            <img src="/reload.png"
-              width="100%"
-            >
-          </a>
+        <h3>
+          <i class="fa fa-users"></i>{{_('Online Users')}}
         </h3>
         <div id="chat-online-content">
           <div id="search-container">
@@ -606,7 +601,7 @@
         </div>
       </div>
       <div id="chat-area" class="chat-left-panel" style="width:100%">
-        <div id="chat-info" style="height: 8%">
+        <div id="chat-info" style="height: 10%">
           {% include 'chat/user_online_status.html' %}
         </div>
         <div id="chat-box">
diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html
index 3b0452d..d6934f5 100644
--- a/templates/chat/chat_css.html
+++ b/templates/chat/chat_css.html
@@ -4,7 +4,7 @@
   }
 
   #content {
-    margin: 2.5em 1em 0 0;
+    padding-top: 0;
   }
 
   ::-webkit-scrollbar {
@@ -92,7 +92,6 @@
   }
   .sidebox h3 {
     border-radius: 0;
-    margin: -1px -5.5px 0 -5.8px;
   }
   .body-block {
     border-radius: 4px;
diff --git a/templates/chat/user_online_status.html b/templates/chat/user_online_status.html
index 6f7d8cd..08c5cbe 100644
--- a/templates/chat/user_online_status.html
+++ b/templates/chat/user_online_status.html
@@ -1,7 +1,7 @@
 {% if other_user %}
   <div class="status-container" style="height: 100%">
     <img src="{{ gravatar(other_user.user, 135) }}" class="info-pic">
-    <svg style="position:absolute; height:100%; width: 110%">
+    <svg style="position:absolute; height:100%; width: 100%">
       <circle class="info-circle"
         fill="{{'green' if other_online else 'red'}}"/>
     </svg>
@@ -9,9 +9,9 @@
 {% endif %}
 <span class="info-name username">
   {% if other_user %}
-    <a href="{{url('user_page', other_user)}}">{{other_user.user.username}}</a>
+    {{link_user(other_user)}}
   {% else%}
-    <a href="#" style="margin-left: 3em">{{ _('Lobby') }}</a>
+    {{ _('Lobby') }}
   {% endif %}
 </span>
 <span class="spacer"></span>
diff --git a/templates/contests-countdown.html b/templates/contests-countdown.html
index a7e4840..36879f4 100644
--- a/templates/contests-countdown.html
+++ b/templates/contests-countdown.html
@@ -1,6 +1,6 @@
 {% if current_contests %}
   <div class="blog-sidebox sidebox">
-    <h3>{{ _('Ongoing contests') }} <i class="fa fa-trophy"></i></h3>
+    <h3><i class="fa fa-trophy"></i> {{ _('Ongoing contests') }}</h3>
     <div class="sidebox-content">
       {% for contest in current_contests %}
         <div class="contest">
@@ -18,7 +18,7 @@
 
 {% if future_contests %}
   <div class="blog-sidebox sidebox">
-    <h3>{{ _('Upcoming contests') }} <i class="fa fa-trophy"></i></h3>
+    <h3><i class="fa fa-trophy"></i>{{ _('Upcoming contests') }}</h3>
     <div class="sidebox-content">
       {% for contest in future_contests %}
         <div class="contest">
diff --git a/templates/organization/home.html b/templates/organization/home.html
index 80ad6dc..87be1e0 100644
--- a/templates/organization/home.html
+++ b/templates/organization/home.html
@@ -44,7 +44,7 @@
     {% include "blog/content.html" %}
   {% else %}
     <div class="blog-sidebox sidebox">
-      <h3>{{ _('About') }}<i class="fa fa-info-circle"></i></h3>
+      <h3><i class="fa fa-info-circle"></i>{{ _('About') }}</h3>
       <div class="sidebox-content">
         <div style="margin: 0.3em;">
           {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
diff --git a/templates/organization/org-right-sidebar.html b/templates/organization/org-right-sidebar.html
index b1f5920..f1d3629 100644
--- a/templates/organization/org-right-sidebar.html
+++ b/templates/organization/org-right-sidebar.html
@@ -4,8 +4,8 @@
   {% endif %}
   {% if can_edit or is_member %}
     <div id="control-panel" class="blog-sidebox sidebox no-dot-blog-sidebox">
-      <h3>{{ _('Controls') }} <i class="fa fa-cog"></i></h3>
-      <ul id="control-list" class="sidebox-content" style="padding: 1em;">
+      <h3><i class="fa fa-cog"></i>{{ _('Controls') }}</h3>
+      <ul id="control-list" class="sidebox-content" style="margin: 0;">
         {% if can_edit %}
           <li>
             <div>
@@ -67,7 +67,7 @@
       </ul>
     </div>
     <div class="blog-sidebox sidebox">
-      <h3>{{ _('About') }}<i class="fa fa-info-circle"></i></h3>
+      <h3><i class="fa fa-info-circle"></i>{{ _('About') }}</h3>
       <div class="sidebox-content">
         <div style="margin: 0.3em;">
           {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
diff --git a/templates/problem/feed.html b/templates/problem/feed.html
index c263fc3..253ac51 100644
--- a/templates/problem/feed.html
+++ b/templates/problem/feed.html
@@ -7,20 +7,20 @@
 {% endblock %}
 
 {% block middle_content %}
-  <div class="problem-feed-option">
-    <a href="{{url('problem_feed')}}"
-      class="button small {{'btn-midnightblue' if feed_type=='for_you' else 'btn-gray'}}">
-      {{_('FOR YOU')}}
-    </a>
-    <a href="{{url('problem_feed_new')}}" class="button small {{'btn-midnightblue' if feed_type=='new' else 'btn-gray'}}">
-      {{_('NEW')}}
-    </a>
-    {% if request.user.has_perm('judge.suggest_problem_changes') %}
-      <a href="{{url('problem_feed_volunteer')}}"
-        class="button small {{'btn-midnightblue' if feed_type=='volunteer' else 'btn-gray'}}">
-        {{_('VOLUNTEER')}}
-      </a>
-    {% endif %}
+  <div class="tabs tabs-no-flex" style="width: 90%;margin-left: auto;margin-right: auto;">
+    <ul>
+      <li class="{{'active' if feed_type=='for_you'}}">
+        <a href="{{url('problem_feed')}}">{{_('FOR YOU')}}</a>
+      </li>
+      <li class="{{'active' if feed_type=='new'}}">
+        <a href="{{url('problem_feed_new')}}">{{_('NEW')}}</a>
+      </li>
+      {% if request.user.has_perm('judge.suggest_problem_changes') %}
+        <li class="{{'active' if feed_type=='volunteer'}}">
+          <a href="{{url('problem_feed_volunteer')}}">{{_('VOLUNTEER')}}</a>
+        </li>
+      {% endif %}
+    </ul>
   </div>
   {% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
     <ul style="margin-bottom: 1em; margin-left: auto">
diff --git a/templates/problem/recent-attempt.html b/templates/problem/recent-attempt.html
index 86aa7d3..195fe27 100644
--- a/templates/problem/recent-attempt.html
+++ b/templates/problem/recent-attempt.html
@@ -1,7 +1,6 @@
 {% if last_attempted_problems%}
   <div class="sidebox">
-    <h3>{{ _('Last unsolved') }} <i class="fa fa-bullseye"></i>
-    </h3>
+    <h3><i class="fa fa-bullseye"></i>{{ _('Last unsolved') }}</h3>
     <div class="sidebox-content" style="padding: 0; border: 0">
       <table class="table feed-table">
         <tbody>
diff --git a/templates/problem/search-form.html b/templates/problem/search-form.html
index c1dfc3c..7f7e396 100644
--- a/templates/problem/search-form.html
+++ b/templates/problem/search-form.html
@@ -1,6 +1,5 @@
 <div class="sidebox">
-  <h3>{{ _('Problem search') }} <i class="fa fa-search"></i>
-  </h3>
+  <h3><i class="fa fa-search"></i>{{ _('Problem search') }}</h3>
   <div class="sidebox-content">
     <form id="filter-form" name="form" action="" method="get">
       <div>
diff --git a/templates/recent-organization.html b/templates/recent-organization.html
index 41e9e57..028b497 100644
--- a/templates/recent-organization.html
+++ b/templates/recent-organization.html
@@ -15,7 +15,7 @@
 
 {% if recent_organizations %}
   <div class="blog-sidebox sidebox">
-    <h3>{{ _('Recent groups') }} <i class="fa fa-users"></i></h3>
+    <h3><i class="fa fa-users"></i>{{ _('Recent groups') }}</h3>
     <div class="toggled">
       {% for organization in recent_organizations %}
         <a href="{{ url('organization_home', organization.organization.pk, organization.organization.slug) }}" class="sidebox-content organization-row" title="{{organization.organization.about}}">
diff --git a/templates/submission/list.html b/templates/submission/list.html
index b29e166..41faac0 100644
--- a/templates/submission/list.html
+++ b/templates/submission/list.html
@@ -331,7 +331,7 @@
     <div class="right-sidebar">
       <div class="submission">
         <div class="sidebox">
-          <h3>{{ _('Filter submissions') }} <i class="fa fa-search"></i></h3>
+          <h3><i class="fa fa-search"></i>{{ _('Filter submissions') }}</h3>
           <div class="sidebox-content">
             <form id="filter-form" name="form" action="" method="get">
               <div class="filter-form-group">
@@ -360,7 +360,7 @@
         </div>
         <div class="sidebox">
           <div id="statistics-table">
-            <h3>{{ _('Statistics') }} <i class="fa fa-pie-chart"></i></h3>
+            <h3><i class="fa fa-pie-chart"></i>{{ _('Statistics') }}</h3>
             <div class="sidebox-content">
               <div id="status-graph">
                 <canvas width="230" height="170"></canvas>
diff --git a/templates/three-column-content.html b/templates/three-column-content.html
index 907b6cf..329e54f 100644
--- a/templates/three-column-content.html
+++ b/templates/three-column-content.html
@@ -96,7 +96,7 @@
     }
 
     function registerNavigation() {
-      const links = ['.pagination a', '.tabs li a', '.problem-feed-option a'];
+      const links = ['.pagination a', '.tabs li a'];
       for (link of links) {
         $(link).on('click', function (e) {
           e.preventDefault();
diff --git a/templates/top-users.html b/templates/top-users.html
index f1cdcc9..6804961 100644
--- a/templates/top-users.html
+++ b/templates/top-users.html
@@ -1,6 +1,6 @@
 {% if top_rated %}
   <div class="blog-sidebox sidebox">
-    <h3>{{ _('Top Rating') }} <i class="fa fa-trophy"></i></h3>
+    <h3><i class="fa fa-trophy"></i>{{ _('Top Rating') }}</h3>
     <div class="sidebox-content" style="padding: 0; border: 0">
       <table class="table feed-table">
         <tbody>
@@ -19,7 +19,7 @@
 
 {% if top_scorer %}
   <div class="blog-sidebox sidebox">
-    <h3>{{ _('Top Score') }} <i class="fa fa-trophy"></i></h3>
+    <h3><i class="fa fa-trophy"></i>{{ _('Top Score') }}</h3>
     <div class="sidebox-content" style="padding: 0; border: 0">
       <table class="table feed-table">
         <tbody>