Remove circle shape and add new class