Fix some warnings, add option to use 32px icons