diff --git a/data/gresource.xml b/data/gresource.xml
index 4386d95c8..6045ee205 100644
--- a/data/gresource.xml
+++ b/data/gresource.xml
@@ -62,6 +62,7 @@
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-explore2-large-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-text-justify-left-symbolic.svg</file>
         <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-cat-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-brain-augemnted-symbolic.svg</file>
         <!-- <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-language-symbolic.svg</file> -->
 
         <file>gtk/help-overlay.ui</file>
diff --git a/data/icons/scalable/actions/tuba-brain-augemnted-symbolic.svg b/data/icons/scalable/actions/tuba-brain-augemnted-symbolic.svg
new file mode 100644
index 000000000..473fb805d
--- /dev/null
+++ b/data/icons/scalable/actions/tuba-brain-augemnted-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 5.976562 2 c 0.546876 0 1 0.453125 1 1 v 10 c 0 0.546875 -0.453124 1 -1 1 h -0.976562 c -1.652344 0 -3 -1.347656 -3 -3 v -6 c 0 -1.652344 1.347656 -3 3 -3 z m -5.976562 3 v 6 c 0 2.765625 2.234375 5 5 5 h 0.976562 c 1.660157 0 3 -1.339844 3 -3 v -10 c 0 -1.660156 -1.339843 -3 -3 -3 h -0.976562 c -2.765625 0 -5 2.234375 -5 5 z m 0 0"/><path d="m 1.488281 8.996094 h 1.511719 c 1.101562 0 1.988281 -0.886719 1.988281 -1.984375 v -0.515625 c 0 -0.273438 -0.222656 -0.5 -0.5 -0.5 c -0.273437 0 -0.5 0.226562 -0.5 0.5 v 0.515625 c 0 0.542969 -0.445312 0.984375 -0.988281 0.984375 h -1.511719 c -0.273437 0 -0.5 0.226562 -0.5 0.5 c 0 0.277344 0.226563 0.5 0.5 0.5 z m 0 0"/><path d="m 7.5 9.992188 h -1.511719 c -1.101562 0 -1.988281 0.886718 -1.988281 1.984374 v 0.515626 c 0 0.273437 0.222656 0.5 0.5 0.5 s 0.5 -0.226563 0.5 -0.5 v -0.515626 c 0 -0.539062 0.445312 -0.984374 0.988281 -0.984374 h 1.511719 c 0.277344 0 0.5 -0.226563 0.5 -0.5 c 0 -0.277344 -0.222656 -0.5 -0.5 -0.5 z m 0 0"/><path d="m 4.496094 4.980469 h 3 c 0.277344 0 0.5 -0.226563 0.5 -0.5 c 0 -0.277344 -0.222656 -0.5 -0.5 -0.5 h -3 c -0.277344 0 -0.5 0.222656 -0.5 0.5 c 0 0.273437 0.222656 0.5 0.5 0.5 z m 0 0"/><path d="m 11.015625 14 h -1.035156 c -0.546875 0 -1 -0.453125 -1 -1 v -10 c 0 -0.546875 0.453125 -1 1 -1 h 1.035156 v -2 h -1.035156 c -1.664063 0 -3 1.339844 -3 3 v 10 c 0 1.660156 1.335937 3 3 3 h 1.035156 z m 0 0"/><path d="m 10 8 l 3.5 -0.011719 v -1 l -3.5 0.011719 z m 0 0"/><path d="m 10 5 h 2.242188 l 2.148437 -2.6875 l -0.78125 -0.625 l -2 2.5 l 0.390625 -0.1875 h -2 z m 0 0"/><path d="m 10 11 h 2 l -0.390625 -0.1875 l 2 2.5 l 0.78125 -0.625 l -2.148437 -2.6875 h -2.242188 z m 0 0"/><path d="m 14.488281 1.976562 c -0.265625 0 -0.488281 -0.21875 -0.488281 -0.488281 c 0 -0.265625 0.222656 -0.488281 0.488281 -0.488281 c 0.269531 0 0.488281 0.222656 0.488281 0.488281 c 0 0.269531 -0.21875 0.488281 -0.488281 0.488281 z m 0 -1.976562 c -0.824219 0 -1.488281 0.664062 -1.488281 1.488281 s 0.664062 1.488281 1.488281 1.488281 s 1.488281 -0.664062 1.488281 -1.488281 s -0.664062 -1.488281 -1.488281 -1.488281 z m 0 0"/><path d="m 14.488281 13.976562 c -0.265625 0 -0.488281 -0.21875 -0.488281 -0.488281 c 0 -0.265625 0.222656 -0.488281 0.488281 -0.488281 c 0.269531 0 0.488281 0.222656 0.488281 0.488281 c 0 0.269531 -0.21875 0.488281 -0.488281 0.488281 z m 0 -1.976562 c -0.824219 0 -1.488281 0.664062 -1.488281 1.488281 s 0.664062 1.488281 1.488281 1.488281 s 1.488281 -0.664062 1.488281 -1.488281 s -0.664062 -1.488281 -1.488281 -1.488281 z m 0 0"/><path d="m 14.488281 7.976562 c -0.265625 0 -0.488281 -0.21875 -0.488281 -0.488281 c 0 -0.265625 0.222656 -0.488281 0.488281 -0.488281 c 0.269531 0 0.488281 0.222656 0.488281 0.488281 c 0 0.269531 -0.21875 0.488281 -0.488281 0.488281 z m 0 -1.976562 c -0.824219 0 -1.488281 0.664062 -1.488281 1.488281 s 0.664062 1.488281 1.488281 1.488281 s 1.488281 -0.664062 1.488281 -1.488281 s -0.664062 -1.488281 -1.488281 -1.488281 z m 0 0"/></svg>
diff --git a/data/style.css b/data/style.css
index ddf040168..6e1c91e0c 100644
--- a/data/style.css
+++ b/data/style.css
@@ -30,6 +30,10 @@ flowboxchild {
 	margin: 8px;
 }
 
+.cover-badge.only-icon {
+	padding: 6px;
+}
+
 .ttl-flat-button {
 	padding: 0px;
 	margin: 0px;
diff --git a/data/ui/views/profile_header.ui b/data/ui/views/profile_header.ui
index 481433a6d..565130f15 100644
--- a/data/ui/views/profile_header.ui
+++ b/data/ui/views/profile_header.ui
@@ -23,18 +23,33 @@
     <child>
       <object class="GtkOverlay">
         <child type="overlay">
-          <object class="GtkLabel" id="cover_badge"> 
-            <property name="label">Follows you</property> 
-            <property name="xalign">0</property> 
+          <object class="GtkBox" id="cover_badge_box">
             <property name="halign">end</property> 
             <property name="valign">start</property> 
-            <property name="margin-bottom">48</property> 
-            <property name="visible">0</property> 
+            <property name="margin-bottom">48</property>
+            <property name="spacing">6</property>
+            <property name="visible">0</property>
+            <child>
+              <object class="GtkImage" id="cover_bot_badge">
+                <property name="icon-name">tuba-brain-augemnted-symbolic</property>
+                <property name="tooltip-text" translatable="yes">Bot</property>
+                <property name="visible">0</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="cover_badge"> 
+                <property name="label">Follows you</property> 
+                <property name="xalign">0</property> 
+                <property name="visible">0</property> 
+              </object>
+            </child>
             <style> 
+              <class name="linked" />
               <class name="badge"/> 
               <class name="heading"/> 
               <class name="osd"/> 
-              <class name="cover-badge"/> 
+              <class name="cover-badge"/>
+              <class name="only-icon"/>
             </style> 
           </object> 
         </child>
diff --git a/src/API/Account.vala b/src/API/Account.vala
index 977dc418a..3235e9d07 100644
--- a/src/API/Account.vala
+++ b/src/API/Account.vala
@@ -22,6 +22,7 @@ public class Tuba.API.Account : Entity, Widgetizable {
 	public string header { get; set; }
 	public string avatar { get; set; }
 	public string url { get; set; }
+	public bool bot { get; set; default=false; }
 	public string created_at { get; set; }
 	public Gee.ArrayList<API.Emoji>? emojis { get; set; }
 	public int64 followers_count { get; set; }
diff --git a/src/Views/Profile.vala b/src/Views/Profile.vala
index ac229551b..27bb613b2 100644
--- a/src/Views/Profile.vala
+++ b/src/Views/Profile.vala
@@ -9,7 +9,6 @@ public class Tuba.Views.Profile : Views.Timeline {
 	public string source { get; set; default = "statuses"; }
 
 	protected Cover cover;
-	protected Label cover_badge;
 	protected MenuButton menu_button;
 
 	protected SimpleAction media_action;
@@ -23,7 +22,6 @@ public class Tuba.Views.Profile : Views.Timeline {
 
 	construct {
 		cover = build_cover ();
-		cover_badge = cover.cover_badge;
 		cover.rsbtn.rs = this.rs;
 		column_view.prepend (cover);
 	}
@@ -79,7 +77,9 @@ public class Tuba.Views.Profile : Views.Timeline {
 	protected class Cover : Box {
 
 		[GtkChild] unowned Widgets.BackgroundWrapper background;
-		[GtkChild] public unowned Label cover_badge;
+		[GtkChild] unowned Label cover_badge;
+		[GtkChild] unowned Image cover_bot_badge;
+		[GtkChild] unowned Box cover_badge_box;
 		[GtkChild] public unowned ListBox info;
 		[GtkChild] unowned Widgets.EmojiLabel display_name;
 		[GtkChild] unowned Label handle;
@@ -87,6 +87,42 @@ public class Tuba.Views.Profile : Views.Timeline {
 		[GtkChild] unowned Widgets.MarkupView note;
 		[GtkChild] public unowned Widgets.RelationshipButton rsbtn;
 
+		public string cover_badge_label {
+			get {
+				return cover_badge.label;
+			}
+
+			set {
+				var has_label = value != "";
+				cover_badge.visible = has_label;
+				cover_badge.label = value;
+
+				update_cover_badge ();
+			}
+		}
+
+		public bool is_bot {
+			get {
+				return cover_bot_badge.visible;
+			}
+
+			set {
+				cover_bot_badge.visible = value;
+
+				update_cover_badge ();
+			}
+		}
+
+		private void update_cover_badge () {
+			cover_badge_box.visible = cover_badge.visible || is_bot;
+	
+			if (is_bot && !cover_badge.visible) {
+				cover_badge_box.add_css_class ("only-icon");
+			} else {
+				cover_badge_box.remove_css_class ("only-icon");
+			}
+		}
+
 		public void bind (API.Account account) {
 			display_name.instance_emojis = account.emojis_map;
 			display_name.content = account.display_name;
@@ -94,6 +130,8 @@ public class Tuba.Views.Profile : Views.Timeline {
 			avatar.account = account;
 			note.instance_emojis = account.emojis_map;
 			note.content = account.note;
+			cover_bot_badge.visible = account.bot;
+			update_cover_badge ();
 
 			if (account.id != accounts.active.id) rsbtn.visible = true;
 
@@ -299,7 +337,6 @@ public class Tuba.Views.Profile : Views.Timeline {
 		blocking_action.change_state.connect (v => {
 			var block = v.get_boolean ();
 			var q = block ? _("Block \"%s\"?") : _("Unblock \"%s\"?");
-			warning (q);
 
 			var confirmed = app.question (
 				q.printf (profile.handle),
@@ -383,9 +420,7 @@ public class Tuba.Views.Profile : Views.Timeline {
 				label = _("Follows you");
 		}
 
-		cover_badge.label = label;
-		cover_badge.visible = label != "";
-
+		cover.cover_badge_label = label;
 		invalidate_actions (false);
 	}