forward porting dark ui tweaks after revert