diff --git a/files/assets/images/badges/21.webp b/files/assets/images/PCM/patron_badges/21.webp
similarity index 100%
rename from files/assets/images/badges/21.webp
rename to files/assets/images/PCM/patron_badges/21.webp
diff --git a/files/assets/images/badges/22.webp b/files/assets/images/PCM/patron_badges/22.webp
similarity index 100%
rename from files/assets/images/badges/22.webp
rename to files/assets/images/PCM/patron_badges/22.webp
diff --git a/files/assets/images/badges/23.webp b/files/assets/images/PCM/patron_badges/23.webp
similarity index 100%
rename from files/assets/images/badges/23.webp
rename to files/assets/images/PCM/patron_badges/23.webp
diff --git a/files/assets/images/badges/24.webp b/files/assets/images/PCM/patron_badges/24.webp
similarity index 100%
rename from files/assets/images/badges/24.webp
rename to files/assets/images/PCM/patron_badges/24.webp
diff --git a/files/assets/images/badges/25.webp b/files/assets/images/PCM/patron_badges/25.webp
similarity index 100%
rename from files/assets/images/badges/25.webp
rename to files/assets/images/PCM/patron_badges/25.webp
diff --git a/files/assets/images/badges/26.webp b/files/assets/images/PCM/patron_badges/26.webp
similarity index 100%
rename from files/assets/images/badges/26.webp
rename to files/assets/images/PCM/patron_badges/26.webp
diff --git a/files/assets/images/badges/27.webp b/files/assets/images/PCM/patron_badges/27.webp
similarity index 100%
rename from files/assets/images/badges/27.webp
rename to files/assets/images/PCM/patron_badges/27.webp
diff --git a/files/assets/images/WPD/patron_badges/21.webp b/files/assets/images/WPD/patron_badges/21.webp
new file mode 100644
index 000000000..36ff0bc10
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/21.webp differ
diff --git a/files/assets/images/WPD/patron_badges/22.webp b/files/assets/images/WPD/patron_badges/22.webp
new file mode 100644
index 000000000..dea45cb5a
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/22.webp differ
diff --git a/files/assets/images/WPD/patron_badges/23.webp b/files/assets/images/WPD/patron_badges/23.webp
new file mode 100644
index 000000000..7046fffd4
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/23.webp differ
diff --git a/files/assets/images/WPD/patron_badges/24.webp b/files/assets/images/WPD/patron_badges/24.webp
new file mode 100644
index 000000000..b8a3dc0d2
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/24.webp differ
diff --git a/files/assets/images/WPD/patron_badges/25.webp b/files/assets/images/WPD/patron_badges/25.webp
new file mode 100644
index 000000000..b9695ad54
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/25.webp differ
diff --git a/files/assets/images/WPD/patron_badges/26.webp b/files/assets/images/WPD/patron_badges/26.webp
new file mode 100644
index 000000000..11be6076c
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/26.webp differ
diff --git a/files/assets/images/WPD/patron_badges/27.webp b/files/assets/images/WPD/patron_badges/27.webp
new file mode 100644
index 000000000..4ae292f78
Binary files /dev/null and b/files/assets/images/WPD/patron_badges/27.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/21.webp b/files/assets/images/rDrama/patron_badges/21.webp
new file mode 100644
index 000000000..d1bb5f1d4
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/21.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/22.webp b/files/assets/images/rDrama/patron_badges/22.webp
new file mode 100644
index 000000000..106dbf403
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/22.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/23.webp b/files/assets/images/rDrama/patron_badges/23.webp
new file mode 100644
index 000000000..b36384d89
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/23.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/24.webp b/files/assets/images/rDrama/patron_badges/24.webp
new file mode 100644
index 000000000..a97570479
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/24.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/25.webp b/files/assets/images/rDrama/patron_badges/25.webp
new file mode 100644
index 000000000..acf5b93f1
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/25.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/26.webp b/files/assets/images/rDrama/patron_badges/26.webp
new file mode 100644
index 000000000..11be6076c
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/26.webp differ
diff --git a/files/assets/images/rDrama/patron_badges/27.webp b/files/assets/images/rDrama/patron_badges/27.webp
new file mode 100644
index 000000000..4ae292f78
Binary files /dev/null and b/files/assets/images/rDrama/patron_badges/27.webp differ
diff --git a/files/classes/badges.py b/files/classes/badges.py
index c874630dd..9f5cf3409 100644
--- a/files/classes/badges.py
+++ b/files/classes/badges.py
@@ -17,6 +17,11 @@ class BadgeDef(Base):
 	def __repr__(self):
 		return f"<BadgeDef(id={self.id})>"
 
+	@property
+	@lazy
+	def path(self):
+		if 20 < self.id < 28: return f"/i/{SITE_NAME}/patron_badges/{self.id}.webp"
+		return f"/i/badges/{self.id}.webp"
 
 class Badge(Base):
 
@@ -76,7 +81,7 @@ class Badge(Base):
 	@property
 	@lazy
 	def path(self):
-		return f"/i/badges/{self.badge_id}.webp"
+		return self.badge.path
 
 	@property
 	@lazy
diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html
index 7f1e18867..c46b91bfe 100644
--- a/files/templates/admin/badge_grant.html
+++ b/files/templates/admin/badge_grant.html
@@ -60,7 +60,7 @@
 			<label class="custom-control-label" for="{{badge.id}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="{{asset('images/badges/', badge.id|string+'.webp')}}" width=64.16 height=70></label></td>
+	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=64.16></label></td>
 	<td>{{badge.name}}</td>
 	<td>{{badge.description}}</td>
 </tr>
diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html
index c1493b93f..33c5a38ff 100644
--- a/files/templates/admin/badge_remove.html
+++ b/files/templates/admin/badge_remove.html
@@ -60,7 +60,7 @@
 			<label class="custom-control-label" for="{{badge.id}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="{{asset('images/badges/', badge.id|string+'.webp')}}" width=64.16 height=70></label></td>
+	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=64.16></label></td>
 	<td>{{badge.name}}</td>
 	<td>{{badge.description}}</td>
 </tr>
diff --git a/files/templates/badges.html b/files/templates/badges.html
index 3b7397c06..7a901a304 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -27,7 +27,7 @@
 			<tr>
 				<td>{{loop.index}}</td>
 				<td>{{badge.name}}</td>
-				<td><img alt="{{badge.name}}" loading="lazy" src="{{asset('images/badges/', badge.id|string+'.webp')}}" width=45.83 height=50>
+				<td><img alt="{{badge.name}}" loading="lazy" src="{{badge.path}}" width=45.83>
 				<td>{{badge.description}}</td>
 				{%- set ct = counts[badge.id] if badge.id in counts else (0, 0) %}
 				<td class="badges-rarity-qty"><a href="/badge_owners/{{badge.id}}">{{ ct[0] }}</a></td>
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index caf02a318..2f023f8b1 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -14,7 +14,7 @@
 		<td>{{loop.index}}</td>
 		<td><a style="color:#{{u.namecolor}}" href="/@{{u.username}}"><img loading="lazy" src="{{u.profile_url}}" class="pp20"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></a></td>
 
-		<td><img alt="2{{u.patron}}" loading="lazy" width=29.33 height=32 src="{{asset('images/badges/', '2'+u.patron|string+'.webp')}}"></td>
+		<td><img alt="2{{u.patron}}" loading="lazy" width=29.33 src="{{asset_siteimg('patron_badges/', '2'+u.patron|string+'.webp')}}"></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index daf9ce5b9..fb14a24ee 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -30,15 +30,13 @@ set CACHE_VER = {
 	'js/userpage.js': 244,
 	'js/userpage_v.js': 245,
 	'js/lozad.js': 260,
-
-	'images/badges/': 1023,
 }
 -%}
 
 {%- macro asset(name, file='') -%}
-/assets/{{name}}{{file}}?v={{ CACHE_VER[name] }}
+	/assets/{{name}}{{file}}?v={{ CACHE_VER[name] }}
 {%- endmacro -%}
 
-{%- macro asset_siteimg(name) -%}
-/i/{{SITE_NAME}}/{{name}}?v=3009
+{%- macro asset_siteimg(name, file='') -%}
+	/i/{{SITE_NAME}}/{{name}}{{file}}?v=3009
 {%- endmacro -%}