diff --git a/static/main.css b/static/main.css
index 0795331..ad03792 100644
--- a/static/main.css
+++ b/static/main.css
@@ -90,24 +90,19 @@
 	display: inline-block;
 	text-decoration: none;
 	color: #333333;
-	vertical-align: middle;
 }
 
 .status-action a:hover,
 .status-action a:hover i {
-	color: #777777;
+	opacity: 0.8;
 }
 
 .status-action a.status-time {
 	width: auto;
 }
 
-.fa.liked {
-	color: yellow;
-}
-
-.fa.retweeted {
-	color: green;
+.status-action-count span {
+	vertical-align: middle;
 }
 
 .page-title {
@@ -175,6 +170,10 @@
 	display: flex;
 }
 
+.notification-info-text span {
+	vertical-align: middle;
+}
+
 .notification-follow-uname {
 	margin-top: 8px;
 }
@@ -334,19 +333,18 @@
 	display: inline-block;
 }
 
-.fa {
-	font-size: 11pt !important;
-	color: #444444;
-}
-
 .post-form-emoji-link {
-	margin-left: 8px;
+	margin-left: 4px;
 }
 
 .post-form-emoji-link i {
 	font-size: 14pt !important;
 }
 
+.post-form-title {
+	vertical-align: middle;
+}
+
 .user-info {
 	margin-bottom: 8px;
 	display: flex;
@@ -401,3 +399,12 @@
 #settings-form button[type=submit] {
 	margin-top: 8px;
 }
+
+.icon {
+	height: 16px;
+	vertical-align: middle;
+}
+
+.icon.post-emoji {
+	height: 20px;
+}
diff --git a/templates/header.tmpl b/templates/header.tmpl
index 8d05014..1ff15d6 100644
--- a/templates/header.tmpl
+++ b/templates/header.tmpl
@@ -8,6 +8,5 @@
 	{{if .CustomCSS}}
 	<link rel="stylesheet" href="{{.CustomCSS}}">
 	{{end}}
-	<link rel="stylesheet" href="/static/fonts/fork-awesome.css">
 </head>
 <body>
diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index c4f6f28..d68382f 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -12,10 +12,10 @@
 			</a>
 		</div>
 		<div>
-			<div>
+			<div class="notification-info-text">
 				<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-				<i class="fa fa-user-plus"></i>
-				followed you
+				<img class="icon" src="/static/icons/user-plus.png" alt="followed" />
+				<span> followed you </span>
 			</div>
 			<div class="notification-follow-uname">
 				@{{.Account.Acct}}
@@ -34,10 +34,10 @@
 			</a>
 		</div>
 		<div>
-			<div>
+			<div class="notification-info-text">
 				<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-				<i class="fa fa-retweet retweeted"></i>
-				retweeted your post
+				<img class="icon" src="/static/icons/retweeted.png" alt="retweeted" />
+				<span> retweeted your post </span>
 			</div>
 			{{template "status" .Status}}
 		</div>
@@ -51,10 +51,10 @@
 			</a>
 		</div>
 		<div>
-			<div>
+			<div class="notification-info-text">
 				<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-				<i class="fa fa-star liked"></i>
-				liked your post
+				<img class="icon" src="/static/icons/liked.png" alt="liked" />
+				<span> liked your post </span>
 			</div>
 			{{template "status" .Status}}
 		</div>
diff --git a/templates/postform.tmpl b/templates/postform.tmpl
index a79f86b..4e2d4a4 100644
--- a/templates/postform.tmpl
+++ b/templates/postform.tmpl
@@ -1,12 +1,12 @@
 <form class="post-form" action="/post" method="POST" enctype="multipart/form-data">
 	{{if .ReplyContext}}
 	<input type="hidden" name="reply_to_id" value="{{.ReplyContext.InReplyToID}}" />
-	<label for="post-content"> Reply to {{.ReplyContext.InReplyToName}} </label>
+	<label for="post-content" class="post-form-title"> Reply to {{.ReplyContext.InReplyToName}} </label>
 	{{else}}
-	<label for="post-content"> New post </label>
+	<label for="post-content" class="post-form-title"> New post </label>
 	{{end}}
-	<a class="post-form-emoji-link" href="/emojis" target="_blank">
-		<i class="fa fa-smile-o" title="emoji reference"></i>
+	<a class="post-form-emoji-link" href="/emojis" target="_blank" title="emoji reference">
+		<img class="icon post-emoji" src="/static/icons/smile-o.png" alt="emojis" />
 	</a>
 	<div class="post-form-content-container">
 		<textarea id="post-content" name="content" class="post-content" cols="50" rows="5">{{if .ReplyContext}}{{.ReplyContext.ReplyContent}}{{end}}</textarea>
diff --git a/templates/status.tmpl b/templates/status.tmpl
index 2013f47..7facba2 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -5,7 +5,7 @@
 			<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" />
 		</a>
 		<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-		<i class="fa fa-retweet retweeted"></i>
+		<img class="icon" src="/static/icons/retweeted.png" alt="retweeted" />
 		retweeted
 	</div>
 	{{template "status" .Reblog}}
@@ -28,23 +28,23 @@
 				</a>
 				<a class="status-visibility">
 					{{if eq .Visibility "public"}}
-					<i class="fa fa-globe" title="Public"></i>
+					<img class="icon" src="/static/icons/globe.png" alt="Public" title="Public" />
 					{{else if eq .Visibility "unlisted"}}
-					<i class="fa fa-unlock-alt" title="Unlisted"></i>
+					<img class="icon" src="/static/icons/unlock-alt.png" alt="Unlisted" title="Unlisted" />
 					{{else if eq .Visibility "private"}}
-					<i class="fa fa-lock" title="Private"></i>
+					<img class="icon" src="/static/icons/lock.png" alt="Private" title="Private" />
 					{{else if eq .Visibility "direct"}}
-					<i class="fa fa-envelope" title="Direct"></i>
+					<img class="icon" src="/static/icons/envelope.png" alt="Direct" title="Direct" />
 					{{end}}
 				</a>
 				<a class="remote-link" href="{{.URL}}" target="_blank" title="source">
-					<i class="fa fa-link"></i>
+					<img class="icon" src="/static/icons/link.png" alt="source" />
 				</a>
 			</div>
 			{{end}}
 			<div class="status-reply-container">
 				{{if .InReplyToID}}
-				<i class="fa fa-mail-forward"></i>
+				<img class="icon" src="/static/icons/mail-forward.png" alt="reply to" />
 				<a class="status-reply-to" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> reply to {{.Pleroma.InReplyToAccountAcct}} </a>
 				{{if index .ReplyMap .ID}} <span class="status-reply-info-divider"> - </span> {{end}}
 				{{end}}
@@ -88,7 +88,7 @@
 			<div class="status-action-container"> 
 				<div class="status-action">
 					<a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply"> 
-						<i class="fa fa-reply"></i>
+						<img class="icon" src="/static/icons/reply.png" alt="reply" />
 					</a>
 					<a class="status-action-count" href="/thread/{{.ID}}#status-{{.ID}}" {{if .ThreadInNewTab}}target="_blank"{{end}}>
 						<span> {{DisplayInteractionCount .RepliesCount}} </span>
@@ -97,16 +97,16 @@
 				<div class="status-action">
 					{{if or (eq .Visibility "private") (eq .Visibility "direct")}}
 					<a class="status-retweet" title="this status cannot be retweeted"> 
-						<i class="fa fa-retweet"></i>
+						<img class="icon" src="/static/icons/retweet.png" alt="retweet" />
 					</a>
 					{{else}}
 					{{if .Reblogged}}
 					<a class="status-retweet" href="/unretweet/{{.ID}}" title="undo retweet"> 
-						<i class="fa fa-retweet retweeted"></i>
+						<img class="icon" src="/static/icons/retweeted.png" alt="undo retweet" />
 					</a>
 					{{else}}
 					<a class="status-retweet" href="/retweet/{{.ID}}" title="retweet"> 
-						<i class="fa fa-retweet"></i>
+						<img class="icon" src="/static/icons/retweet.png" alt="retweet" />
 					</a>
 					{{end}}
 					{{end}}
@@ -117,11 +117,11 @@
 				<div class="status-action">
 					{{if .Favourited}}
 					<a class="status-like" href="/unlike/{{.ID}}" title="unlike"> 
-						<i class="fa fa-star liked"></i>
+						<img class="icon" src="/static/icons/liked.png" alt="unlike" />
 					</a>
 					{{else}}
 					<a class="status-like" href="/like/{{.ID}}" title="like"> 
-						<i class="fa fa-star-o"></i>
+						<img class="icon" src="/static/icons/star-o.png" alt="like" />
 					</a>
 					{{end}}
 					<a class="status-action-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
diff --git a/templates/user.tmpl b/templates/user.tmpl
index 0c134af..53de635 100644
--- a/templates/user.tmpl
+++ b/templates/user.tmpl
@@ -14,7 +14,7 @@
 			<span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>  
 			<span class="status-uname"> {{.User.Acct}} </span>
 			<a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile">
-				<i class="fa fa-link"></i>
+				<img class="icon" src="/static/icons/link.png" alt="link" />
 			</a>
 		</div>
 		<div>
