diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index 213bc22..dfcebd1 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -31,11 +31,10 @@
                   content="A brutalist, web-1.0 web client for Mastodon and Pleroma. Supports text-only browsers like Lynx, older browsers, as well as the latest mainstream browsers. All JavaScript is completely optional and progressively enhances the core application.">
 <!-- Minified version -->
 <link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
+<link rel="stylesheet" href="{% static 'css/brutal-css.css' %}">
 {% if not preferences %}
                 <link rel="stylesheet"
                       href="{% static 'css/magnific-popup.css' %}">
-                <link rel="stylesheet"
-                      href="{% static 'css/simple.css' %}">
                 <link rel="stylesheet" href="{% static "css/brutaldon.css" %}">
             {% else  %}
                 <link rel="stylesheet"
@@ -67,27 +66,24 @@
         {% block navbar %}
             <nav role="navigation"
                  aria-label="main navigation">
-                <div>
+                <span>
                     <a href="{% url "home" %}">
                         {% if own_acct %}
-                        <img src="{{ own_acct.avatar_static }}"
+                        <img class="avatar" src="{{ own_acct.avatar_static }}"
                              alt="Brutaldon ('{{ own_acct.username }}')">
                         {% else %}
-                        <img loading="lazy" src="{% static "images/brutaldon.png" %}"
+                        <img class="avatar" loading="lazy" src="{% static "images/brutaldon.png" %}"
                             alt="Brutaldon">
                         {% endif %}
                     </a>
-                </div>
+                </span>
                 {% if request.session.active_instance and request.session.active_username %}
-                    <div>
                         <!-- navbar start, navbar end -->
-                        <div>
+                        <span>
                             <a href="{% url "home" %}">
-                                <span class="fa fa-home"></span>
                                 <span>Home</span>
                             </a>
                             <a href="{% url "note" %}">
-                                <span class="fa fa-bell"></span>
                                 {% if preferences.notifications and not preferences.theme.is_brutalist %}
                                     <span ic-src="{% url 'notes_count' %}"
                                           ic-poll="{{ preferences.poll_frequency }}s"
@@ -109,29 +105,22 @@
                                 {% endif %}
                             </a>
                             <a href="{% url "local" %}">
-                                <span class="fa fa-community"></span>
                                 <span >Local</span>
                             </a>
                             <a href="{% url "fed" %}">
-                                <span class="fa fa-globe"></span>
                                 <span >Federated</span>
                             </a>
                             <a href="{% url "toot" %}"
-                                <span class="fa fa-edit"> </span>
                                 <span >New Toot</span>
                             </a>
                             <a href="{% url "search" %}"
-                                <span class="fa fa-search"> </span>
                                 <span >Search</span>
                             </a>
-                        </div>
-                        <div>
+                        </span>
                             <a href="{% url "settings" %}">
-                                <span class="fa fa-gear"></span>
                                 <span >Settings</span>
                             </a>
                             <a href="{% url "accounts" %}">
-                                <span class="fa fa-id-card-o"> </span>
                                 <span >Accounts</span>
                             </a>
                         </div>
diff --git a/brutaldon/templates/main/post_minimal_partial.html b/brutaldon/templates/main/post_minimal_partial.html
index 69f9495..8826760 100644
--- a/brutaldon/templates/main/post_minimal_partial.html
+++ b/brutaldon/templates/main/post_minimal_partial.html
@@ -28,7 +28,7 @@
     <div>
         <div>
             <a href="{% url "user" own_acct.acct %}" >
-                <img src="{{ own_acct.avatar_static }}" alt="[{{ own_acct.acct }}]">
+                <img class="avatar" src="{{ own_acct.avatar_static }}" alt="[{{ own_acct.acct }}]">
             </a>
             <input type="submit"
                    name="toot" value="Toot">
diff --git a/brutaldon/templates/main/post_partial.html b/brutaldon/templates/main/post_partial.html
index 9518d25..bbaf168 100644
--- a/brutaldon/templates/main/post_partial.html
+++ b/brutaldon/templates/main/post_partial.html
@@ -123,7 +123,7 @@
 <div >
     <div >
         <a href="{% url "user" own_acct.acct %}"  >
-            <img src="{{ own_acct.avatar_static }}" alt="[{{ own_acct.acct }}]">
+            <img class="avatar" src="{{ own_acct.avatar_static }}" alt="[{{ own_acct.acct }}]">
         </a>
         <input type="submit"
                name="toot" value="Toot">