diff --git a/images/octoface.png b/images/octoface.png
new file mode 100644
index 0000000..85b76c4
Binary files /dev/null and b/images/octoface.png differ
diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart
index 4569dcb..fd1a677 100644
--- a/lib/widgets/avatar.dart
+++ b/lib/widgets/avatar.dart
@@ -18,10 +18,16 @@ class Avatar extends StatelessWidget {
   Widget build(BuildContext context) {
     return Link(
       screenBuilder: (_) => UserScreen(login),
-      child: CircleAvatar(
-        backgroundColor: Colors.transparent,
-        backgroundImage: NetworkImage(url),
-        radius: size,
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(size),
+        child: FadeInImage.assetNetwork(
+          placeholder: 'images/octoface.png',
+          image: url,
+          width: 2 * size,
+          height: 2 * size,
+          fadeInDuration: Duration(milliseconds: 200),
+          fadeOutDuration: Duration(milliseconds: 100),
+        ),
       ),
       material: false,
     );