diff --git a/src/theme/Navbar/index.js b/src/theme/Navbar/index.js
index 7bbd530cf2..4d7ba0b3b3 100644
--- a/src/theme/Navbar/index.js
+++ b/src/theme/Navbar/index.js
@@ -81,7 +81,7 @@ export default function NavbarWrapper(props) {
                             <a className={styles.nav_link} href="https://tracker.moodle.org"><span>Tracker</span></a>
                         </li>
                         <li>
-                            <a className={styles.nav_link} href="https://moodledev.io/"><span>Development</span></a>
+                            <a className={styles.nav_link} href="https://moodledev.io/"><span className={styles.active}>Development</span></a>
                         </li>
                         <li>
                             <a className={styles.nav_link} href="https://lang.moodle.org"><span>Translation</span></a>
@@ -121,7 +121,8 @@ export default function NavbarWrapper(props) {
                                 className={styles.nav_link}
                                 type="button"
                                 onClick={() => openMenu('waffle_menu')}
-                                aria-label="Toggle sites menu"
+                                aria-label="Other Moodle Sites"
+                                title="Other Moodle Sites"
                             >
                                 <i className={styles.fa_waffle} />
                             </button>
diff --git a/src/theme/Navbar/index.module.css b/src/theme/Navbar/index.module.css
index 5c9189a89c..46a0c06d85 100644
--- a/src/theme/Navbar/index.module.css
+++ b/src/theme/Navbar/index.module.css
@@ -186,6 +186,22 @@
     padding-left: 0.5rem;
     background: none !important;
     border: 0 !important;
+    text-decoration: none;
+}
+.moodlesitestopnavbar .nav_link span {
+    height: 22px;
+}
+.moodlesitestopnavbar .nav_link span.active,
+.moodlesitestopnavbar .nav_link:hover span.active {
+    color: #194866;
+    border-bottom: 3px solid #f98012;
+    height: 25px;
+}
+
+.moodlesitestopnavbar .nav_link:hover span {
+  color : #000000;
+  border-bottom: 3px solid #f98012;
+  height: 25px;
 }
 
 .moodlesitestopnavbar .mobile_menu{