diff --git a/config/_default/params.toml b/config/_default/params.toml
index d7ea602..71e0362 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -139,9 +139,6 @@ address_format = "en-us"
 ## Advanced
 ############################
 
-# Get user avatars from Gravatar.com? (true/false)
-gravatar = false
-
 # Main menu alignment (l = left, c = center, r = right) and logo options.
 main_menu = {align = "l", show_logo = true}
 
@@ -162,6 +159,16 @@ link_authors = true
 #   E.g. To load `/assets/js/custom.js`, set `plugins_js = ["custom"]`.
 plugins_js  = []
 
+# Avatars.
+# An avatar is an image that appears next to a user's name.
+# An avatar can be uploaded as an image named `avatar` to each user's profile or fetched from Gravatar.com.
+[avatar]
+  # Get user avatars from Gravatar.com? (true/false)
+  gravatar = false
+
+  # Choose a shape for avatar images. Options: circle, square.
+  shape = "circle"
+
 # Available address formats.
 [address_formats]
   en-us = {order = ['street', 'city', 'region', 'postcode'], delimiters = [', ', ', ', ' ', '']}
diff --git a/themes/academic b/themes/academic
index d995e4d..7c87076 160000
--- a/themes/academic
+++ b/themes/academic
@@ -1 +1 @@
-Subproject commit d995e4d14d4457166944ac645b2106e8ba8da431
+Subproject commit 7c87076824766bb450c1aa3ca99ed933ba4f6d47