diff --git a/assets/layers/maxspeed/maxspeed.json b/assets/layers/maxspeed/maxspeed.json
index dcf444ca8..7c0f9d47d 100644
--- a/assets/layers/maxspeed/maxspeed.json
+++ b/assets/layers/maxspeed/maxspeed.json
@@ -110,16 +110,19 @@
   "allowSplit": true,
   "mapRendering": [
     {
-      "render": null,
       "icon": {
+        "render": null,
         "mappings": [
           {
             "if": "maxspeed~[1-9]0|1[0-4]0",
+            "then": "./assets/themes/maxspeed/maxspeed_{maxspeed} mph.svg"
+          },
+          {
+            "if": "maxspeed~[1-9]0|1[0-4]0 mph",
             "then": "./assets/themes/maxspeed/maxspeed_{maxspeed}.svg"
           }
         ]
       },
-      "condition": "maxspeed!=30",
       "iconSize": {
         "render": "32,32,center"
       },
diff --git a/assets/themes/maxspeed/license_info.json b/assets/themes/maxspeed/license_info.json
index a712dc2b6..3aa1a76fc 100644
--- a/assets/themes/maxspeed/license_info.json
+++ b/assets/themes/maxspeed/license_info.json
@@ -1,142 +1,142 @@
 [
   {
-    "path": "maxspeed_10.svg",
+    "path": "maxspeed_10 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_100.svg",
+    "path": "maxspeed_100 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_110.svg",
+    "path": "maxspeed_110 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_120.svg",
+    "path": "maxspeed_120 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_130.svg",
+    "path": "maxspeed_130 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_140.svg",
+    "path": "maxspeed_140 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_20.svg",
+    "path": "maxspeed_20 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_30.svg",
+    "path": "maxspeed_30 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_40.svg",
+    "path": "maxspeed_40 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_50.svg",
+    "path": "maxspeed_50 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_60.svg",
+    "path": "maxspeed_60 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_70.svg",
+    "path": "maxspeed_70 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_80.svg",
+    "path": "maxspeed_80 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
-    "path": "maxspeed_90.svg",
+    "path": "maxspeed_90 mph.svg",
     "license": "CC 4.0",
     "authors": [
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   },
   {
@@ -146,7 +146,7 @@
       "yopaseopor"
     ],
     "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30 mph.svg"
     ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/maxspeed/maxspeed_10.svg b/assets/themes/maxspeed/maxspeed_10 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_10.svg
rename to assets/themes/maxspeed/maxspeed_10 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_100.svg b/assets/themes/maxspeed/maxspeed_100 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_100.svg
rename to assets/themes/maxspeed/maxspeed_100 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_110.svg b/assets/themes/maxspeed/maxspeed_110 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_110.svg
rename to assets/themes/maxspeed/maxspeed_110 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_120.svg b/assets/themes/maxspeed/maxspeed_120 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_120.svg
rename to assets/themes/maxspeed/maxspeed_120 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_130.svg b/assets/themes/maxspeed/maxspeed_130 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_130.svg
rename to assets/themes/maxspeed/maxspeed_130 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_140.svg b/assets/themes/maxspeed/maxspeed_140 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_140.svg
rename to assets/themes/maxspeed/maxspeed_140 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_20.svg b/assets/themes/maxspeed/maxspeed_20 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_20.svg
rename to assets/themes/maxspeed/maxspeed_20 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_30.svg b/assets/themes/maxspeed/maxspeed_30 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_30.svg
rename to assets/themes/maxspeed/maxspeed_30 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_40.svg b/assets/themes/maxspeed/maxspeed_40 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_40.svg
rename to assets/themes/maxspeed/maxspeed_40 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_50.svg b/assets/themes/maxspeed/maxspeed_50 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_50.svg
rename to assets/themes/maxspeed/maxspeed_50 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_60.svg b/assets/themes/maxspeed/maxspeed_60 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_60.svg
rename to assets/themes/maxspeed/maxspeed_60 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_70.svg b/assets/themes/maxspeed/maxspeed_70 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_70.svg
rename to assets/themes/maxspeed/maxspeed_70 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_80.svg b/assets/themes/maxspeed/maxspeed_80 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_80.svg
rename to assets/themes/maxspeed/maxspeed_80 mph.svg
diff --git a/assets/themes/maxspeed/maxspeed_90.svg b/assets/themes/maxspeed/maxspeed_90 mph.svg
similarity index 100%
rename from assets/themes/maxspeed/maxspeed_90.svg
rename to assets/themes/maxspeed/maxspeed_90 mph.svg