diff --git a/icons/ad.svg b/icons/ad.svg
index b3dac7c3a..6b56aa9c0 100644
--- a/icons/ad.svg
+++ b/icons/ad.svg
@@ -12,5 +12,5 @@
   <path d="M10 13H6" />
   <path d="M10 15v-4a2 2 0 0 0-4 0v4" />
   <path d="M14 14.5a.5.5 0 0 0 .5.5h1a2.5 2.5 0 0 0 2.5-2.5v-1A2.5 2.5 0 0 0 15.5 9h-1a.5.5 0 0 0-.5.5z" />
-  <rect width="20" height="14" x="2" y="5" rx="2" />
+  <rect x="2" y="5" width="20" height="14" rx="2" />
 </svg>
diff --git a/icons/arrow-down-0-1.json b/icons/arrow-down-0-1.json
index 54e722845..a2f90b046 100644
--- a/icons/arrow-down-0-1.json
+++ b/icons/arrow-down-0-1.json
@@ -26,7 +26,6 @@
       "name": "arrow-down-01",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-down-01"
+    }
   ]
 }
diff --git a/icons/arrow-down-1-0.json b/icons/arrow-down-1-0.json
index 58b32af01..9930a1091 100644
--- a/icons/arrow-down-1-0.json
+++ b/icons/arrow-down-1-0.json
@@ -26,7 +26,6 @@
       "name": "arrow-down-10",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-down-10"
+    }
   ]
 }
diff --git a/icons/arrow-down-a-z.json b/icons/arrow-down-a-z.json
index 00c9ec8ad..d29a21d5a 100644
--- a/icons/arrow-down-a-z.json
+++ b/icons/arrow-down-a-z.json
@@ -26,7 +26,6 @@
       "name": "arrow-down-az",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-down-az"
+    }
   ]
 }
diff --git a/icons/arrow-down-z-a.json b/icons/arrow-down-z-a.json
index d0dfcb1d2..e34e3634d 100644
--- a/icons/arrow-down-z-a.json
+++ b/icons/arrow-down-z-a.json
@@ -27,7 +27,6 @@
       "name": "arrow-down-za",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-down-za"
+    }
   ]
 }
diff --git a/icons/arrow-up-0-1.json b/icons/arrow-up-0-1.json
index 5510e288a..786bf4e70 100644
--- a/icons/arrow-up-0-1.json
+++ b/icons/arrow-up-0-1.json
@@ -26,7 +26,6 @@
       "name": "arrow-up-01",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-up-01"
+    }
   ]
 }
diff --git a/icons/arrow-up-1-0.json b/icons/arrow-up-1-0.json
index 15f754e12..328c2c5bd 100644
--- a/icons/arrow-up-1-0.json
+++ b/icons/arrow-up-1-0.json
@@ -26,7 +26,6 @@
       "name": "arrow-up-10",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-up-10"
+    }
   ]
 }
diff --git a/icons/arrow-up-a-z.json b/icons/arrow-up-a-z.json
index 340081226..1dcff0f8e 100644
--- a/icons/arrow-up-a-z.json
+++ b/icons/arrow-up-a-z.json
@@ -26,7 +26,6 @@
       "name": "arrow-up-az",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-up-az"
+    }
   ]
 }
diff --git a/icons/arrow-up-z-a.json b/icons/arrow-up-z-a.json
index 3277961fc..53799ce63 100644
--- a/icons/arrow-up-z-a.json
+++ b/icons/arrow-up-z-a.json
@@ -27,7 +27,6 @@
       "name": "arrow-up-za",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "arrow-up-za"
+    }
   ]
 }
diff --git a/icons/axis-3d.json b/icons/axis-3d.json
index 7a115d009..1d95cd342 100644
--- a/icons/axis-3d.json
+++ b/icons/axis-3d.json
@@ -17,7 +17,6 @@
       "name": "axis-3-d",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "axis-3-d"
+    }
   ]
 }
diff --git a/icons/bone-fracture.svg b/icons/bone-fracture.svg
index cc7f42ee8..fc839a13a 100644
--- a/icons/bone-fracture.svg
+++ b/icons/bone-fracture.svg
@@ -15,4 +15,4 @@
   <path d="m4 8 2 1" />
   <path d="m8 4 1 2" />
   <path d="M9.698 14.19a.15.15 0 0 0 .112.112l2.074.489a.15.15 0 0 1 .072.252L10 17c-.7.7 0 1.69 0 2.5a1 1 0 0 1-5 0 .495.495 0 0 0-.5-.5 1 1 0 0 1 0-5c.81 0 1.8.7 2.5 0l1.956-1.957a.15.15 0 0 1 .252.072z" />
-</svg>
+</svg>
\ No newline at end of file
diff --git a/icons/database-arrow-down.svg b/icons/database-arrow-down.svg
index 1ef27e3b1..271726fd9 100644
--- a/icons/database-arrow-down.svg
+++ b/icons/database-arrow-down.svg
@@ -12,7 +12,7 @@
   <path d="m16 19 3 3 3-3" />
   <path d="M19 16v6" />
   <path d="M21 12.536V5" />
-  <path d="M3 12a9 3 0 0 0 12.182 2.806" />
-  <path d="M3 5v14a9 3 0 0 0 10.318 2.968" />
+  <path d="M3 12A9 3 0 0 0 15.182 14.806" />
+  <path d="M3 5V19A9 3 0 0 0 13.318 21.968" />
   <ellipse cx="12" cy="5" rx="9" ry="3" />
 </svg>
diff --git a/icons/database-arrow-up.svg b/icons/database-arrow-up.svg
index e9eb5f1af..210103d33 100644
--- a/icons/database-arrow-up.svg
+++ b/icons/database-arrow-up.svg
@@ -12,7 +12,7 @@
   <path d="M19 22v-6" />
   <path d="M21 12.536V5" />
   <path d="m22 19-3-3-3 3" />
-  <path d="M3 12a9 3 0 0 0 11.457 2.886" />
-  <path d="M3 5v14a9 3 0 0 0 10.318 2.968" />
+  <path d="M3 12A9 3 0 0 0 14.457 14.886" />
+  <path d="M3 5V19A9 3 0 0 0 13.318 21.968" />
   <ellipse cx="12" cy="5" rx="9" ry="3" />
 </svg>
diff --git a/icons/database-check.svg b/icons/database-check.svg
index 0aeed5eee..7284b3413 100644
--- a/icons/database-check.svg
+++ b/icons/database-check.svg
@@ -11,7 +11,7 @@
 >
   <path d="m16 19 2 2 4-4" />
   <path d="M21 13.127V5" />
-  <path d="M3 12a9 3 0 0 0 18 0" />
-  <path d="M3 5v14a9 3 0 0 0 10.318 2.968" />
+  <path d="M3 12A9 3 0 0 0 21 12" />
+  <path d="M3 5V19A9 3 0 0 0 13.318 21.968" />
   <ellipse cx="12" cy="5" rx="9" ry="3" />
 </svg>
diff --git a/icons/database-minus.svg b/icons/database-minus.svg
index 9ff060cff..f56d2beb6 100644
--- a/icons/database-minus.svg
+++ b/icons/database-minus.svg
@@ -11,7 +11,7 @@
 >
   <path d="M21 15V5" />
   <path d="M22 19h-6" />
-  <path d="M3 12a9 3 0 0 0 18 0" />
-  <path d="M3 5v14a9 3 0 0 0 10.318 2.968" />
+  <path d="M3 12A9 3 0 0 0 21 12" />
+  <path d="M3 5V19A9 3 0 0 0 13.318 21.968" />
   <ellipse cx="12" cy="5" rx="9" ry="3" />
 </svg>
diff --git a/icons/database-plus.svg b/icons/database-plus.svg
index 35c0e7c67..0c377e07f 100644
--- a/icons/database-plus.svg
+++ b/icons/database-plus.svg
@@ -12,7 +12,7 @@
   <path d="M19 16v6" />
   <path d="M21 12.536V5" />
   <path d="M22 19h-6" />
-  <path d="M3 12a9 3 0 0 0 12.182 2.806" />
-  <path d="M3 5v14a9 3 0 0 0 10.318 2.968" />
+  <path d="M3 12A9 3 0 0 0 15.1824 14.8061" />
+  <path d="M3 5V19A9 3 0 0 0 13.318 21.968" />
   <ellipse cx="12" cy="5" rx="9" ry="3" />
 </svg>
diff --git a/icons/database-x.svg b/icons/database-x.svg
index 07c1d5757..ab46918b2 100644
--- a/icons/database-x.svg
+++ b/icons/database-x.svg
@@ -13,7 +13,7 @@
   <path d="M19.323 13.744A9 3 0 0 0 21 12" />
   <path d="M21 13.127V5" />
   <path d="m22 17-5 5" />
-  <path d="M3 12a9 3 0 0 0 10.563 2.954" />
-  <path d="M3 5v14a9 3 0 0 0 10 2.981" />
+  <path d="M3 12A9 3 0 0 0 13.563 14.954" />
+  <path d="M3 5V19A9 3 0 0 0 13 21.981" />
   <ellipse cx="12" cy="5" rx="9" ry="3" />
 </svg>
diff --git a/icons/file-axis-3d.json b/icons/file-axis-3d.json
index 7ef73fa2d..1f512a43c 100644
--- a/icons/file-axis-3d.json
+++ b/icons/file-axis-3d.json
@@ -20,7 +20,6 @@
       "name": "file-axis-3-d",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "file-axis-3-d"
+    }
   ]
 }
diff --git a/icons/grid-2x2-check.json b/icons/grid-2x2-check.json
index 71b509e58..a89d0e213 100644
--- a/icons/grid-2x2-check.json
+++ b/icons/grid-2x2-check.json
@@ -33,7 +33,6 @@
       "name": "grid-2-x-2-check",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "grid-2-x-2-check"
+    }
   ]
 }
diff --git a/icons/grid-2x2-plus.json b/icons/grid-2x2-plus.json
index 8bdc4e8a0..32835a7dd 100644
--- a/icons/grid-2x2-plus.json
+++ b/icons/grid-2x2-plus.json
@@ -34,7 +34,6 @@
       "name": "grid-2-x-2-plus",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "grid-2-x-2-plus"
+    }
   ]
 }
diff --git a/icons/grid-2x2-x.json b/icons/grid-2x2-x.json
index b5f68e433..c84d666cb 100644
--- a/icons/grid-2x2-x.json
+++ b/icons/grid-2x2-x.json
@@ -33,7 +33,6 @@
       "name": "grid-2-x-2-x",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "grid-2-x-2-x"
+    }
   ]
 }
diff --git a/icons/grid-2x2.json b/icons/grid-2x2.json
index f9d737ab5..2500f7924 100644
--- a/icons/grid-2x2.json
+++ b/icons/grid-2x2.json
@@ -34,7 +34,6 @@
       "name": "grid-2-x-2",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "grid-2-x-2"
+    }
   ]
 }
diff --git a/icons/grid-3x3.json b/icons/grid-3x3.json
index e632819c2..76b11cc7b 100644
--- a/icons/grid-3x3.json
+++ b/icons/grid-3x3.json
@@ -28,7 +28,6 @@
       "name": "grid-3-x-3",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "grid-3-x-3"
+    }
   ]
 }
diff --git a/icons/move-3d.json b/icons/move-3d.json
index c4f3b7dad..a969e0e70 100644
--- a/icons/move-3d.json
+++ b/icons/move-3d.json
@@ -21,7 +21,6 @@
       "name": "move-3-d",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "move-3-d"
+    }
   ]
 }
diff --git a/icons/paper-bag.svg b/icons/paper-bag.svg
index 3bb264eb6..42fa1d6d4 100644
--- a/icons/paper-bag.svg
+++ b/icons/paper-bag.svg
@@ -9,6 +9,6 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M5.364 3.848C4 6 3 9.652 3 12.652V19a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-5c0-2.334-1.816-4.668-2.622-7.002" />
-  <path d="M7 3h11.379a2 2 0 0 1 1.789 1.106l.723 1.447A1 1 0 0 1 19.997 7h-8.525a2 2 0 0 1-1.789-1.106L8.79 4.105a2 2 0 1 0-3.579 1.789l2.261 4.522A5 5 0 0 1 8 12.652V21" />
+  <path d="M5.364 3.848C4 6 3 9.652 3 12.652V19a2 2 0 002 2h14a2 2 0 002-2v-5c0-2.334-1.816-4.668-2.622-7.002" />
+  <path d="M7 3h11.379a2 2 0 011.789 1.106l.723 1.447A1 1 0 0119.997 7h-8.525a2 2 0 01-1.789-1.106L8.79 4.105a2 2 0 10-3.579 1.789l2.261 4.522A5 5 0 018 12.652V21" />
 </svg>
diff --git a/icons/rotate-3d.json b/icons/rotate-3d.json
index df388f804..9a2ca069d 100644
--- a/icons/rotate-3d.json
+++ b/icons/rotate-3d.json
@@ -19,7 +19,6 @@
       "name": "rotate-3-d",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "rotate-3-d"
+    }
   ]
 }
diff --git a/icons/save-pen.svg b/icons/save-pen.svg
index 6c00d4339..08d1b114c 100644
--- a/icons/save-pen.svg
+++ b/icons/save-pen.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M13.33 13H8a1 1 0 0 0-1 1v7" />
-  <path d="M14.363 17.634a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506l4.013-4.009a1 1 0 1 0-3.004-3.004z" />
-  <path d="M7 3v4a1 1 0 0 0 1 1h7" />
-  <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h10.2a2 2 0 0 1 1.4.6l3.8 3.8a2 2 0 0 1 .6 1.4v.3" />
+  <path d="M13.33 13H8a1 1 0 00-1 1v7" />
+  <path d="M14.363 17.634a2 2 0 00-.506.854l-.837 2.87a.5.5 0 00.62.62l2.87-.837a2 2 0 00.854-.506l4.013-4.009a1 1 0 10-3.004-3.004z" />
+  <path d="M7 3v4a1 1 0 001 1h7" />
+  <path d="M9 21H5a2 2 0 01-2-2V5a2 2 0 012-2h10.2a2 2 0 011.4.6l3.8 3.8a2 2 0 01.6 1.4v.3" />
 </svg>
diff --git a/icons/scale-3d.json b/icons/scale-3d.json
index a74b38005..4906533f2 100644
--- a/icons/scale-3d.json
+++ b/icons/scale-3d.json
@@ -20,7 +20,6 @@
       "name": "scale-3-d",
       "deprecationReason": "alias.name",
       "deprecated": true
-    },
-    "scale-3-d"
+    }
   ]
 }
diff --git a/icons/square-arrow-down-left.svg b/icons/square-arrow-down-left.svg
index 7d7693ed9..31eeb9bad 100644
--- a/icons/square-arrow-down-left.svg
+++ b/icons/square-arrow-down-left.svg
@@ -11,5 +11,5 @@
 >
   <path d="M15 15H9l6-6" />
   <path d="M9 15V9" />
-  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <rect x="3" y="3" width="18" height="18" rx="2" />
 </svg>
diff --git a/icons/square-arrow-down-right.svg b/icons/square-arrow-down-right.svg
index 936413ecf..ac131302b 100644
--- a/icons/square-arrow-down-right.svg
+++ b/icons/square-arrow-down-right.svg
@@ -11,5 +11,5 @@
 >
   <path d="M15 15 9 9" />
   <path d="M9 15h6V9" />
-  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <rect x="3" y="3" width="18" height="18" rx="2" />
 </svg>
diff --git a/icons/square-arrow-up-left.svg b/icons/square-arrow-up-left.svg
index 27bc4ed00..f93c447cf 100644
--- a/icons/square-arrow-up-left.svg
+++ b/icons/square-arrow-up-left.svg
@@ -11,5 +11,5 @@
 >
   <path d="M15 15 9 9" />
   <path d="M9 15V9h6" />
-  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <rect x="3" y="3" width="18" height="18" rx="2" />
 </svg>
diff --git a/icons/square-arrow-up-right.svg b/icons/square-arrow-up-right.svg
index cf352fa99..d68d22524 100644
--- a/icons/square-arrow-up-right.svg
+++ b/icons/square-arrow-up-right.svg
@@ -11,5 +11,5 @@
 >
   <path d="M15 15V9H9" />
   <path d="m9 15 6-6" />
-  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <rect x="3" y="3" width="18" height="18" rx="2" />
 </svg>
diff --git a/icons/tag-plus.svg b/icons/tag-plus.svg
index d4f73e847..ce3cb0b53 100644
--- a/icons/tag-plus.svg
+++ b/icons/tag-plus.svg
@@ -12,5 +12,5 @@
   <path d="M16 13h6" />
   <path d="m16.5 6.5-3.914-3.914A2 2 0 0 0 11.172 2H4a2 2 0 0 0-2 2v7.172a2 2 0 0 0 .586 1.414l8.704 8.704a2.426 2.426 0 0 0 3.42 0l1.79-1.79" />
   <path d="M19 10v6" />
-  <circle cx="7.5" cy="7.5" r=".5" />
+  <circle cx="7.5" cy="7.5" r=".5" fill="currentColor" />
 </svg>
diff --git a/icons/tag-x.svg b/icons/tag-x.svg
index 37cf6d706..3c5e5df43 100644
--- a/icons/tag-x.svg
+++ b/icons/tag-x.svg
@@ -12,5 +12,5 @@
   <path d="m16.5 6.5-3.914-3.914A2 2 0 0 0 11.172 2H4a2 2 0 0 0-2 2v7.172a2 2 0 0 0 .586 1.414l8.704 8.704a2.43 2.43 0 0 0 3.42 0l1.79-1.79" />
   <path d="m16.5 10.5 5 5" />
   <path d="m21.5 10.5-5 5" />
-  <circle cx="7.5" cy="7.5" r=".5" />
+  <circle cx="7.5" cy="7.5" r=".5" fill="currentColor" />
 </svg>
diff --git a/icons/ungroup.svg b/icons/ungroup.svg
index d7f2780a3..cb11f0b3b 100644
--- a/icons/ungroup.svg
+++ b/icons/ungroup.svg
@@ -9,6 +9,6 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="10" height="7" x="11" y="14" rx="2" />
-  <rect width="10" height="7" x="3" y="3" rx="2" />
+  <rect x="11" y="14" width="10" height="7" rx="2" />
+  <rect x="3" y="3" width="10" height="7" rx="2" />
 </svg>
diff --git a/icons/wallet-cards.svg b/icons/wallet-cards.svg
index 9e89da51c..5cc2f0005 100644
--- a/icons/wallet-cards.svg
+++ b/icons/wallet-cards.svg
@@ -11,5 +11,5 @@
 >
   <path d="M3 11h3.75a2 2 0 0 1 1.6.8l.45.6a4 4 0 0 0 6.4 0l.45-.6a2 2 0 0 1 1.6-.8H21" />
   <path d="M3 7h18" />
-  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <rect x="3" y="3" width="18" height="18" rx="2" />
 </svg>