Reverted to using extend icons