diff --git a/client/css/style.css b/client/css/style.css
index 008a695..a1daef6 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -298,13 +298,8 @@ xopacity: .5;
 }
 
 .sticker {
-<<<<<<< HEAD
 	padding-top:  0px;
 	padding-left: 2px;
-=======
-	xpadding-top:  3px;
-	xpadding-left: 2px;
->>>>>>> 165a83e28357608b36daab0986a00ca7d9735b06
 	xz-index:10;
 	display: inline-block;
 	width: 11px;
@@ -348,6 +343,22 @@ xopacity: .5;
 #sticker-purple {
 	background-image: url('/images/stickers/sticker-purple.png');
 }
+#sticker-silverstar {
+	background-image: url('/images/stickers/sticker-silverstar.png');
+}
+#addsticker {
+	background-image: url('/images/icons/iconic/raster/black/plus_8x8.png');
+	background-position: 2px 2px;
+	opacity: 0.3;
+
+	display: inline-block;
+	width: 11px;
+	height: 11px;
+	background-repeat: no-repeat;
+}
+#addsticker:hover {
+	opacity: 0.7;
+}
 #nosticker {
 	background-image: url('/images/stickers/sticker-deletestar.png');
 }
diff --git a/client/images/stickers/sticker-silverstar.png b/client/images/stickers/sticker-silverstar.png
index ae58c22..745625b 100644
Binary files a/client/images/stickers/sticker-silverstar.png and b/client/images/stickers/sticker-silverstar.png differ
diff --git a/views/index.jade b/views/index.jade
index cca3e77..b391d69 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -38,6 +38,8 @@ block body
 		div.sticker#sticker-lightblue
 		div.sticker#sticker-orange
 		div.sticker#sticker-purple
+		//div.sticker#sticker-silverstar
+		//div#addsticker
 		br
 		div.sticker#nosticker
 		//br