Fixed back the old buttons without icons and resolved bug with
datepickeractivity