Update buttons mapping

Change-Id: I28d576b2f6e0f254f875e831b0a2ade9c47887ee