[#28008] Minor clean up for maintenance theme