icons update and buttons disabled fix