diff --git a/sites/all/modules/contrib/commerce_addressbook/commerce_addressbook.module b/sites/all/modules/contrib/commerce_addressbook/commerce_addressbook.module
index 2bf91b6..ffaad13 100644
--- a/sites/all/modules/contrib/commerce_addressbook/commerce_addressbook.module
+++ b/sites/all/modules/contrib/commerce_addressbook/commerce_addressbook.module
@@ -205,17 +205,37 @@ function commerce_addressbook_entity_view($entity, $type, $view_mode, $langcode)
       drupal_add_library('system', 'drupal.ajax');
       if (empty($record) || ($record->profile_id != $entity->profile_id)) {
         $links['default'] = array(
-          '#markup' => l(t('set as default'), 'user/' . $entity->uid . '/addressbook/' . $entity->type . '/default/' . $entity->profile_id . '/nojs', array('attributes' => array('class' => array('use-ajax')))),
+          '#theme' => 'link',
+          '#text' => t('set as default'),
+          '#path' => 'user/' . $entity->uid . '/addressbook/' . $entity->type . '/default/' . $entity->profile_id . '/nojs',
+          '#options' => array(
+            'attributes' => array('class' => array('use-ajax')),
+            'html' => FALSE,
+           ),
           '#suffix' => ' | ',
         );
       }
       $links['edit'] = array(
-        '#markup' => l(t('edit'), 'user/' . $entity->uid . '/addressbook/' . $entity->type . '/edit/' . $entity->profile_id),
+        '#theme' => 'link',
+        '#text' => t('edit'),
+        '#path' => 'user/' . $entity->uid . '/addressbook/' . $entity->type . '/edit/' . $entity->profile_id,
+        '#options' => array(
+          'attributes' => array(),
+          'html' => FALSE,
+         ),
         '#suffix' => ' | ',
       );
     }
     if (commerce_addressbook_profile_access('delete', $entity)) {
-      $links['delete'] = array('#markup' => l(t('delete'), 'user/' .$entity->uid. '/addressbook/' . $entity->type . '/delete/' . $entity->profile_id));
+      $links['delete'] = array(
+        '#theme' => 'link',
+        '#text' => t('delete'),
+        '#path' => 'user/' .$entity->uid. '/addressbook/' . $entity->type . '/delete/' . $entity->profile_id,
+        '#options' => array(
+          'attributes' => array(),
+          'html' => FALSE,
+         ),
+      );
     }
     $entity->content['commerce_addressbook_options'] = $links;
   }