diff --git a/styles/all/template/event/overall_header_head_append.html b/styles/all/template/event/overall_header_head_append.html
index 9d00f3f..fff8c75 100644
--- a/styles/all/template/event/overall_header_head_append.html
+++ b/styles/all/template/event/overall_header_head_append.html
@@ -1,3 +1,5 @@
 <!-- IF TOPIC_SOLVED_PHPBB31 -->
-	<!-- INCLUDECSS @tierra_topicsolved/buttons.css -->
+	<!-- INCLUDECSS @tierra_topicsolved/phpbb-3-1-x.css -->
+<!-- ELSE -->
+	<!-- INCLUDECSS @tierra_topicsolved/styles.css -->
 <!-- ENDIF -->
diff --git a/styles/all/template/event/viewtopic_body_post_buttons_after.html b/styles/all/template/event/viewtopic_body_post_buttons_after.html
index bf82de1..73421d7 100644
--- a/styles/all/template/event/viewtopic_body_post_buttons_after.html
+++ b/styles/all/template/event/viewtopic_body_post_buttons_after.html
@@ -8,7 +8,7 @@
 			</a>
 		<!-- ELSE -->
 			<a href="{postrow.U_SET_SOLVED}" title="{L_SET_TOPIC_NOT_SOLVED}" class="button button-icon-only">
-				<i class="icon fa-check fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SET_TOPIC_NOT_SOLVED}</span>
+				<i class="icon fa-ban fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SET_TOPIC_NOT_SOLVED}</span>
 			</a>
 		<!-- ENDIF -->
 	<!-- ELSE -->
diff --git a/styles/all/template/event/viewtopic_topic_title_append.html b/styles/all/template/event/viewtopic_topic_title_append.html
index 6d05514..e74d99e 100644
--- a/styles/all/template/event/viewtopic_topic_title_append.html
+++ b/styles/all/template/event/viewtopic_topic_title_append.html
@@ -5,7 +5,7 @@
 </a>
 <!-- ENDIF -->
 <!-- IF TOPIC_SOLVED_IMAGE -->
-<a href="{{ U_SOLVED_POST }}" title="{L_TOPIC_SOLVED}">
+<a class="topic_solved_title_link" href="{{ U_SOLVED_POST }}" title="{L_TOPIC_SOLVED}">
 	{TOPIC_SOLVED_IMAGE}
 	<!-- IF ! TOPIC_SOLVED_PHPBB31 -->
 	<span class="sr-only">{L_TOPIC_SOLVED}</span>
diff --git a/styles/all/theme/buttons.css b/styles/all/theme/phpbb-3-1-x.css
similarity index 100%
rename from styles/all/theme/buttons.css
rename to styles/all/theme/phpbb-3-1-x.css
diff --git a/styles/all/theme/styles.css b/styles/all/theme/styles.css
new file mode 100644
index 0000000..1a6c509
--- /dev/null
+++ b/styles/all/theme/styles.css
@@ -0,0 +1,18 @@
+.topic_solved_title_link:hover {
+	text-decoration: none;
+}
+
+.topic_solved_icon {
+	--hue: 120deg;
+	--sat: 100%;
+	--lightness: 37%;
+	color: hsl(var(--hue) var(--sat) var(--lightness));
+}
+
+.topic_solved_title_link .topic_solved_icon {
+	display: inline-flex;
+}
+
+:is(.topic_solved_title_link, .list-inner a):hover .topic_solved_icon {
+	color: hsl(var(--hue) var(--sat) calc(var(--lightness) - 6%));
+}
diff --git a/topicsolved.php b/topicsolved.php
index a819531..efb0fb8 100644
--- a/topicsolved.php
+++ b/topicsolved.php
@@ -304,11 +304,8 @@ public function image($type, $alt = '', $url = '')
 	public function icon($color = '', $alt = '', $url = '')
 	{
 		$title = '';
-		if (empty($color))
-		{
-			$color = '00BF00';
-		}
-		$classes = 'fa fa-check-circle fa-fw';
+
+		$classes = 'topic_solved_icon fa fa-check-circle fa-fw';
 
 		/**
 		 * This event makes it possible to customize the solved icon.
@@ -324,8 +321,9 @@ public function icon($color = '', $alt = '', $url = '')
 		extract($this->dispatcher->trigger_event('tierra.topicsolved.render_icon', compact($vars)));
 
 		$markup = sprintf(
-			'<i class="%1s" style="color: #%2s" aria-hidden="true"></i>',
-			$classes, $color
+			'<i class="%1s" style="%2s" aria-hidden="true"></i>',
+			$classes,
+			empty($color) ? '' : "color: #$color"
 		);
 
 		if (!empty($alt))