Feature/more icons