BS223 Facelift: Edit Button

* re-added edit button

Change-Id: I35d68d66e35123800dd371e11342a63d99d28fc6
Merge "BS223 Facelift: Edit Button"