diff --git a/static/css/main.css b/static/css/main.css
index 6eba2ef..037d591 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -42,6 +42,10 @@ article#func.article {
 	z-index: 1;
 }
 
+.article .avatar p {
+	text-shadow: -1px 0 1px white, 0 1px 1px white, 1px 0 1px white, 0 -1px 1px white;
+}
+
 img.flag {
 	height: 2em;
 }
diff --git a/templates/avatars.hamlet b/templates/avatars.hamlet
index 3fd2a3d..09e7d88 100644
--- a/templates/avatars.hamlet
+++ b/templates/avatars.hamlet
@@ -9,7 +9,7 @@ $if null avatars
 $else
   $forall (Entity aId avatar) <- avatars
     <article .article>
-      <a href=@{ModifyAvatarR aId} style="background-image: url(@{GetAvatarR aId})">
+      <a href=@{ModifyAvatarR aId} style="background-image: url(@{GetAvatarR aId})" .avatar>
         <p>#{avatarIdent avatar}
 
 <ul>
diff --git a/templates/home.hamlet b/templates/home.hamlet
index ba491c1..621dc28 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -14,7 +14,7 @@ $if null beverages
 $forall (Entity uId user) <- users
   <article .article>
     $if userAvatar user /= Nothing
-      <a href=@{SelectR uId} style="background-image: url(@{GetAvatarR $ fromJust $ userAvatar user})">
+      <a href=@{SelectR uId} style="background-image: url(@{GetAvatarR $ fromJust $ userAvatar user})" .avatar>
         <p>#{userIdent user}
     $else
       <a href=@{SelectR uId}>
diff --git a/templates/select.hamlet b/templates/select.hamlet
index 3c79e4d..2ffdf8a 100644
--- a/templates/select.hamlet
+++ b/templates/select.hamlet
@@ -20,7 +20,7 @@ $if null beverages
 $forall (Entity bId bev) <- beverages
   <article .article>
     $if beverageAvatar bev /= Nothing
-      <a href=@{BuyR uId bId} style="background-image: url(@{GetAvatarR $ fromJust $ beverageAvatar bev})">
+      <a href=@{BuyR uId bId} style="background-image: url(@{GetAvatarR $ fromJust $ beverageAvatar bev})" .avatar>
         <p>#{beverageIdent bev}
     $else
       <a href=@{BuyR uId bId}>
diff --git a/templates/selectCash.hamlet b/templates/selectCash.hamlet
index c85d63c..5c3b061 100644
--- a/templates/selectCash.hamlet
+++ b/templates/selectCash.hamlet
@@ -5,7 +5,7 @@ $doctype 5
 $forall (Entity bId bev) <- beverages
   <article .article>
     $if beverageAvatar bev /= Nothing
-      <a href=@{BuyCashR bId} style="background-image: url(@{GetAvatarR $ fromJust $ beverageAvatar bev})">
+      <a href=@{BuyCashR bId} style="background-image: url(@{GetAvatarR $ fromJust $ beverageAvatar bev})" .avatar>
         <p>#{beverageIdent bev}
     $else
       <a href=@{BuyCashR bId}>