Fix the extra margin on top of the avatar in the dock (fixes #553).  Position the gear icon absolutely so it doesn't take up room, and size it as 12px square (not the 24px of the underlying image, which is double scale).