diff --git a/MiraAPI/Patches/RoleGuidePatches.cs b/MiraAPI/Patches/RoleGuidePatches.cs
index 4fa782f..523bce2 100644
--- a/MiraAPI/Patches/RoleGuidePatches.cs
+++ b/MiraAPI/Patches/RoleGuidePatches.cs
@@ -20,7 +20,19 @@ namespace MiraAPI.Patches;
 [HarmonyPatch]
 public static class RoleGuidePatches
 {
-    public static PassiveButton ViewButton;
+    public static PassiveButton SearchIconButton;
+    private static SpriteRenderer _searchIconIdle;
+    private static SpriteRenderer _searchIconHover;
+    public static PassiveButton SearchSortingOrderButton;
+    private static SpriteRenderer _searchSortingOrderIdle;
+    private static SpriteRenderer _searchSortingOrderHover;
+    public static PassiveButton SearchSortingGroupButton;
+    private static SpriteRenderer _searchSortingGroupIdle;
+    private static SpriteRenderer _searchSortingGroupHover;
+    public static PassiveButton SearchSortingFilterButton;
+    private static SpriteRenderer _searchSortingFilterIdle;
+    private static SpriteRenderer _searchSortingFilterHover;
+    private static Scroller _rolesScroller;
     [HarmonyPostfix]
     [HarmonyPriority(Priority.First)]
     [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.CreateNormalModeSettings))]
@@ -110,16 +122,49 @@ public static class RoleGuidePatches
         {
             if (__instance.NormalModeSettings.Count == 0)
             {
-                var settingsButton = Object.Instantiate(
+                var sortingOrderButton = Object.Instantiate(
                     HudManager.Instance.SettingsButton,
                     __instance.TabButtons[2].transform.parent);
-                ViewButton = settingsButton.GetComponent<PassiveButton>();
-                ViewButton.OnClick = new Button.ButtonClickedEvent();
-                ViewButton.OnClick.AddListener(new Action(SwitchOrder));
-                ViewButton.name = "ViewButton";
-                settingsButton.transform.localPosition = new Vector3(2.4f, 0.765f, -0.1f);
-                settingsButton.transform.localScale = Vector3.one;
-                settingsButton.transform.GetChild(2).gameObject.SetActive(false);
+                SearchSortingOrderButton = sortingOrderButton.GetComponent<PassiveButton>();
+                SearchSortingOrderButton.name = "SearchSortingOrderButton";
+                _searchSortingOrderIdle = SearchSortingOrderButton.inactiveSprites.GetComponent<SpriteRenderer>();
+                _searchSortingOrderIdle.sprite = MiraAssets.SortingAzIdleSprite;
+                _searchSortingOrderHover = SearchSortingOrderButton.activeSprites.GetComponent<SpriteRenderer>();
+                _searchSortingOrderHover.sprite = MiraAssets.SortingAzHoverSprite;
+                SearchSortingOrderButton.OnClick = new Button.ButtonClickedEvent();
+                SearchSortingOrderButton.OnClick.AddListener(new Action(SwitchMethod));
+                sortingOrderButton.transform.localPosition = new Vector3(2.4f, 0.765f, -0.1f);
+                sortingOrderButton.transform.localScale = Vector3.one;
+                sortingOrderButton.transform.GetChild(2).gameObject.SetActive(false);
+
+                var sortingGroupButton = Object.Instantiate(
+                    sortingOrderButton,
+                    sortingOrderButton.transform.parent);
+                SearchSortingGroupButton = sortingGroupButton.GetComponent<PassiveButton>();
+                SearchSortingGroupButton.name = "SearchSortingGroupButton";
+                _searchSortingGroupIdle = SearchSortingGroupButton.inactiveSprites.GetComponent<SpriteRenderer>();
+                _searchSortingGroupIdle.sprite = MiraAssets.GroupNoneIdleSprite;
+                _searchSortingGroupHover = SearchSortingGroupButton.activeSprites.GetComponent<SpriteRenderer>();
+                _searchSortingGroupHover.sprite = MiraAssets.GroupNoneHoverSprite;
+                SearchSortingGroupButton.OnClick = new Button.ButtonClickedEvent();
+                SearchSortingGroupButton.OnClick.AddListener(new Action(SwitchGrouping));
+                sortingGroupButton.transform.localPosition = new Vector3(1.8f, 0.765f, -0.1f);
+                sortingGroupButton.transform.localScale = Vector3.one;
+
+                var sortingFilterButton = Object.Instantiate(
+                    sortingOrderButton,
+                    sortingOrderButton.transform.parent);
+                SearchSortingFilterButton = sortingFilterButton.GetComponent<PassiveButton>();
+                SearchSortingFilterButton.name = "SearchSortingFilterButton";
+                _searchSortingFilterIdle = SearchSortingFilterButton.inactiveSprites.GetComponent<SpriteRenderer>();
+                _searchSortingFilterIdle.sprite = MiraAssets.VisibleOnIdleSprite;
+                _searchSortingFilterHover = SearchSortingFilterButton.activeSprites.GetComponent<SpriteRenderer>();
+                _searchSortingFilterHover.sprite = MiraAssets.VisibleOnHoverSprite;
+                SearchSortingFilterButton.OnClick = new Button.ButtonClickedEvent();
+                SearchSortingFilterButton.OnClick.AddListener(new Action(SwitchFilter));
+                sortingFilterButton.transform.localPosition = new Vector3(1f, 0.765f, -0.1f);
+                sortingFilterButton.transform.localScale = Vector3.one;
+
                 __instance.numOfTabs = 3;
                 __instance.TabButtons[0].SelectButton(true);
                 __instance.MatchInfoRoleMaskArea.transform.localPosition = new Vector3(-0.0184f, 0.15f, -0.1f);
@@ -157,6 +202,20 @@ public static class RoleGuidePatches
 
                 DisplayNormalRoleSettings(__instance, true);
 
+                var searchIconButton = Object.Instantiate(
+                    sortingOrderButton,
+                    sortingOrderButton.transform.parent);
+                SearchIconButton = searchIconButton.GetComponent<PassiveButton>();
+                SearchIconButton.name = "SearchIconButton";
+                _searchIconIdle = SearchIconButton.inactiveSprites.GetComponent<SpriteRenderer>();
+                _searchIconIdle.sprite = MiraAssets.SearchIconIdleSprite;
+                _searchIconHover = SearchIconButton.activeSprites.GetComponent<SpriteRenderer>();
+                _searchIconHover.sprite = MiraAssets.SearchIconHoverSprite;
+                SearchIconButton.OnClick = new Button.ButtonClickedEvent();
+                SearchIconButton.OnClick.AddListener(new Action(ClearSearchText));
+                searchIconButton.transform.localPosition = new Vector3(-2.79f, 0.765f, -0.1f);
+                searchIconButton.transform.localScale = Vector3.one;
+
                 var searchBox = Object.Instantiate(__instance.TabButtons[2].gameObject, __instance.TabButtons[2].transform.parent);
                 var searchButton = searchBox.GetComponent<MatchInfoGuideTabButton>();
                 var tmpText = searchButton.transform.GetChild(0).GetComponent<TextMeshPro>();
@@ -191,12 +250,22 @@ public static class RoleGuidePatches
                     }));
                 button.OnMouseOver = new UnityEvent();
                 button.OnMouseOut = new UnityEvent();
-                var mainScroller = __instance.settingsTabs[2].GetComponent<Scroller>();
+                _rolesScroller = __instance.settingsTabs[2].GetComponent<Scroller>();
                 searchBoxTmp.OnChange = new Button.ButtonClickedEvent();
                 searchBoxTmp.OnChange.AddListener(
                     (UnityAction)(() =>
                     {
                         var text = searchBoxTmp.outputText.text;
+                        if (text != string.Empty)
+                        {
+                            _searchIconIdle.sprite = MiraAssets.SearchClearIdleSprite;
+                            _searchIconHover.sprite = MiraAssets.SearchClearHoverSprite;
+                        }
+                        else
+                        {
+                            _searchIconIdle.sprite = MiraAssets.SearchIconIdleSprite;
+                            _searchIconHover.sprite = MiraAssets.SearchIconHoverSprite;
+                        }
                         var newSorted = RolePanels
                             .OrderByDescending(child =>
                                 child.Value.GetTitle().Equals(text, StringComparison.OrdinalIgnoreCase))
@@ -210,7 +279,7 @@ public static class RoleGuidePatches
                             pair.Value.Panel.transform.SetAsLastSibling();
                         }
 
-                        mainScroller.ScrollToTop();
+                        _rolesScroller.ScrollToTop();
                     }));
                 searchBoxTmp.transform.localPosition = new Vector3(-1.438f, 0.756f, -0.2f);
 
@@ -272,7 +341,7 @@ public static class RoleGuidePatches
             else
             {
                 DisplayNormalRoleSettings(__instance, false);
-                searchBoxTmp.SetText(string.Empty);
+                ClearSearchText();
             }
         }
         else if (__instance.HnSModeSettings.Count == 0)
@@ -314,7 +383,22 @@ public static class RoleGuidePatches
 
     private static SortingFilter sortFilter = SortingFilter.EnabledOnly;
     private static SortingMethod sortMethod = SortingMethod.Alphabetical;
-    private static SortingOrder sortOrder = SortingOrder.RoleName;
+    private static SortingGroups sortOrder = SortingGroups.Ungrouped;
+
+    public static void ClearSearchText()
+    {
+        _searchIconIdle.sprite = MiraAssets.SearchIconIdleSprite;
+        _searchIconHover.sprite = MiraAssets.SearchIconHoverSprite;
+        searchBoxTmp.SetText(string.Empty);
+        var newSorted = sortMethod is SortingMethod.Alphabetical ? RolePanels.OrderBy(GetSortingOrder()) : RolePanels.OrderByDescending(GetSortingOrder());
+
+        foreach (var pair in newSorted)
+        {
+            pair.Value.Panel.transform.SetAsLastSibling();
+        }
+
+        _rolesScroller.ScrollToTop();
+    }
 
     public static void SwitchFilter()
     {
@@ -328,6 +412,23 @@ public static class RoleGuidePatches
             sortFilter = SortingFilter.EnabledOnly;
         }
 
+        switch (sortFilter)
+        {
+            case SortingFilter.AllRoles:
+                _searchSortingFilterIdle.sprite = MiraAssets.VisibleAllIdleSprite;
+                _searchSortingFilterHover.sprite = MiraAssets.VisibleAllHoverSprite;
+                break;
+            case SortingFilter.DisabledOnly:
+                _searchSortingFilterIdle.sprite = MiraAssets.VisibleOffIdleSprite;
+                _searchSortingFilterHover.sprite = MiraAssets.VisibleOffHoverSprite;
+                break;
+            default:
+                _searchSortingFilterIdle.sprite = MiraAssets.VisibleOnIdleSprite;
+                _searchSortingFilterHover.sprite = MiraAssets.VisibleOnHoverSprite;
+                break;
+        }
+
+        ToggleRoleVisibility();
         var newSorted = sortMethod is SortingMethod.Alphabetical ? RolePanels.OrderBy(GetSortingOrder()) : RolePanels.OrderByDescending(GetSortingOrder());
 
         foreach (var pair in newSorted)
@@ -348,6 +449,9 @@ public static class RoleGuidePatches
             sortMethod = SortingMethod.Alphabetical;
         }
 
+        _searchSortingOrderIdle.sprite = sortMethod is SortingMethod.Alphabetical ? MiraAssets.SortingAzIdleSprite : MiraAssets.SortingZaIdleSprite;
+        _searchSortingOrderHover.sprite = sortMethod is SortingMethod.Alphabetical ? MiraAssets.SortingAzHoverSprite : MiraAssets.SortingZaHoverSprite;
+
         var newSorted = sortMethod is SortingMethod.Alphabetical ? RolePanels.OrderBy(GetSortingOrder()) : RolePanels.OrderByDescending(GetSortingOrder());
 
         foreach (var pair in newSorted)
@@ -356,16 +460,32 @@ public static class RoleGuidePatches
         }
     }
 
-    public static void SwitchOrder()
+    public static void SwitchGrouping()
     {
-        var stepUp = (SortingOrder)((int)sortOrder + 1);
+        var stepUp = (SortingGroups)((int)sortOrder + 1);
         if (Enum.IsDefined(stepUp))
         {
             sortOrder = stepUp;
         }
         else
         {
-            sortOrder = SortingOrder.RoleName;
+            sortOrder = SortingGroups.Ungrouped;
+        }
+
+        switch (sortOrder)
+        {
+            case SortingGroups.Faction:
+                _searchSortingGroupIdle.sprite = MiraAssets.GroupFactionIdleSprite;
+                _searchSortingGroupHover.sprite = MiraAssets.GroupFactionHoverSprite;
+                break;
+            case SortingGroups.AmountChance:
+                _searchSortingGroupIdle.sprite = MiraAssets.GroupCountIdleSprite;
+                _searchSortingGroupHover.sprite = MiraAssets.GroupCountHoverSprite;
+                break;
+            default:
+                _searchSortingGroupIdle.sprite = MiraAssets.GroupNoneIdleSprite;
+                _searchSortingGroupHover.sprite = MiraAssets.GroupNoneHoverSprite;
+                break;
         }
 
         var newSorted = sortMethod is SortingMethod.Alphabetical ? RolePanels.OrderBy(GetSortingOrder()) : RolePanels.OrderByDescending(GetSortingOrder());
@@ -457,13 +577,28 @@ public static class RoleGuidePatches
 
         advancedWikiTab?.gameObject.SetActive(false);
 
+        ToggleRoleVisibility();
+        if (reset)
+        {
+            instance.CreatePlayerEntries();
+        }
+    }
+
+    public static void ToggleRoleVisibility()
+    {
         var num = 0;
         foreach (var (roleData, holder) in RolePanels)
         {
             var panel = holder.Panel;
             var amount = GameOptionsManager.Instance.CurrentGameOptions.RoleOptions.GetNumPerGame(roleData.Role);
             var chance = GameOptionsManager.Instance.CurrentGameOptions.RoleOptions.GetChancePerGame(roleData.Role);
-            var forciblyShow = roleData is ICustomRole custom ? custom.ForceShowRoleOnWiki : null;
+            var showVal = roleData is ICustomRole custom ? custom.ForceShowRoleOnWiki : null;
+            var forciblyShow = showVal switch
+            {
+                true => 2,
+                false => 1,
+                _ => 0,
+            };
             panel.SetPanel(
                 roleData,
                 amount,
@@ -471,9 +606,14 @@ public static class RoleGuidePatches
             holder.Amount = amount;
             holder.Chance = chance;
             holder.LikelyhoodOfRole = amount * chance;
-            if (amount == 0 || chance == 0 || (Enum.IsDefined(roleData.Role) && roleData.IsRoleBlacklisted()) ||
-                (roleData is ICustomRole custom2 && ((!custom2.CanSpawnOnCurrentMode() && forciblyShow == null) ||
-                                                                    (forciblyShow.HasValue && !forciblyShow.Value))))
+            var isRoleDisabled = amount == 0 || chance == 0;
+            var isRoleNotVisible = (roleData is ICustomRole custom2 &&
+                                    !custom2.CanSpawnOnCurrentMode()) ||
+                                    (Enum.IsDefined(roleData.Role) && roleData.IsRoleBlacklisted());
+            if ((forciblyShow == 0 && ((isRoleDisabled && sortFilter is SortingFilter.EnabledOnly) ||
+                                       (!isRoleDisabled && sortFilter is SortingFilter.DisabledOnly) ||
+                                       isRoleNotVisible))
+                || forciblyShow == 1)
             {
                 panel.gameObject.SetActive(false);
                 continue;
@@ -490,6 +630,7 @@ public static class RoleGuidePatches
             pair.Value.Panel.transform.SetAsLastSibling();
         }
 
+        var instance = MatchInfoGuide.Instance;
         if (num == 0)
         {
             instance.rolesEnabledMessage.SetActive(true);
@@ -497,19 +638,15 @@ public static class RoleGuidePatches
 
         instance.MatchInfoRoleScroller.SetYBoundsMax(Mathf.Clamp(Mathf.Ceil(num / 2f) * 1.3f - 1.5f, 0f, 999f));
         instance.MatchInfoRoleScroller.SetYBoundsMax(Mathf.Clamp(Mathf.Ceil(num / 2f) * 1.3f - 1.5f, 0f, 999f));
-        if (reset)
-        {
-            instance.CreatePlayerEntries();
-        }
     }
 
     public static Func<KeyValuePair<RoleBehaviour, DetailedPanel>, string> GetSortingOrder()
     {
         switch (sortOrder)
         {
-            case SortingOrder.Faction:
+            case SortingGroups.Faction:
                 return x => $"{x.Value.Category} ({x.Value.Title}) {x.Value.LikelyhoodOfRole.ToString("0000.0", CultureInfo.InvariantCulture)}";
-            case SortingOrder.AmountChance:
+            case SortingGroups.AmountChance:
                 return x => $"{x.Value.LikelyhoodOfRole.ToString("0000.0", CultureInfo.InvariantCulture)} {x.Value.Title} ({x.Value.Category})";
             default:
                 return x => $"{x.Value.Title} ({x.Value.Category}) {x.Value.LikelyhoodOfRole.ToString("0000.0", CultureInfo.InvariantCulture)}";
@@ -520,9 +657,9 @@ public static class RoleGuidePatches
     {
         switch (sortOrder)
         {
-            case SortingOrder.Faction:
+            case SortingGroups.Faction:
                 return $"{panel.Category} ({panel.Title}) {panel.LikelyhoodOfRole.ToString("0000.0", CultureInfo.InvariantCulture)}";
-            case SortingOrder.AmountChance:
+            case SortingGroups.AmountChance:
                 return $"{panel.LikelyhoodOfRole.ToString("0000.0", CultureInfo.InvariantCulture)} {panel.Title} ({panel.Category})";
             default:
                 return $"{panel.Title} ({panel.Category}) {panel.LikelyhoodOfRole.ToString("0000.0", CultureInfo.InvariantCulture)}";
@@ -673,9 +810,9 @@ public static class RoleGuidePatches
     }
 }
 
-public enum SortingOrder
+public enum SortingGroups
 {
-    RoleName,
+    Ungrouped,
     Faction,
     AmountChance
 }
diff --git a/MiraAPI/Resources/Wiki/GroupCountHover.png b/MiraAPI/Resources/Wiki/GroupCountHover.png
new file mode 100644
index 0000000..0e8ec76
Binary files /dev/null and b/MiraAPI/Resources/Wiki/GroupCountHover.png differ
diff --git a/MiraAPI/Resources/Wiki/GroupCountIdle.png b/MiraAPI/Resources/Wiki/GroupCountIdle.png
new file mode 100644
index 0000000..5bf5f98
Binary files /dev/null and b/MiraAPI/Resources/Wiki/GroupCountIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/GroupFactionHover.png b/MiraAPI/Resources/Wiki/GroupFactionHover.png
new file mode 100644
index 0000000..864e94d
Binary files /dev/null and b/MiraAPI/Resources/Wiki/GroupFactionHover.png differ
diff --git a/MiraAPI/Resources/Wiki/GroupFactionIdle.png b/MiraAPI/Resources/Wiki/GroupFactionIdle.png
new file mode 100644
index 0000000..1d50880
Binary files /dev/null and b/MiraAPI/Resources/Wiki/GroupFactionIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/GroupNoneHover.png b/MiraAPI/Resources/Wiki/GroupNoneHover.png
new file mode 100644
index 0000000..dd303b2
Binary files /dev/null and b/MiraAPI/Resources/Wiki/GroupNoneHover.png differ
diff --git a/MiraAPI/Resources/Wiki/GroupNoneIdle.png b/MiraAPI/Resources/Wiki/GroupNoneIdle.png
new file mode 100644
index 0000000..c215f2f
Binary files /dev/null and b/MiraAPI/Resources/Wiki/GroupNoneIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/SearchClearHover.png b/MiraAPI/Resources/Wiki/SearchClearHover.png
new file mode 100644
index 0000000..a23a1da
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SearchClearHover.png differ
diff --git a/MiraAPI/Resources/Wiki/SearchClearIdle.png b/MiraAPI/Resources/Wiki/SearchClearIdle.png
new file mode 100644
index 0000000..7f50a9b
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SearchClearIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/SearchIconHover.png b/MiraAPI/Resources/Wiki/SearchIconHover.png
new file mode 100644
index 0000000..d64f9af
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SearchIconHover.png differ
diff --git a/MiraAPI/Resources/Wiki/SearchIconIdle.png b/MiraAPI/Resources/Wiki/SearchIconIdle.png
new file mode 100644
index 0000000..d16f7f9
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SearchIconIdle.png differ
diff --git a/MiraAPI/Resources/WikiPlayersButtonHover.png b/MiraAPI/Resources/Wiki/SidebarPlayersButtonHover.png
similarity index 100%
rename from MiraAPI/Resources/WikiPlayersButtonHover.png
rename to MiraAPI/Resources/Wiki/SidebarPlayersButtonHover.png
diff --git a/MiraAPI/Resources/WikiPlayersButtonIdle.png b/MiraAPI/Resources/Wiki/SidebarPlayersButtonIdle.png
similarity index 100%
rename from MiraAPI/Resources/WikiPlayersButtonIdle.png
rename to MiraAPI/Resources/Wiki/SidebarPlayersButtonIdle.png
diff --git a/MiraAPI/Resources/WikiPlayersButtonOpen.png b/MiraAPI/Resources/Wiki/SidebarPlayersButtonOpen.png
similarity index 100%
rename from MiraAPI/Resources/WikiPlayersButtonOpen.png
rename to MiraAPI/Resources/Wiki/SidebarPlayersButtonOpen.png
diff --git a/MiraAPI/Resources/WikiRolesButtonHover.png b/MiraAPI/Resources/Wiki/SidebarRolesButtonHover.png
similarity index 100%
rename from MiraAPI/Resources/WikiRolesButtonHover.png
rename to MiraAPI/Resources/Wiki/SidebarRolesButtonHover.png
diff --git a/MiraAPI/Resources/WikiRolesButtonIdle.png b/MiraAPI/Resources/Wiki/SidebarRolesButtonIdle.png
similarity index 100%
rename from MiraAPI/Resources/WikiRolesButtonIdle.png
rename to MiraAPI/Resources/Wiki/SidebarRolesButtonIdle.png
diff --git a/MiraAPI/Resources/WikiRolesButtonOpen.png b/MiraAPI/Resources/Wiki/SidebarRolesButtonOpen.png
similarity index 100%
rename from MiraAPI/Resources/WikiRolesButtonOpen.png
rename to MiraAPI/Resources/Wiki/SidebarRolesButtonOpen.png
diff --git a/MiraAPI/Resources/WikiSettingsButtonHover.png b/MiraAPI/Resources/Wiki/SidebarSettingsButtonHover.png
similarity index 100%
rename from MiraAPI/Resources/WikiSettingsButtonHover.png
rename to MiraAPI/Resources/Wiki/SidebarSettingsButtonHover.png
diff --git a/MiraAPI/Resources/WikiSettingsButtonIdle.png b/MiraAPI/Resources/Wiki/SidebarSettingsButtonIdle.png
similarity index 100%
rename from MiraAPI/Resources/WikiSettingsButtonIdle.png
rename to MiraAPI/Resources/Wiki/SidebarSettingsButtonIdle.png
diff --git a/MiraAPI/Resources/WikiSettingsButtonOpen.png b/MiraAPI/Resources/Wiki/SidebarSettingsButtonOpen.png
similarity index 100%
rename from MiraAPI/Resources/WikiSettingsButtonOpen.png
rename to MiraAPI/Resources/Wiki/SidebarSettingsButtonOpen.png
diff --git a/MiraAPI/Resources/Wiki/SortingAzHover.png b/MiraAPI/Resources/Wiki/SortingAzHover.png
new file mode 100644
index 0000000..d9779c6
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SortingAzHover.png differ
diff --git a/MiraAPI/Resources/Wiki/SortingAzIdle.png b/MiraAPI/Resources/Wiki/SortingAzIdle.png
new file mode 100644
index 0000000..5efb21b
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SortingAzIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/SortingZaHover.png b/MiraAPI/Resources/Wiki/SortingZaHover.png
new file mode 100644
index 0000000..c9d817a
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SortingZaHover.png differ
diff --git a/MiraAPI/Resources/Wiki/SortingZaIdle.png b/MiraAPI/Resources/Wiki/SortingZaIdle.png
new file mode 100644
index 0000000..199071a
Binary files /dev/null and b/MiraAPI/Resources/Wiki/SortingZaIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/VisibleAllHover.png b/MiraAPI/Resources/Wiki/VisibleAllHover.png
new file mode 100644
index 0000000..9380f83
Binary files /dev/null and b/MiraAPI/Resources/Wiki/VisibleAllHover.png differ
diff --git a/MiraAPI/Resources/Wiki/VisibleAllIdle.png b/MiraAPI/Resources/Wiki/VisibleAllIdle.png
new file mode 100644
index 0000000..9ddcaee
Binary files /dev/null and b/MiraAPI/Resources/Wiki/VisibleAllIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/VisibleOffHover.png b/MiraAPI/Resources/Wiki/VisibleOffHover.png
new file mode 100644
index 0000000..ecfaefe
Binary files /dev/null and b/MiraAPI/Resources/Wiki/VisibleOffHover.png differ
diff --git a/MiraAPI/Resources/Wiki/VisibleOffIdle.png b/MiraAPI/Resources/Wiki/VisibleOffIdle.png
new file mode 100644
index 0000000..a0c8ea9
Binary files /dev/null and b/MiraAPI/Resources/Wiki/VisibleOffIdle.png differ
diff --git a/MiraAPI/Resources/Wiki/VisibleOnHover.png b/MiraAPI/Resources/Wiki/VisibleOnHover.png
new file mode 100644
index 0000000..a4e5be8
Binary files /dev/null and b/MiraAPI/Resources/Wiki/VisibleOnHover.png differ
diff --git a/MiraAPI/Resources/Wiki/VisibleOnIdle.png b/MiraAPI/Resources/Wiki/VisibleOnIdle.png
new file mode 100644
index 0000000..30f1067
Binary files /dev/null and b/MiraAPI/Resources/Wiki/VisibleOnIdle.png differ
diff --git a/MiraAPI/Utilities/Assets/MiraAssets.cs b/MiraAPI/Utilities/Assets/MiraAssets.cs
index 0d17ed5..249e942 100644
--- a/MiraAPI/Utilities/Assets/MiraAssets.cs
+++ b/MiraAPI/Utilities/Assets/MiraAssets.cs
@@ -163,47 +163,147 @@ public static class MiraAssets
     /// <summary>
     /// Gets the sprite used for players button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiPlayersButtonHoverSprite { get; } = new("MiraAPI.Resources.WikiPlayersButtonHover.png");
+    public static LoadableResourceAsset WikiPlayersButtonHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarPlayersButtonHover.png");
 
     /// <summary>
     /// Gets the sprite used for the players button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiPlayersButtonIdleSprite { get; } = new("MiraAPI.Resources.WikiPlayersButtonIdle.png");
+    public static LoadableResourceAsset WikiPlayersButtonIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarPlayersButtonIdle.png");
 
     /// <summary>
     /// Gets the sprite used for the players button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiPlayersButtonOpenSprite { get; } = new("MiraAPI.Resources.WikiPlayersButtonOpen.png");
+    public static LoadableResourceAsset WikiPlayersButtonOpenSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarPlayersButtonOpen.png");
 
     /// <summary>
     /// Gets the sprite used for the settings button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiSettingsButtonHoverSprite { get; } = new("MiraAPI.Resources.WikiSettingsButtonHover.png");
+    public static LoadableResourceAsset WikiSettingsButtonHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarSettingsButtonHover.png");
 
     /// <summary>
     /// Gets the sprite used for the settings button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiSettingsButtonIdleSprite { get; } = new("MiraAPI.Resources.WikiSettingsButtonIdle.png");
+    public static LoadableResourceAsset WikiSettingsButtonIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarSettingsButtonIdle.png");
 
     /// <summary>
     /// Gets the sprite used for the settings button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiSettingsButtonOpenSprite { get; } = new("MiraAPI.Resources.WikiSettingsButtonOpen.png");
+    public static LoadableResourceAsset WikiSettingsButtonOpenSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarSettingsButtonOpen.png");
 
     /// <summary>
     /// Gets the sprite used for the roles button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiRolesButtonHoverSprite { get; } = new("MiraAPI.Resources.WikiRolesButtonHover.png");
+    public static LoadableResourceAsset WikiRolesButtonHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarRolesButtonHover.png");
 
     /// <summary>
     /// Gets the sprite used for the roles button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiRolesButtonIdleSprite { get; } = new("MiraAPI.Resources.WikiRolesButtonIdle.png");
+    public static LoadableResourceAsset WikiRolesButtonIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarRolesButtonIdle.png");
 
     /// <summary>
     /// Gets the sprite used for the roles button while hovering.
     /// </summary>
-    public static LoadableResourceAsset WikiRolesButtonOpenSprite { get; } = new("MiraAPI.Resources.WikiRolesButtonOpen.png");
+    public static LoadableResourceAsset WikiRolesButtonOpenSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarRolesButtonOpen.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset GroupCountHoverSprite { get; } = new("MiraAPI.Resources.Wiki.GroupCountHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset GroupCountIdleSprite { get; } = new("MiraAPI.Resources.Wiki.GroupCountIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset GroupFactionHoverSprite { get; } = new("MiraAPI.Resources.Wiki.GroupFactionHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset GroupFactionIdleSprite { get; } = new("MiraAPI.Resources.Wiki.GroupFactionIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset GroupNoneHoverSprite { get; } = new("MiraAPI.Resources.Wiki.GroupNoneHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset GroupNoneIdleSprite { get; } = new("MiraAPI.Resources.Wiki.GroupNoneIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SearchClearHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SearchClearHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SearchClearIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SearchClearIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SearchIconHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SearchIconHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SearchIconIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SearchIconIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SortingAzHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SortingAzHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SortingAzIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SortingAzIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SortingZaHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SortingZaHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset SortingZaIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SortingZaIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset VisibleAllHoverSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleAllHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset VisibleAllIdleSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleAllIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset VisibleOffHoverSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOffHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset VisibleOffIdleSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOffIdle.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset VisibleOnHoverSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOnHover.png");
+
+    /// <summary>
+    /// Gets the sprite used for the roles button while hovering.
+    /// </summary>
+    public static LoadableResourceAsset VisibleOnIdleSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOnIdle.png");
 
     internal static LoadableResourceAsset BlankSprite { get; } = new("MiraAPI.Resources.BlankSprite.png");
 }