diff --git a/data/ui/views/sidebar/view.ui b/data/ui/views/sidebar/view.ui
index c6ae34f70..1d3e14133 100644
--- a/data/ui/views/sidebar/view.ui
+++ b/data/ui/views/sidebar/view.ui
@@ -9,19 +9,27 @@
         <child type="top">
           <object class="AdwHeaderBar">
             <child type="start">
+              <object class="GtkToggleButton" id="accounts_button">
+                <signal name="toggled" handler="on_mode_changed"/>
+                <property name="tooltip_text" translatable="yes">Switch Account</property>
+                <child>
+                  <object class="TubaWidgetsAvatar" id="accounts_button_avi">
+                    <property name="size">26</property>
+                  </object>
+                </child>
+                <style>
+                  <class name="flat"/>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
+            <child type="end">
               <object class="GtkButton" id="compose_button">
                 <property name="icon-name">document-edit-symbolic</property>
                 <property name="action-name">app.compose</property>
                 <property name="tooltip_text" translatable="yes">Compose</property>
               </object>
             </child>
-            <child type="end">
-              <object class="GtkToggleButton" id="accounts_button">
-                <property name="icon-name">tuba-people-symbolic</property>
-                <signal name="toggled" handler="on_mode_changed"/>
-                <property name="tooltip_text" translatable="yes">Switch Account</property>
-              </object>
-            </child>
           </object>
         </child>
 
@@ -140,4 +148,3 @@
 
   </template>
 </interface>
-
diff --git a/src/Views/Sidebar.vala b/src/Views/Sidebar.vala
index 8a3ecf061..fab546b81 100644
--- a/src/Views/Sidebar.vala
+++ b/src/Views/Sidebar.vala
@@ -5,6 +5,7 @@ public class Tuba.Views.Sidebar : Gtk.Widget, AccountHolder {
 	[GtkChild] unowned Gtk.Stack mode;
 	[GtkChild] unowned Gtk.ListBox items;
 	[GtkChild] unowned Gtk.ListBox saved_accounts;
+	[GtkChild] unowned Widgets.Avatar accounts_button_avi;
 
 	[GtkChild] unowned Widgets.Avatar avatar;
 	[GtkChild] unowned Widgets.EmojiLabel title;
@@ -95,6 +96,7 @@ public class Tuba.Views.Sidebar : Gtk.Widget, AccountHolder {
 	private Binding sidebar_handle_short;
 	private Binding sidebar_avatar;
 	private Binding sidebar_display_name;
+	private Binding sidebar_avatar_btn;
 	protected virtual void on_account_changed (InstanceAccount? account) {
 		if (this.account != null) {
 			sidebar_handle_short.unbind ();
@@ -111,6 +113,7 @@ public class Tuba.Views.Sidebar : Gtk.Widget, AccountHolder {
 		if (account != null) {
 			sidebar_handle_short = this.account.bind_property ("handle_short", subtitle, "label", BindingFlags.SYNC_CREATE);
 			sidebar_avatar = this.account.bind_property ("avatar", avatar, "avatar-url", BindingFlags.SYNC_CREATE);
+			sidebar_avatar_btn = this.account.bind_property ("avatar", accounts_button_avi, "avatar-url", BindingFlags.SYNC_CREATE);
 			sidebar_display_name = this.account.bind_property (
 				"display-name",
 				title,
@@ -131,6 +134,7 @@ public class Tuba.Views.Sidebar : Gtk.Widget, AccountHolder {
 			subtitle.label = _("No account selected");
 			avatar.account = null;
 			account_items.model = null;
+			accounts_button_avi.account = null;
 		}
 	}