diff --git a/src/scripts/album.js b/src/scripts/album.js
index b3a4244..d598cd5 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -447,8 +447,6 @@ album.setPublic = function(albumID, e) {
 
 	}
 
-	params = 'setAlbumPublic&albumID=' + albumID + '&password=' + password + '&visible=' + listed + '&downloadable=' + downloadable;
-
 	if (visible.album()) {
 
 		album.json.public	= (album.json.public==0) ? 1 : 0;
@@ -461,6 +459,7 @@ album.setPublic = function(albumID, e) {
 
 	}
 
+	params = 'setAlbumPublic&albumID=' + albumID + '&password=' + password + '&visible=' + listed + '&downloadable=' + downloadable;
 	lychee.api(params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
diff --git a/src/scripts/build.coffee b/src/scripts/build.coffee
index d052571..f1d96b9 100644
--- a/src/scripts/build.coffee
+++ b/src/scripts/build.coffee
@@ -59,8 +59,8 @@ build.album = (data) ->
 
 	if lychee.publicMode is false
 
-		if data.star is '1' then		html += "<a class='badge'>#{ build.iconic('star') }</a>"
-		if data.public is '1' then		html += "<a class='badge'>#{ build.iconic('eye') }</a>"
+		if data.star is '1' then		html += "<a class='badge icn-star'>#{ build.iconic('star') }</a>"
+		if data.public is '1' then		html += "<a class='badge icn-share'>#{ build.iconic('eye') }</a>"
 		if data.unsorted is '1' then	html += "<a class='badge'>#{ build.iconic('list') }</a>"
 		if data.recent is '1' then		html += "<a class='badge'>#{ build.iconic('clock') }</a>"
 
@@ -94,8 +94,8 @@ build.photo = (data) ->
 
 	html += "</div>"
 
-	if data.star is '1' then html += "<a class='badge'>#{ build.iconic('star') }</a>"
-	if lychee.publicMode is false and data.public is '1' and album.json.public isnt '1' then html += "<a class='badge'>#{ build.iconic('eye') }</a>"
+	if data.star is '1' then html += "<a class='badge iconic-star'>#{ build.iconic('star') }</a>"
+	if lychee.publicMode is false and data.public is '1' and album.json.public isnt '1' then html += "<a class='badge iconic-share'>#{ build.iconic('eye') }</a>"
 
 	html += "</div>"
 
diff --git a/src/scripts/view.js b/src/scripts/view.js
index c3dce58..01b6821 100644
--- a/src/scripts/view.js
+++ b/src/scripts/view.js
@@ -205,15 +205,15 @@ view.album = {
 
 		star: function(photoID) {
 
-			$('.photo[data-id="' + photoID + '"] .icon-star').remove();
-			if (album.json.content[photoID].star==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge red icon-star'></a>");
+			$('.photo[data-id="' + photoID + '"] .iconic-star').remove();
+			if (album.json.content[photoID].star==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-star'>" + build.iconic('star') + "</a>");
 
 		},
 
 		public: function(photoID) {
 
-			$('.photo[data-id="' + photoID + '"] .icon-share').remove();
-			if (album.json.content[photoID].public==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge red icon-share'></a>");
+			$('.photo[data-id="' + photoID + '"] .iconic-share').remove();
+			if (album.json.content[photoID].public==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-share'>" + build.iconic('eye') + "</a>");
 
 		},
 
@@ -253,7 +253,7 @@ view.album = {
 		if (album.json.public==1) {
 			$('#button_share_album a').addClass('active');
 			$('#button_share_album').attr('title', 'Share Album');
-			$('.photo .icon-share').remove();
+			$('.photo .iconic-share').remove();
 			if (album.json.init) $('#infobox .attr_visibility').html('Public');
 		} else {
 			$('#button_share_album a').removeClass('active');