Revert "FW Expanded Desktop 2\2"

This reverts commit e2be44dce9ea84ff2311756057d10126e8fbccfb.