diff --git a/static/css/main.css b/static/css/main.css
index 3809622..543b884 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -29,13 +29,7 @@ article#func.article {
 	width: 100%;
 	height: 100%;
 	overflow: hidden;
-}
-
-.article a img {
-	position: relative;
-	top: -7.75em;
-	text-align: left;
-	z-index: 0;
+	background-size: 100%;
 }
 
 .article a p {
@@ -188,10 +182,6 @@ input[type] {
 		height: 7em;
 		line-height: 7em;
 	}
-
-	.article a img {
-		top: -5.45em;
-	}
 }
 
 @keyframes shake {
diff --git a/templates/home.hamlet b/templates/home.hamlet
index 343b78a..ba491c1 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -13,10 +13,12 @@ $if null beverages
 
 $forall (Entity uId user) <- users
   <article .article>
-    <a href=@{SelectR uId}>
-      <p>#{userIdent user}
-      $if userAvatar user /= Nothing
-        <img src=@{GetAvatarR $ fromJust $ userAvatar user}>
+    $if userAvatar user /= Nothing
+      <a href=@{SelectR uId} style="background-image: url(@{GetAvatarR $ fromJust $ userAvatar user})">
+        <p>#{userIdent user}
+    $else
+      <a href=@{SelectR uId}>
+        <p>#{userIdent user}
 
 <article .article #func>
   <a href=@{ReactivateR}>
diff --git a/templates/select.hamlet b/templates/select.hamlet
index 8a72546..3c79e4d 100644
--- a/templates/select.hamlet
+++ b/templates/select.hamlet
@@ -19,8 +19,9 @@ $if null beverages
 
 $forall (Entity bId bev) <- beverages
   <article .article>
-    <a href=@{BuyR uId bId}>
-      <p>
-        #{beverageIdent bev}
-        $if beverageAvatar bev /= Nothing
-          <img src=@{GetAvatarR $ fromJust $ beverageAvatar bev}>
+    $if beverageAvatar bev /= Nothing
+      <a href=@{BuyR uId bId} style="background-image: url(@{GetAvatarR $ fromJust $ beverageAvatar bev})">
+        <p>#{beverageIdent bev}
+    $else
+      <a href=@{BuyR uId bId}>
+        <p>#{beverageIdent bev}
diff --git a/templates/selectCash.hamlet b/templates/selectCash.hamlet
index 5c6a5ed..c85d63c 100644
--- a/templates/selectCash.hamlet
+++ b/templates/selectCash.hamlet
@@ -4,8 +4,9 @@ $doctype 5
 
 $forall (Entity bId bev) <- beverages
   <article .article>
-    <a href=@{BuyCashR bId}>
-      <p>
-        #{beverageIdent bev}
-        $if beverageAvatar bev /= Nothing
-          <img src=@{GetAvatarR $ fromJust $ beverageAvatar bev}>
+    $if beverageAvatar bev /= Nothing
+      <a href=@{BuyCashR bId} style="background-image: url(@{GetAvatarR $ fromJust $ beverageAvatar bev})">
+        <p>#{beverageIdent bev}
+    $else
+      <a href=@{BuyCashR bId}>
+        <p>#{beverageIdent bev}