removed hardcoded icon condition for current screen