Hygiene: Add back button partial

This is another instance of code duplication.
(Disclaimer: I'm currently not sure why we have back button (<-)
and cancel button (x) and when one should be used over the other)

Change-Id: Ie69635f8b2638354baefb4dda0421c1b9e823050