Update for viewport and icon