Merge branch 'feature-add-custom-btn-icon'