Fixed the overflow issue on tools theme on core experience and primary