Does a better job ensuring that Cursor objects get closed.
Reverse order of icon and numeric label in album and song badges.