fix indicator removal, toolbar remove button