diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
index 077da70..845d3ff 100644
--- a/app/assets/stylesheets/style.css.scss
+++ b/app/assets/stylesheets/style.css.scss
@@ -556,6 +556,9 @@ tr.spacer {
       border: 1px solid;
       border-radius: 3px;
       color: #222;
+      display: inline-block;
+      height: 66px; // 64px + 1px border on each side
+      width: 66px;
       &:hover {
         color: #ab0000;
       }
diff --git a/app/models/user.rb b/app/models/user.rb
index 4bd17d3..cde92ae 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
   include UsersHelper
+  include ActionView::Helpers
   include Rails.application.routes.url_helpers
 
   belongs_to :role
@@ -67,9 +68,11 @@ class User < ActiveRecord::Base
     !!(self.role >= :superadmin)
   end
 
-
-  def avatar_url(size)
-    return "https://minotar.net/helm/#{CGI.escape(self.ign)}/#{CGI.escape(size.to_s)}"
+  def avatar(size, options = {})
+    options[:class] ||= "avatar"
+    options[:size]  ||= size.to_s
+    options[:alt]   ||= "avatar"
+    return image_tag("https://minotar.net/helm/#{CGI.escape(self.ign)}/#{CGI.escape(size.to_s)}", options)
   end
 
 
diff --git a/app/views/blogposts/index.html.erb b/app/views/blogposts/index.html.erb
index b82e800..d918f02 100644
--- a/app/views/blogposts/index.html.erb
+++ b/app/views/blogposts/index.html.erb
@@ -4,7 +4,7 @@
   <% @posts.each do |p| %>
     <div class="item-group with-avatar" id="post-<%= p.id %>">
       <div class="header">
-        <%= link_to(image_tag(p.author.avatar_url(64), class: "avatar"), p.author, title: p.author.ign) %>
+        <%= link_to(p.author.avatar(64), p.author, title: p.author.ign) %>
         <%= render partial: "users/username", locals: { user: p.author } %> <time><%= link_to p.created_at.strftime("%e. %b %Y, %H:%M"), p %></time>
         <span class="comment-counter">
           <%= link_to pluralize(p.comments.count, "Comment"), p %>
diff --git a/app/views/blogposts/show.html.erb b/app/views/blogposts/show.html.erb
index 81f799e..1cd2be5 100644
--- a/app/views/blogposts/show.html.erb
+++ b/app/views/blogposts/show.html.erb
@@ -1,7 +1,7 @@
 <%= link_to "News", blogposts_path %> → <%= link_to @post.title %>
 <div class="item-group post with-avatar" id="post-<%= @post.id %>">
   <div class="header">
-    <%= link_to(image_tag(@post.author.avatar_url(64), class: "avatar"), @post.author, title: @post.author.ign) %>
+    <%= link_to(@post.author.avatar(64), @post.author, title: @post.author.ign) %>
     <%= render partial: "users/username", locals: { user: @post.author } %> <time><%= link_to @post.created_at.strftime("%e. %b %Y, %H:%M"), p %></time>
     <%= link_to "edit", edit_blogpost_path(@post.id), class: "editlink" if mod? %>
     <div class="clear-right"></div>
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 0319d8e..f969d60 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -1,6 +1,6 @@
 <div class="item-group with-avatar comment" id="comment-<%= c.id %>">
   <div class="header <%= "op" if c.author.is?(c.blogpost.author) %>">
-    <%= link_to(image_tag(c.author.avatar_url(64), class: "avatar"), c.author, title: c.author.ign) %>
+    <%= link_to(c.author.avatar(64), c.author, title: c.author.ign) %>
     <%= render partial: "users/username", locals: { user: c.author } %>
     <time><%= link_to c.created_at.strftime("%e. %b %Y, %H:%M"), "#comment-#{c.id}" %></time>
 
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index e2b0773..ec97aaf 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -8,7 +8,7 @@
   <% @threads.each do |thread| %>
     <div class="item-group with-avatar" id="thread-<%= thread.id %>">
       <div class="header">
-        <%= link_to(image_tag(thread.author.avatar_url(64), class: "avatar"), thread.author, title: thread.author.ign) %>
+        <%= link_to(thread.author.avatar(64), thread.author, title: thread.author.ign) %>
         <%= render partial: "users/username", locals: { user: thread.author } %> <time><%= link_to thread.created_at.strftime("%e. %b %Y, %H:%M"), thread %></time>
         <span class="comment-counter">
           <%= link_to pluralize(thread.replies.count, "Reply"), thread %>
diff --git a/app/views/forumthreads/show.html.erb b/app/views/forumthreads/show.html.erb
index c34090f..e44fa0f 100644
--- a/app/views/forumthreads/show.html.erb
+++ b/app/views/forumthreads/show.html.erb
@@ -1,7 +1,7 @@
 <%= link_to @thread.forum.group, forumgroup_path(@thread.forum.group) %> → <%= link_to @thread.forum, @thread.forum %> → <%= link_to @thread %>
 <div class="item-group thread with-avatar" id="thread-<%= @thread.id %>">
   <div class="header">
-    <%= link_to(image_tag(@thread.author.avatar_url(64), class: "avatar"), @thread.author, title: @thread.author.ign) %>
+    <%= link_to(@thread.author.avatar(64), @thread.author, title: @thread.author.ign) %>
     <%= render partial: "users/username", locals: { user: @thread.author } %> <time><%= link_to @thread.created_at.strftime("%e. %b %Y, %H:%M"), p %></time>
     <%= link_to "edit", edit_forumthread_path( @thread), class: "editlink" if (@thread.author.is?(current_user) || mod?) %>
     <div class="clear-right"></div>
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 124861e..62922d5 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -17,7 +17,7 @@
           <%= link_to current_user.name, current_user %><br/>
           <%= link_to "Logout", logout_path %>
         </span>
-        <%= link_to image_tag(current_user.avatar_url(32), :class => "avatar"), current_user %>
+        <%= link_to current_user.avatar(32), current_user %>
       <% else %>
         <%= link_to "Log in", login_path(return_path: request.env['PATH_INFO']), action: "new" %> | <%= link_to "Sign up", signup_path %>
       <% end %>
diff --git a/app/views/threadreplies/_reply.html.erb b/app/views/threadreplies/_reply.html.erb
index 00f3839..5f7d3ff 100644
--- a/app/views/threadreplies/_reply.html.erb
+++ b/app/views/threadreplies/_reply.html.erb
@@ -1,6 +1,6 @@
 <div class="item-group thread-reply with-avatar" id="reply-<%= reply.id %>">
   <div class="header">
-    <%= link_to(image_tag(reply.author.avatar_url(64), class: "avatar"), reply.author, title: reply.author.ign) %>
+    <%= link_to(reply.author.avatar(64), reply.author, title: reply.author.ign) %>
     <%= render partial: "users/username", locals: { user: reply.author } %>
     <time><%= link_to reply.created_at.strftime("%e. %b %Y, %H:%M"), "#reply-#{reply.id}" %></time>
 
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index ec662b4..74baa64 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -7,7 +7,7 @@
 <div id="userlist">
   <% @users.each do |u| %>
     <div class="list-user">
-      <%= link_to(image_tag(u.avatar_url(64)), u) %>
+      <%= link_to(u.avatar(64), u) %>
       <div class="detail">
         <%= render partial: "users/username", locals: { user: u } %><br>
         <i><%= u.ign %></i>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 79be9df..02b245a 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,7 +32,7 @@
   <% end %>
 
 
-  <%= image_tag @user.avatar_url(128), :class => "user-avatar avatar", :alt => "avatar" %>
+  <%= @user.avatar(128, class: "user-avatar avatar") %>
   <%= render partial: "users/username", locals: {user: @user} %>
   <table>
     <tbody>