Add icons, finish server logic