diff --git a/icons/light_overlay.png b/icons/light_overlay.png
new file mode 100644
index 0000000..68ebe2e
Binary files /dev/null and b/icons/light_overlay.png differ
diff --git a/icons/minimap.png b/icons/minimap.png
new file mode 100644
index 0000000..d1d17db
Binary files /dev/null and b/icons/minimap.png differ
diff --git a/icons/mod_menu.png b/icons/mod_menu.png
new file mode 100644
index 0000000..7d3274d
Binary files /dev/null and b/icons/mod_menu.png differ
diff --git a/icons/motion_blur.png b/icons/motion_blur.png
new file mode 100644
index 0000000..e22d085
Binary files /dev/null and b/icons/motion_blur.png differ
diff --git a/icons/recipes.png b/icons/recipes.png
new file mode 100644
index 0000000..2634fe1
Binary files /dev/null and b/icons/recipes.png differ
diff --git a/icons/resourcify.png b/icons/resourcify.png
new file mode 100644
index 0000000..87f013d
Binary files /dev/null and b/icons/resourcify.png differ
diff --git a/icons/rmotd.png b/icons/rmotd.png
new file mode 100644
index 0000000..e57e5fa
Binary files /dev/null and b/icons/rmotd.png differ
diff --git a/mods/light_overlay.toml b/mods/light_overlay.toml
index 18c9d86..7763afc 100644
--- a/mods/light_overlay.toml
+++ b/mods/light_overlay.toml
@@ -8,6 +8,9 @@ owners = ["CayMac97"]
 owner_ids = [197672048]
 license = "MIT"
 source = "https://github.com/CayMac97/light-overlay"
+icon = "icons/light_overlay.png"
+categories = ["utility", "mobs"]
+tags = ["light-level", "mob-spawning", "overlay", "minihud", "port"]
 key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
 
 [[versions]]
diff --git a/mods/lookat.toml b/mods/lookat.toml
index fab2d3e..992a325 100644
--- a/mods/lookat.toml
+++ b/mods/lookat.toml
@@ -18,6 +18,8 @@ owner_ids = [36463198]
 license = "MIT"
 source = "https://github.com/d3grando/lookat"
 icon = "icons/lookat.png"
+categories = ["utility"]
+tags = ["tooltip", "hud", "block-info", "waila"]
 
 [[versions]]
 version = "0.2.1"
diff --git a/mods/menu_panorama.toml b/mods/menu_panorama.toml
index 6467fd4..6f45618 100644
--- a/mods/menu_panorama.toml
+++ b/mods/menu_panorama.toml
@@ -22,6 +22,8 @@ owner_ids = [230844871]
 license = "MIT"
 source = "https://github.com/form1t/menu-panorama"
 icon = "icons/menu_panorama.png"
+categories = ["gui", "themed"]
+tags = ["panorama", "main-menu", "title-screen", "wallpaper", "background"]
 
 [[versions]]
 version = "1.0.0"
diff --git a/mods/minimap.toml b/mods/minimap.toml
index cc28a14..47948b7 100644
--- a/mods/minimap.toml
+++ b/mods/minimap.toml
@@ -21,6 +21,9 @@ owners = ["ludovic111"]
 owner_ids = [136255825]
 license = "MIT"
 source = "https://github.com/horizon-rust/horizon-mods/tree/main/native/minimap"
+icon = "icons/minimap.png"
+categories = ["utility", "adventure"]
+tags = ["minimap", "map", "navigation", "hud"]
 
 [[versions]]
 version = "2.0.0"
diff --git a/mods/mod_menu.toml b/mods/mod_menu.toml
index b70ecb1..6597b04 100644
--- a/mods/mod_menu.toml
+++ b/mods/mod_menu.toml
@@ -3,17 +3,23 @@ kind = "native-mod"
 name = "Mod Menu"
 summary = "ModMenu For Horizon"
 description = """
-Adds a Mods button next to Accessibility on the title screen. It opens a Mod Menu style screen that lists every mod you have installed, with its icon, name, version and description.
+A Mods button on the title screen, in the icon row after Accessibility, opening a screen laid out like the
+Java [Mod Menu](https://modrinth.com/mod/modmenu)'s: every mod you have installed, with its icon, name, version and
+description. A clean-room native mod for Horizon, with no Mod Menu code.
 
-- Search by name, id or description, and filter by on, off, native or content mods.
-- Pick a mod to see its details, turn it on or off, or open its own settings page.
-- Open Mods Folder and Done at the bottom, as in the Java mod."""
+- **Search** by name, id or description, and **filter** by all, on, off, native or content mods.
+- **Pick a mod** to see its version, type, description and any problems, turn it on or off, or open its own settings
+  page.
+- **Open Mods Folder** and **Done** at the bottom, as in the Java mod.
+- The keyboard works too: type to search, arrows and Page Up/Down to pick a mod, Escape to leave."""
 authors = ["tariksabanuz"]
 owners = ["tariksabanuz"]
 owner_ids = [332662152]
 license = "MIT"
 source = "https://github.com/tariksabanuz/ModMenuHorizon"
-icon = "https://raw.githubusercontent.com/tariksabanuz/ModMenuHorizon/caec7c4c3a2c6c7746a97d137ccf8f8904801e72/icon.png"
+icon = "icons/mod_menu.png"
+categories = ["utility", "management"]
+tags = ["mod-menu", "mods-list", "settings", "ui", "port"]
 
 [[versions]]
 version = "0.3.3"
diff --git a/mods/motion_blur.toml b/mods/motion_blur.toml
index 4ce1135..cdb5795 100644
--- a/mods/motion_blur.toml
+++ b/mods/motion_blur.toml
@@ -13,6 +13,9 @@ owners = ["levzzz5154"]
 owner_ids = [86072227]
 license = "MIT"
 source = "https://github.com/levzzz5154/horizon-motion-blur"
+icon = "icons/motion_blur.png"
+categories = ["decoration"]
+tags = ["motion-blur", "post-processing", "graphics", "visual"]
 
 [[versions]]
 version = "0.1.0"
diff --git a/mods/mousetricks.toml b/mods/mousetricks.toml
index 5a6a142..1184592 100644
--- a/mods/mousetricks.toml
+++ b/mods/mousetricks.toml
@@ -17,6 +17,8 @@ owner_ids = [36463198]
 license = "MIT"
 source = "https://github.com/d3grando/mousetricks"
 icon = "icons/mousetricks.png"
+categories = ["storage", "utility"]
+tags = ["inventory", "mouse", "sorting", "drag", "quick-move"]
 
 [[versions]]
 version = "0.2.0"
diff --git a/mods/recipes.toml b/mods/recipes.toml
index 81c40de..4adcc10 100644
--- a/mods/recipes.toml
+++ b/mods/recipes.toml
@@ -25,6 +25,9 @@ owners = ["ludovic111"]
 owner_ids = [136255825]
 license = "MIT"
 source = "https://github.com/horizon-rust/horizon-mods/tree/main/native/recipes"
+icon = "icons/recipes.png"
+categories = ["utility"]
+tags = ["recipes", "item-browser", "recipe-viewer", "search"]
 
 [[versions]]
 version = "2.0.0"
diff --git a/mods/resourcify.toml b/mods/resourcify.toml
index c34bacf..2c4d29a 100644
--- a/mods/resourcify.toml
+++ b/mods/resourcify.toml
@@ -19,7 +19,9 @@ owners = ["tariksabanuz"]
 owner_ids = [332662152]
 license = "MIT"
 source = "https://github.com/tariksabanuz/ResourcifyHorizon"
-icon = "https://github.com/tariksabanuz/ResourcifyHorizon/blob/364648324ac0e67489a3f06faa716d96d24668ed/icon.png"
+icon = "icons/resourcify.png"
+categories = ["utility", "management"]
+tags = ["resource-packs", "modrinth", "browser", "download"]
 
 [[versions]]
 version = "0.1.1"
diff --git a/mods/right_click_crops.toml b/mods/right_click_crops.toml
index deb1ed2..be233df 100644
--- a/mods/right_click_crops.toml
+++ b/mods/right_click_crops.toml
@@ -34,6 +34,8 @@ owner_ids = [82058189]
 license = "MIT"
 source = "https://github.com/AyanoKaito/horizon-right-click-crops"
 icon = "icons/right_click_crops.png"
+categories = ["utility", "food"]
+tags = ["farming", "crops", "harvest", "replant"]
 key = "RWRwbuaByP5mM4VUm4kZEQVPiuw+3IEVJ7CZcEHIjY5fPKf9lhQKUZRy"
 
 [[versions]]
diff --git a/mods/rightharvest.toml b/mods/rightharvest.toml
index e43824a..7700350 100644
--- a/mods/rightharvest.toml
+++ b/mods/rightharvest.toml
@@ -8,7 +8,9 @@ owners = ["Domanffe"]
 owner_ids = [94391234]
 license = "MIT"
 source = "https://github.com/Domanffe/rightharvest"
-icon = "https://horizon-rust.github.io/horizon-mods/icons/rightharvest.png"
+icon = "icons/rightharvest.png"
+categories = ["utility", "food"]
+tags = ["farming", "crops", "harvest", "replant"]
 
 [[versions]]
 version = "0.1.1"
diff --git a/mods/rmotd.toml b/mods/rmotd.toml
index 0b62371..60de47e 100644
--- a/mods/rmotd.toml
+++ b/mods/rmotd.toml
@@ -20,6 +20,9 @@ Source: `horizon/` in https://github.com/Vakarux12/RMotd, a fork of the original
 authors = ["adasjusk", "Vakarux12"]
 license = "CC-BY-SA-4.0"
 source = "https://github.com/Vakarux12/RMotd/tree/main/horizon"
+icon = "icons/rmotd.png"
+categories = ["utility", "management"]
+tags = ["motd", "server-list", "lan", "commands", "port"]
 
 [[versions]]
 version = "1.0.0"
diff --git a/mods/serverify.toml b/mods/serverify.toml
index 2b84e1d..a8f82da 100644
--- a/mods/serverify.toml
+++ b/mods/serverify.toml
@@ -42,6 +42,8 @@ owner_ids = [87802271]
 license = "GPL-3.0-only"
 source = "https://github.com/Louchatfroff/serverify"
 icon = "icons/serverify.png"
+categories = ["social", "utility"]
+tags = ["server-list", "servers", "multiplayer", "browser"]
 
 [[versions]]
 version = "0.1.0"