UI-2460: Update the position of Icons