DT-1113 Button fixes