diff --git a/devel.css b/devel.css
index f06179d..7f01218 100644
--- a/devel.css
+++ b/devel.css
@@ -1,4 +1,4 @@
-.dev-query, .dev-timer, .dev-memory-usage {
+.dev-query, .dev-timer, .dev-memory-usage, .dev-xhprof {
   padding: 1em;
 }
 
diff --git a/devel.module b/devel.module
index fddd7b4..1599c11 100644
--- a/devel.module
+++ b/devel.module
@@ -992,7 +992,7 @@ function devel_shutdown_summary($queries) {
   }
 
   if (devel_xhprof_is_enabled()) {
-    $output .= ' ' . devel_xhprof_link($GLOBALS['devel_run_id']);
+    $output .= devel_xhprof_link($GLOBALS['devel_run_id']);
   }
 
   $output .= devel_shutdown_memory();
@@ -1015,7 +1015,7 @@ function devel_xhprof_link($run_id, $type = 'link') {
   $namespace = variable_get('site_name', '');  // namespace for your application
   if ($xhprof_url) {
     $url  = $xhprof_url . "/index.php?run=$run_id&source=$namespace";
-    return $type == 'url' ? $url : t('<a href="@xhprof">XHProf output</a>. ', array('@xhprof' => $url));
+    return $type == 'url' ? $url : '<span class="dev-xhprof">' . t('<a href="@xhprof">XHProf output</a>. ', array('@xhprof' => $url)) . '</span>';
   }
 }
 
@@ -1495,7 +1495,7 @@ function _devel_table_sort($a, $b) {
  */
 function devel_timer() {
   $time = timer_read('page');
-  return t_safe(' Page execution time was @time ms.', array('@time' => $time));
+  return '<span class="dev-timer">' . t_safe('Page execution time was @time ms.', array('@time' => $time)) . '</span>';
 }
 
 // An alias for drupal_debug().