Changed iconfactory and added custombuttonFactory