Fixes to current dataset indicator and focused icon buttons
Merge default