diff --git a/commerce_invoice.module b/commerce_invoice.module
index 9f6dfa1..4d4a85b 100644
--- a/commerce_invoice.module
+++ b/commerce_invoice.module
@@ -26,7 +26,7 @@ function commerce_invoice_entity_info() {
       'label' => t('Commerce Invoice'),
       'controller class' => 'CommerceInvoiceEntityController',
       'base table' => 'commerce_invoice',
-      'fieldable' => FALSE,
+      'fieldable' => TRUE,
       'entity keys' => array(
         'id' => 'invoice_id',
         'bundle' => 'type',
@@ -247,6 +247,59 @@ function commerce_invoice_type_get_name($type = NULL) {
   }
 }
 
+/**
+ * Implements hook_field_extra_fields().
+ */
+function commerce_invoice_field_extra_fields() {
+  $extra = array();
+
+  $extra['commerce_invoice']['commerce_invoice'] = array(
+    'display' => array(
+      'invoice_number' => array(
+        'label' => t('Invoice number'),
+        'description' => t('Display simple invoice number'),
+        'weight' => -10,
+      ),
+      'created' => array(
+        'label' => t('Created'),
+        'description' => t('Display date of invoice creation'),
+        'weight' => -5,
+      ),
+    ),
+  );
+
+  $order_field_instances = field_info_instances('commerce_order', 'commerce_order');
+
+  if (!empty($order_field_instances)) {
+    foreach($order_field_instances as $field => $properties){
+      $extra['commerce_invoice']['commerce_invoice']['display'][$field] = array(
+        'label' => t('Order: @label', array('@label' => $properties['label'])),
+        'description' => $properties['description'],
+        'entity' => 'commerce_order',
+      );
+    }
+  }
+
+  return $extra;
+}
+
+/**
+ * Implements hook_theme().
+ */
+function commerce_invoice_theme() {
+  return array(
+    'commerce_invoice_number' => array(
+      'variables' => array('invoice_number' => NULL, 'label' => NULL, 'invoice' => NULL),
+      'path' => drupal_get_path('module', 'commerce_invoice') . '/theme',
+      'template' => 'commerce-invoice-number',
+    ),
+    'commerce_invoice_created' => array(
+      'variables' => array('created' => NULL, 'label' => NULL, 'invoice' => NULL),
+      'path' => drupal_get_path('module', 'commerce_invoice') . '/theme',
+      'template' => 'commerce-invoice-created',
+    ),
+  );
+}
 
 /**
  * Implements hook_views_api().
diff --git a/commerce_invoice_ui.module b/commerce_invoice_ui.module
index 0f935f3..9d1cdcc 100644
--- a/commerce_invoice_ui.module
+++ b/commerce_invoice_ui.module
@@ -157,3 +157,15 @@ function commerce_invoice_ui_access_by_order($op, $order = NULL, $account = NULL
     return FALSE;
   }
 }
+
+/**
+ * Implements hook_entity_info_alter().
+ */
+function commerce_invoice_ui_entity_info_alter(&$entity_info) {
+  // Expose the order UI for invoice fields.
+  $entity_info['commerce_invoice']['bundles']['commerce_invoice']['admin'] = array(
+    'path' => 'admin/commerce/config/invoice',
+    'real path' => 'admin/commerce/config/invoice',
+    'access arguments' => array('configure invoice settings'),
+  );
+}
diff --git a/includes/commerce_invoice.controller.inc b/includes/commerce_invoice.controller.inc
index 43b45d2..4f67cc1 100644
--- a/includes/commerce_invoice.controller.inc
+++ b/includes/commerce_invoice.controller.inc
@@ -247,23 +247,22 @@ class CommerceInvoiceEntityController extends DrupalCommerceEntityController {
   public function buildContent($invoice, $view_mode = 'administrator', $langcode = NULL, $content = array()) {
     // Load the order this invoice is attached to.
     $order = commerce_order_load($invoice->order_id);
-    
+
+    $order_build_content = entity_build_content('commerce_order', $order, $view_mode, $langcode);
+    foreach($order_build_content as $field => $instance){
+      if(substr($field,0,1) != '#' || $field == '#attached'){
+        $content[$field] = $instance;
+      }
+    }
+
     $content['invoice_number'] = array(
-      '#type' => 'item',
-      '#title' => t('Invoice number'),
-      '#markup' => $invoice->invoice_number,
+      '#markup' => theme('commerce_invoice_number', array('invoice_number' => $invoice->invoice_number, 'label' => t('Invoice number:'), 'invoice' => $invoice)),
     );
-    
+
     $content['created'] = array(
-      '#type' => 'item',
-      '#title' => t('Date'),
-      '#markup' => format_date($invoice->created, 'short')
+      '#markup' => theme('commerce_invoice_created', array('created' => format_date($invoice->created, 'short'), 'label' => t('Date:'), 'invoice' => $invoice)),
     );
-    
-    $content['commerce_order'] = entity_build_content('commerce_order', $order, $view_mode, $langcode);
 
     return parent::buildContent($invoice, $view_mode, $langcode, $content);
   }
 }
-      
-