diff --git a/static/css/dss.main.css b/static/css/dss.main.css
index 12d3658..5c1c8c2 100644
--- a/static/css/dss.main.css
+++ b/static/css/dss.main.css
@@ -662,7 +662,6 @@ img.flag {
     -webkit-border-top-right-radius: 4px;
 }
 
-
 div.player-body ul.player-controls a {
     display: block;
     overflow: hidden;
@@ -756,8 +755,8 @@ img.mix-listing-image {
 }
 
 .footer-button-right {
-   padding-right: 8px;
-   float: right;
+    padding-right: 8px;
+    float: right;
 }
 
 .audio-timeline-ruler {
@@ -794,12 +793,15 @@ img.mix-listing-image {
     height: .64em;
 }
 
-.dss-player-wrapper{
+.dss-player-wrapper {
     margin-top: 4px;
 }
 
-[class^="fa-"] {
-  display: inline-block;
-  text-align: center;
-}
-
+.btn > .badge, .btn > .label {
+    top: -2px;
+    right: -2px;
+    padding: 1px 3px;
+    text-align: center;
+    font-size: 12px;
+    position: absolute;
+}
\ No newline at end of file
diff --git a/templates/views/UserProfileView.html b/templates/views/UserProfileView.html
index 96d1b73..fab4455 100644
--- a/templates/views/UserProfileView.html
+++ b/templates/views/UserProfileView.html
@@ -94,28 +94,28 @@
 
         <div class="col-xs-12 col-sm-9">
             <div class="center">
-                <a href="/user/<%= slug %>/mixes" class="btn btn-app btn-sm btn-pink">
-                    <i class="fa fa-music bigger-230"></i>
+                <a href="/user/<%= slug %>/mixes" class="btn btn-pink">
+                    <i class="fa fa-music"></i>
                     <span class="smaller-90">Mixes</span>
                     <span class="badge badge-warning"><%= mix_count%></span>
                 </a>
-                <a href="/user/<%= slug %>/favourites" class="btn btn-app btn-sm btn-danger">
-                    <i class="fa fa-star bigger-230"></i>
+                <a href="/user/<%= slug %>/favourites" class="btn btn-danger">
+                    <i class="fa fa-star"></i>
                     <span class="smaller-90">Favourites</span>
                     <span class="badge badge-warning"><%= favourite_count %></span>
                 </a>
-                <a href="/user/<%= slug %>/likes" class="btn btn-app btn-sm btn-purple">
+                <a href="/user/<%= slug %>/likes" class="btn btn-purple">
                     <i class="fa fa-heart /bigger-230"></i>
                     <span class="smaller-90">Likes</span>
                     <span class="badge badge-warning"><%= like_count %></span>
                 </a>
-                <a href="/user/<%= slug %>/followers" class="btn btn-app btn-sm btn-default">
-                    <i class="fa fa-check bigger-230"></i>
+                <a href="/user/<%= slug %>/followers" class="btn btn-default">
+                    <i class="fa fa-check"></i>
                     <span class="smaller-90">Followers</span>
                     <span class="badge badge-warning"><%= followers.length %></span>
                 </a>
-                <a href="/user/<%= slug %>/following" class="btn btn-app btn-sm btn-warning">
-                    <i class="fa fa-share bigger-230"></i>
+                <a href="/user/<%= slug %>/following" class="btn btn-warning">
+                    <i class="fa fa-share"></i>
                     <span class="smaller-90">Following</span>
                     <span class="badge badge-warning"><%= following.length %></span>
                 </a>