FLUID-4970: Tweak to keep right border between reset/show-hide for themes