Merge branch 'main' into patch-3

diff --cc css/unrealircd-admin.css
index 6f312710e0b93f8ae218835dc75d9758822f87a3,972a6cbd104274cbe8f100715c810fd950cda293..fa224df895adbdcb7838f3784221c8e8804f84a2
--- 1/css/unrealircd-admin.css
--- 2/css/unrealircd-admin.css
+++ b/css/unrealircd-admin.css
@@@ -245,7 -214,6 +214,8 @@@ body 
        width: inherit;
  }
  
 -.card-header i.fa {
 +.card-header .badge {
 +      top:-10px;
 +      left:20px;
+       line-height: 74px;
  }