Revert "Revert "Revert "Visual tweaks: active user and gspot (folder view)"""

This reverts commit 53db62fcc334e96b822a82d7a67dd05fcb73ab4d.