diff --git a/cake/libs/view/templates/errors/missing_component_file.thtml b/cake/libs/view/templates/errors/missing_component_file.thtml
index da91c367e..9aa55aa76 100644
--- a/cake/libs/view/templates/errors/missing_component_file.thtml
+++ b/cake/libs/view/templates/errors/missing_component_file.thtml
@@ -30,7 +30,7 @@
 ?>
 <h1>Missing Component File</h1>
 
-<p class="error">You are seeing this error because the component file <em><?php echo "app".DS."controllers".DS."components".DS.r('_component', '', $file); ?></em>
+<p class="error">You are seeing this error because the component file <em><?php echo "app".DS."controllers".DS."components".DS.$file; ?></em>
   can't be found or doesn't exist.
 </p>
 
diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml
index e11243f96..2188007b1 100644
--- a/cake/libs/view/templates/layouts/default.thtml
+++ b/cake/libs/view/templates/layouts/default.thtml
@@ -29,7 +29,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>CakePHP : <?php echo $title_for_layout;?></title>
-<link rel="shortcut icon" href="<?php echo $html->url('/favicon.ico')?>" type="image/x-icon" />
+<link rel="shortcut icon" href="<?php echo $this->webroot . 'favicon.ico';?>" type="image/x-icon" />
 <?php echo $html->css('cake.generic');?>
 </head>
 <body>
