CodePro fixes on toolbar files

Author: lhunker