diff --git a/views/headers/site_wide.ejs b/views/headers/site_wide.ejs
index 9b6c210..e1f0a1e 100644
--- a/views/headers/site_wide.ejs
+++ b/views/headers/site_wide.ejs
@@ -1,11 +1,14 @@
 <a id='home-page-link' href="/"><%= locale.home_page %></a>
 /
 <% if (config.rss == true) { %>
-    <a id='global-rss-link' href="/rss"><%= locale.rss_feed %></a>
+    <a id='rss-link' href="/rss">
+			<img class='icon' src='/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'>
+    </a>
 <% } %>
-/
 <% if (config.atom == true) { %>
-    <a id='global-atom-link' href="/atom"><%= locale.atom_feed %></a>
+    <a id='atom-link' href="/atom">
+			<img class='icon' src='/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'>
+    </a>
 <% } %>
 /
 <a id='new-post-link' href="<%= config.new_post_url %>"><%= locale.new_post %></a>
diff --git a/views/headers/user.ejs b/views/headers/user.ejs
index ecd2725..8234ea8 100644
--- a/views/headers/user.ejs
+++ b/views/headers/user.ejs
@@ -4,7 +4,13 @@
 	</h1>
 </div>
 <p><%- func.render_md(user.description) %></p>
-<a id='edit-account-link' href="<%= config.edit_account_base_url %>/<%= userID %>"><%= locale.edit_account %></a><br/>
-<a id='rss-link' href="/user/<%= user.username %>/rss"><%= locale.rss_feed %></a><br/>
-<a id='atom-link' href="/user/<%= user.username %>/atom"><%= locale.atom_feed %></a>
+<a if='edit-account-link' href="<%= config.edit_account_base_url %>/<%= userID %>">
+            <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'>
+</a>
+<a id='rss-link' href="/user/<%= user.username %>/rss">
+			<img class='icon' src='/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'>
+</a>
+<a id='atom-link' href="/user/<%= user.username %>/atom">
+			<img class='icon' src='/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'>
+</a>
 <%- config.seperator %>
diff --git a/views/posts/post.ejs b/views/posts/post.ejs
index 9d7e3a4..f906c33 100644
--- a/views/posts/post.ejs
+++ b/views/posts/post.ejs
@@ -26,7 +26,7 @@
     </div>
     <div id="post-edit">
         <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
-            <img src='/icons/edit.png'>
+            <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
         </a><br/>
     </div>
     <% if (config.enable_hitcount == true) { %>
diff --git a/views/posts/tag.ejs b/views/posts/tag.ejs
index 33939c1..2370aa7 100644
--- a/views/posts/tag.ejs
+++ b/views/posts/tag.ejs
@@ -24,7 +24,7 @@
     <br/>
     <div id="post-edit">
         <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
-            <img src='/icons/edit.png'>
+            <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
         </a><br/>
     </div>
 </div>
diff --git a/views/posts/timeline.ejs b/views/posts/timeline.ejs
index 33939c1..2370aa7 100644
--- a/views/posts/timeline.ejs
+++ b/views/posts/timeline.ejs
@@ -24,7 +24,7 @@
     <br/>
     <div id="post-edit">
         <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
-            <img src='/icons/edit.png'>
+            <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
         </a><br/>
     </div>
 </div>
diff --git a/views/posts/user.ejs b/views/posts/user.ejs
index 33939c1..2370aa7 100644
--- a/views/posts/user.ejs
+++ b/views/posts/user.ejs
@@ -24,7 +24,7 @@
     <br/>
     <div id="post-edit">
         <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
-            <img src='/icons/edit.png'>
+            <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
         </a><br/>
     </div>
 </div>
diff --git a/webroot/default.css b/webroot/default.css
index 6542433..ec8a5c8 100644
--- a/webroot/default.css
+++ b/webroot/default.css
@@ -5,7 +5,7 @@ body {
 #header {
     text-align: center;
 }
-#post-edit img {
+.icon {
 	width: 20px;
 }
 input, textarea, button {
diff --git a/webroot/icons/atom.png b/webroot/icons/atom.png
new file mode 100644
index 0000000..3af0d38
Binary files /dev/null and b/webroot/icons/atom.png differ
diff --git a/webroot/icons/rss.png b/webroot/icons/rss.png
new file mode 100644
index 0000000..0cfe6f4
Binary files /dev/null and b/webroot/icons/rss.png differ