Moved some barrier icons into barrier category