fixed prepend/append-btn icon problem plus submit button
ref #4097
ref #4099