diff --git a/data/style.css b/data/style.css
index 7c0a35c64..444c132d5 100644
--- a/data/style.css
+++ b/data/style.css
@@ -610,3 +610,38 @@ video > overlay > revealer > controls {
 .preview_card:not(.explore):active {
 	background-color: alpha(currentColor, 0.1625);
 }
+
+GtkSourceAssistant {
+	background: @popover_bg_color;
+	padding: 8px;
+	/* border-radius of child + padding */
+	border-radius: 14px;
+
+}
+
+GtkSourceAssistant scrolledwindow undershoot {
+	background-image: none;
+	box-shadow: none;
+}
+
+GtkSourceAssistant scrolledwindow .cell.icon {
+	padding-left: 0;
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+GtkSourceAssistant row {
+	border-radius: 6px;
+	margin: 6px 0;
+	padding: 6px;
+}
+
+GtkSourceAssistant row:selected {
+	background: alpha(@accent_bg_color, .33);
+	color: currentColor;
+}
+
+GtkSourceAssistant row:first-child,
+GtkSourceAssistant row:last-child {
+	margin: 0;
+}
diff --git a/src/Dialogs/Composer/Completion/EmojiProvider.vala b/src/Dialogs/Composer/Completion/EmojiProvider.vala
index cbae7efe8..9d3b4c397 100644
--- a/src/Dialogs/Composer/Completion/EmojiProvider.vala
+++ b/src/Dialogs/Composer/Completion/EmojiProvider.vala
@@ -45,7 +45,9 @@ public class Tuba.EmojiProvider: Tuba.CompletionProvider {
 
 		switch (cell.get_column ()) {
 			case GtkSource.CompletionColumn.ICON:
-				var image = new Gtk.Image ();
+				var image = new Gtk.Image () {
+					pixel_size = 36
+				};
 				Tuba.Helper.Image.request_paintable (emoji.url, null, (paintable) => {
 					image.paintable = paintable;
 				});
diff --git a/src/Dialogs/Composer/Completion/HandleProvider.vala b/src/Dialogs/Composer/Completion/HandleProvider.vala
index 38430f2d0..5c2f4ca04 100644
--- a/src/Dialogs/Composer/Completion/HandleProvider.vala
+++ b/src/Dialogs/Composer/Completion/HandleProvider.vala
@@ -45,7 +45,7 @@ public class Tuba.HandleProvider: Tuba.CompletionProvider {
 
 		switch (cell.get_column ()) {
 			case GtkSource.CompletionColumn.ICON:
-				var avatar = new Adw.Avatar (32, null, true);
+				var avatar = new Adw.Avatar (36, null, true);
 				avatar.name = account.display_name;
 				Tuba.Helper.Image.request_paintable (account.avatar, null, (paintable) => {
 					avatar.custom_image = paintable;
diff --git a/src/Dialogs/Composer/Completion/HashtagProvider.vala b/src/Dialogs/Composer/Completion/HashtagProvider.vala
index de798d23e..bd05b6599 100644
--- a/src/Dialogs/Composer/Completion/HashtagProvider.vala
+++ b/src/Dialogs/Composer/Completion/HashtagProvider.vala
@@ -44,7 +44,9 @@ public class Tuba.HashtagProvider: Tuba.CompletionProvider {
 
 		switch (cell.get_column ()) {
 			case GtkSource.CompletionColumn.ICON:
-				cell.set_icon_name ("tuba-hashtag-symbolic");
+				cell.set_widget (new Gtk.Image.from_icon_name ("tuba-hashtag-symbolic") {
+					pixel_size = 24
+				});
 				break;
 			case GtkSource.CompletionColumn.TYPED_TEXT:
 				cell.set_markup (@"<b>$(tag.name)</b>\n<span alpha='50%'>$(tag.weekly_use ())</span>");