Replaced B/L with bars and table icons