diff --git a/data/ui/views/base.ui b/data/ui/views/base.ui
index cd13f2a2..b8edc638 100644
--- a/data/ui/views/base.ui
+++ b/data/ui/views/base.ui
@@ -123,7 +123,7 @@
                                           <object class="GtkStackPage">
                                             <property name="name">spinner</property>
                                             <property name="child">
-                                              <object class="GtkSpinner" id="status_spinner">
+                                              <object class="AdwSpinner" id="status_spinner">
                                                 <property name="height_request">32</property>
                                                 <property name="valign">center</property>
                                               </object>
diff --git a/src/Dialogs/Composer/AttachmentsPage.vala b/src/Dialogs/Composer/AttachmentsPage.vala
index ec0ba483..e6610fe9 100644
--- a/src/Dialogs/Composer/AttachmentsPage.vala
+++ b/src/Dialogs/Composer/AttachmentsPage.vala
@@ -30,7 +30,7 @@ public class Tuba.AttachmentsPage : ComposerPage {
 		"video/x-ms-asf"
 	};
 
-	private Gtk.Spinner spinner;
+	private Adw.Spinner spinner;
 	public GLib.ListStore attachments;
 	public Adw.ToastOverlay toast_overlay;
 	public bool media_sensitive { get; set; default = false; }
@@ -267,8 +267,7 @@ public class Tuba.AttachmentsPage : ComposerPage {
 		stack.add_named (list, "list");
 		stack.add_named (empty_state, "empty");
 
-		spinner = new Gtk.Spinner () {
-			spinning = false,
+		spinner = new Adw.Spinner () {
 			halign = Gtk.Align.CENTER,
 			valign = Gtk.Align.CENTER,
 			vexpand = true,
@@ -336,7 +335,6 @@ public class Tuba.AttachmentsPage : ComposerPage {
 		var is_empty = attachments_size < 1;
 		if (is_empty || uploading) {
 			stack.visible_child_name = uploading ? "spinner" : "empty";
-			spinner.spinning = uploading;
 			bottom_bar.hide ();
 			can_publish = false;
 		} else {
diff --git a/src/Dialogs/Report.vala b/src/Dialogs/Report.vala
index eafc3c21..01ca2113 100644
--- a/src/Dialogs/Report.vala
+++ b/src/Dialogs/Report.vala
@@ -229,8 +229,7 @@ public class Tuba.Dialogs.Report : Adw.Dialog {
 			hexpand = true,
 			valign = Gtk.Align.CENTER
 		};
-		page_3_stack.add_named (new Gtk.Spinner () {
-			spinning = true,
+		page_3_stack.add_named (new Adw.Spinner () {
 			halign = Gtk.Align.CENTER,
 			valign = Gtk.Align.CENTER,
 			vexpand = true,
diff --git a/src/Views/Admin/Pages/Base.vala b/src/Views/Admin/Pages/Base.vala
index 426a98f1..3c5d6d20 100644
--- a/src/Views/Admin/Pages/Base.vala
+++ b/src/Views/Admin/Pages/Base.vala
@@ -1,7 +1,7 @@
 public class Tuba.Views.Admin.Page.Base : Adw.NavigationPage {
 	protected Gtk.Widget page { get; set; }
 	private Gtk.ScrolledWindow scroller;
-	private Gtk.Spinner spinner;
+	private Adw.Spinner spinner;
 	private Adw.ToastOverlay toast_overlay;
 	protected Adw.HeaderBar headerbar;
 	protected Adw.ToolbarView toolbar_view;
@@ -29,11 +29,10 @@ public class Tuba.Views.Admin.Page.Base : Adw.NavigationPage {
 
 	construct {
 		headerbar = new Adw.HeaderBar ();
-		spinner = new Gtk.Spinner () {
+		spinner = new Adw.Spinner () {
 			valign = Gtk.Align.CENTER,
 			hexpand = true,
 			vexpand = true,
-			spinning = true,
 			height_request = 32
 		};
 
diff --git a/src/Views/Base.vala b/src/Views/Base.vala
index 15a905e2..d5ab4e49 100644
--- a/src/Views/Base.vala
+++ b/src/Views/Base.vala
@@ -65,7 +65,6 @@ public class Tuba.Views.Base : Adw.BreakpointBin {
 	[GtkChild] unowned Gtk.Stack status_stack;
 	[GtkChild] unowned Gtk.Label status_title_label;
 	[GtkChild] unowned Gtk.Label status_message_label;
-	[GtkChild] unowned Gtk.Spinner status_spinner;
 
 	public class StatusMessage : Object {
 		public string? title = null;
@@ -87,16 +86,13 @@ public class Tuba.Views.Base : Adw.BreakpointBin {
 
 			if (value == null) {
 				states.visible_child_name = "content";
-				status_spinner.spinning = false;
 			} else {
 				states.visible_child_name = "status";
 				if (value.loading) {
 					status_stack.visible_child_name = "spinner";
-					status_spinner.spinning = true;
 					this.update_state (Gtk.AccessibleState.BUSY, true, -1);
 				} else {
 					status_stack.visible_child_name = "message";
-					status_spinner.spinning = false;
 
 					if (value.title == null) {
 						status_title_label.label = empty_state_title;
diff --git a/src/Views/MediaViewer.vala b/src/Views/MediaViewer.vala
index 3bbe1c1e..2c6401d6 100644
--- a/src/Views/MediaViewer.vala
+++ b/src/Views/MediaViewer.vala
@@ -70,7 +70,7 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
 	public class Item : Adw.Bin {
 		private Gtk.Stack stack;
 		private Gtk.Overlay overlay;
-		private Gtk.Spinner spinner;
+		private Adw.Spinner spinner;
 		private Gtk.ScrolledWindow scroller;
 		public signal void zoom_changed ();
 
@@ -212,8 +212,7 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
 				vexpand = true,
 				hexpand = true
 			};
-			spinner = new Gtk.Spinner () {
-				spinning = true,
+			spinner = new Adw.Spinner () {
 				halign = Gtk.Align.CENTER,
 				valign = Gtk.Align.CENTER,
 				vexpand = true,
@@ -284,7 +283,6 @@ public class Tuba.Views.MediaViewer : Gtk.Widget, Gtk.Buildable, Adw.Swipeable {
 		public void done () {
 			if (is_done) return;
 
-			spinner.spinning = false;
 			stack.visible_child_name = "child";
 
 			if (is_video) {
diff --git a/src/Views/Profile.vala b/src/Views/Profile.vala
index a5a16a39..2bf46f6f 100644
--- a/src/Views/Profile.vala
+++ b/src/Views/Profile.vala
@@ -367,8 +367,7 @@ public class Tuba.Views.Profile : Views.Accounts {
 	}
 
 	public Adw.Dialog create_ar_list_dialog () {
-		var spinner = new Gtk.Spinner () {
-			spinning = true,
+		var spinner = new Adw.Spinner () {
 			halign = Gtk.Align.CENTER,
 			valign = Gtk.Align.CENTER,
 			vexpand = true,
@@ -393,7 +392,6 @@ public class Tuba.Views.Profile : Views.Accounts {
 			content_width = 600,
 			content_height = 550
 		};
-		spinner.start ();
 
 		var preferences_page = new Adw.PreferencesPage ();
 		var preferences_group = new Adw.PreferencesGroup () {
diff --git a/src/Views/Timeline.vala b/src/Views/Timeline.vala
index f688b96f..c165867b 100644
--- a/src/Views/Timeline.vala
+++ b/src/Views/Timeline.vala
@@ -17,7 +17,7 @@ public class Tuba.Views.Timeline : AccountHolder, Streamable, Views.ContentBase
 		protected int entity_queue_size { get; set; default=0; }
 	#endif
 
-	private Gtk.Spinner pull_to_refresh_spinner;
+	private Adw.Spinner pull_to_refresh_spinner;
 	private bool _is_pulling = false;
 	private bool is_pulling {
 		get {
@@ -26,11 +26,9 @@ public class Tuba.Views.Timeline : AccountHolder, Streamable, Views.ContentBase
 		set {
 			if (_is_pulling != value) {
 				if (value) {
-					pull_to_refresh_spinner.spinning = true;
 					scrolled_overlay.add_overlay (pull_to_refresh_spinner);
 					scrolled.sensitive = false;
 				} else {
-					pull_to_refresh_spinner.spinning = false;
 					scrolled_overlay.remove_overlay (pull_to_refresh_spinner);
 					scrolled.sensitive = true;
 					pull_to_refresh_spinner.margin_top = 32;
@@ -74,7 +72,7 @@ public class Tuba.Views.Timeline : AccountHolder, Streamable, Views.ContentBase
 	construct {
 		empty_state_title = _("No Posts");
 
-		pull_to_refresh_spinner = new Gtk.Spinner () {
+		pull_to_refresh_spinner = new Adw.Spinner () {
 			height_request = 32,
 			width_request = 32,
 			margin_top = 32,