As usual, mainly from Adwaita, with minor adaptations by me.

Change-Id: I719d5e4c9c51c6f9476eb6b6bce0e117dc24d5e5