diff --git a/data/OperatingSystemView.css b/data/OperatingSystemView.css
index 12fcc41d..2a2fa85e 100644
--- a/data/OperatingSystemView.css
+++ b/data/OperatingSystemView.css
@@ -7,13 +7,23 @@
     );
     border-radius: 100%;
     box-shadow:
-        inset 0 -2px 0 0 alpha(@highlight_color, 0.2),
-        inset 0 2px 0 0 alpha(@highlight_color, 0.3),
-        inset 2px 0 0 0 alpha(@highlight_color, 0.07),
-        inset -2px 0 0 0 alpha(@highlight_color, 0.07),
-        inset 0 0 0 1px alpha(black, 0.7);
+        inset 0 -1px 0 0 alpha(@highlight_color, 0.2),
+        inset 0 1px 0 0 alpha(@highlight_color, 0.3),
+        inset 1px 0 0 0 alpha(@highlight_color, 0.07),
+        inset -1px 0 0 0 alpha(@highlight_color, 0.07);
     -gtk-icon-shadow:
         0 1px 1px alpha(black, 0.3),
         0 2px 3px alpha(@accent_color_900, 0.2);
     -gtk-icon-style: symbolic;
 }
+
+picture {
+    background: #333;
+    box-shadow:
+        0 0 0 1px alpha(black, 0.7),
+        0 1px 3px alpha(black, 0.12),
+        0 1px 2px alpha(black, 0.24);
+    border-radius: 100%;
+    min-height: 128px;
+    min-width: 128px;
+}
diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala
index 2c3e132f..fb559eec 100644
--- a/src/Views/OperatingSystemView.vala
+++ b/src/Views/OperatingSystemView.vala
@@ -23,7 +23,7 @@ public class About.OperatingSystemView : Gtk.Box {
 
     private string support_url;
     private File? logo_file;
-    private Adw.Avatar? logo;
+    private Gtk.Picture? logo;
     private Gtk.StringList packages;
     private SystemUpdate? update_proxy = null;
     private SystemUpdate.CurrentState? current_state = null;
@@ -55,6 +55,7 @@ public class About.OperatingSystemView : Gtk.Box {
         };
 
         var logo_overlay = new Gtk.Overlay () {
+            halign = END,
             valign = START
         };
 
@@ -66,12 +67,17 @@ public class About.OperatingSystemView : Gtk.Box {
 
                 if (file.query_exists ()) {
                     logo_file = file;
-                    logo = new Adw.Avatar (128, "", false) {
-                        custom_image = Gdk.Paintable.empty (128, 128)
+                    logo = new Gtk.Picture () {
+                        content_fit = COVER
                     };
                     logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-                    logo_overlay.child = logo;
+                    var clamp = new Adw.Clamp () {
+                        child = logo,
+                        maximum_size = 128
+                    };
+
+                    logo_overlay.child = clamp;
                     logo_overlay.add_overlay (icon);
 
                     // 128 minus 3px padding on each side
@@ -326,8 +332,7 @@ public class About.OperatingSystemView : Gtk.Box {
         }
 
         try {
-            var bytes = yield logo_file.load_bytes_async (null, null);
-            logo.custom_image = Gdk.Texture.from_bytes (bytes);
+            logo.file = logo_file;
             logo_file = null;
         } catch (Error e) {
             warning ("Failed to load logo file: %s", e.message);