diff --git a/src/prefs_impl.nim b/src/prefs_impl.nim
index 8435af4..0223c82 100644
--- a/src/prefs_impl.nim
+++ b/src/prefs_impl.nim
@@ -75,6 +75,9 @@ genPrefs:
     hideReplies(checkbox, false):
       "Hide tweet replies"
 
+    squareAvatars(checkbox, false):
+      "Square profile pictures"
+
   Media:
     mp4Playback(checkbox, true):
       "Enable mp4 video playback (only for gifs)"
diff --git a/src/sass/tweet/_base.scss b/src/sass/tweet/_base.scss
index f7087b7..80a1171 100644
--- a/src/sass/tweet/_base.scss
+++ b/src/sass/tweet/_base.scss
@@ -98,14 +98,16 @@
 }
 
 .avatar {
-    border-radius: 50%;
-}
-
-.avatar.mini {
-    margin-right: 5px;
-    margin-top: -1px;
-    width: 20px;
-    height: 20px;
+    &.round {
+        border-radius: 50%;
+    }
+    
+    &.mini {
+        margin-right: 5px;
+        margin-top: -1px;
+        width: 20px;
+        height: 20px;
+    }
 }
 
 .attribution {
diff --git a/src/views/tweet.nim b/src/views/tweet.nim
index cede58c..dcf8b75 100644
--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -31,7 +31,9 @@ proc renderHeader(tweet: Tweet; retweet: string; prefs: Prefs): VNode =
         var size = "_bigger"
         if not prefs.autoplayGifs and tweet.profile.userPic.endsWith("gif"):
           size = "_400x400"
-        genImg(tweet.profile.getUserPic(size), class="avatar")
+
+        let round = if prefs.squareAvatars: "" else: " round"        
+        genImg(tweet.profile.getUserPic(size), class=(&"avatar{round}"))
 
       tdiv(class="tweet-name-row"):
         tdiv(class="fullname-and-username"):