--- storm/stormticket/stormticket.theme.inc	2009-07-23 19:12:32.000000000 +0100
+++ storm-527768-9/stormticket/stormticket.theme.inc	2009-07-24 15:55:33.000000000 +0100
@@ -110,34 +110,9 @@ function theme_stormticket_view($node, $
 
   $i = new stdClass();
 
-  if (module_exists('stormexpense') && user_access('Storm expense: access')) {
-    $v = l(t('Expenses'), 'storm/expenses/', array('query' => array('ticket_nid' => $node->nid)));
-    $i->type = 'stormexpense';
-    $params = $_GET;
-    $params['ticket_nid'] = $node->nid;
-    $v .= storm_icon_add_node($i, $params);
-    $node->content['stormticket']['links']['expenses'] = array(
-      '#prefix' => '<dt id="stormexpenses" class="stormcomponent">',
-      '#suffix' => '</dt>',
-      '#value' => $v,
-      '#weight' => $w++,
-    );
-  }
+  $node->content['stormticket']['links']['expenses'] = theme_storm_link('stormticket', 'stormexpense', $node->nid, $w++);
 
-  if (module_exists('stormtimetracking') && user_access('Storm timetracking: access')) {
-    $v = l(t('Timetracking'), 'storm/timetrackings/', array('query' => array('ticket_nid' => $node->nid)));
-    $i->type = 'stormtimetracking';
-    $params = $_GET;
-    $params['ticket_nid'] = $node->nid;
-    $v .= storm_icon_add_node($i, $params);
+  $node->content['stormticket']['links']['timetrackings'] = theme_storm_link('stormticket', 'stormtimetracking', $node->nid, $w++);
 
-    $node->content['stormticket']['links']['timetrackings'] = array(
-      '#prefix' => '<dt id="stormtimetrackings" class="stormcomponent">',
-      '#suffix' => '</dt>',
-      '#value' => $v,
-      '#weight' => $w++,
-    );
-  }
-  
   return $node;
 }