Add icons, move regex to server