Fix calUsePickersIcons width issues.  pt.2 - re: #347