remove double icon; adapt position and spacing