Refactor use of flex grid for icons