diff --git a/VectorTemplate.php b/VectorTemplate.php
index 408c347..d109031 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -540,9 +540,7 @@ class VectorTemplate extends BaseTemplate {
 
 		// Add CSS class 'collapsible' to links which are not marked as "primary"
 		if (
-			isset( $options['vector-collapsible'] ) && $options['vector-collapsible']
-			&& !( isset( $item['primary'] ) && $item['primary'] )
-		) {
+			isset( $options['vector-collapsible'] ) && $options['vector-collapsible'] ) {
 			$item['class'] = rtrim( 'collapsible ' . $item['class'], ' ' );
 		}
 
diff --git a/components/watchstar.less b/components/watchstar.less
index 17bcbd7..cdea9bc 100644
--- a/components/watchstar.less
+++ b/components/watchstar.less
@@ -17,21 +17,26 @@
 	background-position: 5px 60%;
 }
 #ca-unwatch.icon a {
+	background-repeat: no-repeat;
 	.background-image-svg( 'images/unwatch-icon.svg', 'images/unwatch-icon.png' );
 }
 #ca-watch.icon a {
+	background-repeat: no-repeat;
 	.background-image-svg( 'images/watch-icon.svg', 'images/watch-icon.png' );
 }
 #ca-unwatch.icon a:hover,
 #ca-unwatch.icon a:focus {
+	background-repeat: no-repeat;
 	.background-image-svg( 'images/unwatch-icon-hl.svg', 'images/unwatch-icon-hl.png' );
 }
 #ca-watch.icon a:hover,
 #ca-watch.icon a:focus {
+	background-repeat: no-repeat;
 	.background-image-svg( 'images/watch-icon-hl.svg', 'images/watch-icon-hl.png' );
 }
 #ca-unwatch.icon a.loading,
 #ca-watch.icon a.loading {
+	background-repeat: no-repeat;
 	.background-image-svg( 'images/watch-icon-loading.svg', 'images/watch-icon-loading.png' );
 	.rotation( 700ms );
 	/* Suppress the hilarious rotating focus outline on Firefox */