Comment 51 for bug 1131664

Adding nautilus as well here, so it's easier to track, but the wanted design is defined at bug lp:1130722