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

This reverts commit 39503dc6c60423c3ed5891ad06f93212d5343fe4.