diff --git a/inc/config.php b/inc/config.php
index 5e215fca..f0e3ea9f 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -739,9 +739,9 @@
 	// Location of post flags/icons (where "%s" is the flag name). Defaults to static/flags/%s.png.
 	// $config['uri_flags'] = 'http://static.example.org/flags/%s.png';
 
-	// Width and height of post flags:
-	$config['flag_width'] = 16;
-	$config['flag_height'] = 11;
+	// Width and height (and more?) of post flags. Can be overridden with the Tinyboard post modifier:
+	// <tinyboard flag style>.
+	$config['flag_style'] = 'width:16px;height:11px;';
 
 /*
  * ====================
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 3ae60b0d..635709bc 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -29,7 +29,9 @@
 			 [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
 		{% if config.display_flags and post.modifiers.flag %}
-			 <img class="flag" style="width:{{ config.flag_width }}px;height:{{ config.flag_height }}px" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}">
+			 <img class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
+			 	style="{% if post.modifiers['flag style'] %}{{ post.modifiers['flag style'] }}{% else %}{{ config.flag_style }}{% endif %}"
+			 {% if post.modifiers['flag alt'] %}title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
 		{% endif %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
diff --git a/templates/post_thread.html b/templates/post_thread.html
index f4ca7e72..4630eb40 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -83,7 +83,9 @@
 			 [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
 		{% if config.display_flags and post.modifiers.flag %}
-			 <img class="flag" style="width:{{ config.flag_width }}px;height:{{ config.flag_height }}px" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}">
+			 <img class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
+			 	style="{% if post.modifiers['flag style'] %}{{ post.modifiers['flag style'] }}{% else %}{{ config.flag_style }}{% endif %}"
+			 {% if post.modifiers['flag alt'] %}title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
 		{% endif %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>