diff --git a/about.php b/about.php
index dcf6e1738b..e3a877ed51 100644
--- a/about.php
+++ b/about.php
@@ -20,13 +20,12 @@
      $api_only = True;
   }
   
-  $tpl = new Template($phpgw_info["server"]["include_root"] . "/phpgwapi/templates/"
-                    . $phpgw_info["server"]["template_set"]);
+  $tpl = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('phpgwapi'));
   $tpl->set_file(array("phpgw_about"         => "about.tpl",
                        "phpgw_about_unknown" => "about_unknown.tpl"                                 
                       ));
 
-  $tpl->set_var("webserver_url",$phpgw_info["server"]["webserver_url"]);
+  $tpl->set_var("webserver_url",$phpgw->common->get_image_path('phpgwapi'));
   $tpl->set_var("phpgw_version","phpGroupWare API version " . $phpgw_info["server"]["versions"]["phpgwapi"]);
   if ($included) {
      $tpl->set_var("phpgw_app_about",about_app("",""));
@@ -42,4 +41,4 @@
 
   $tpl->pparse("out","phpgw_about");
   $phpgw->common->phpgw_footer();
-?>
\ No newline at end of file
+?>
diff --git a/phpgwapi/templates/default/about.tpl b/phpgwapi/templates/default/about.tpl
index 2910acf443..670940cfd8 100644
--- a/phpgwapi/templates/default/about.tpl
+++ b/phpgwapi/templates/default/about.tpl
@@ -1,7 +1,7 @@
 <table border="0" width="100%">
  <tr>
   <td align="left">
-   <a href="http://www.phpgroupware.org" target="_new"><img src="{webserver_url}/phpGroupWare.jpg" border="0"></a>
+   <a href="http://www.phpgroupware.org" target="_new"><img src="{webserver_url}/logo.gif" border="0"></a>
   </td>
  </tr>
  <tr>
@@ -23,4 +23,4 @@
 
   </td>
  </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/phpgwapi/templates/default/head.inc.php b/phpgwapi/templates/default/head.inc.php
index 239819cb4e..00dbf46804 100644
--- a/phpgwapi/templates/default/head.inc.php
+++ b/phpgwapi/templates/default/head.inc.php
@@ -17,7 +17,7 @@
 	    $bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\"";
     }
 
-    $tpl = new Template($phpgw_info["server"]["template_dir"]);
+    $tpl = CreateObject('phpgwapi.Template',$phpgw_info["server"]["template_dir"]);
     $tpl->set_unknowns("remove");
     $tpl->set_file(array("head" => "head.tpl"));
     $tpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
diff --git a/phpgwapi/templates/justweb/about.tpl b/phpgwapi/templates/justweb/about.tpl
index 2910acf443..670940cfd8 100644
--- a/phpgwapi/templates/justweb/about.tpl
+++ b/phpgwapi/templates/justweb/about.tpl
@@ -1,7 +1,7 @@
 <table border="0" width="100%">
  <tr>
   <td align="left">
-   <a href="http://www.phpgroupware.org" target="_new"><img src="{webserver_url}/phpGroupWare.jpg" border="0"></a>
+   <a href="http://www.phpgroupware.org" target="_new"><img src="{webserver_url}/logo.gif" border="0"></a>
   </td>
  </tr>
  <tr>
@@ -23,4 +23,4 @@
 
   </td>
  </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/phpgwapi/templates/justweb/head.inc.php b/phpgwapi/templates/justweb/head.inc.php
index 66cecaf4c9..a212f62d39 100644
--- a/phpgwapi/templates/justweb/head.inc.php
+++ b/phpgwapi/templates/justweb/head.inc.php
@@ -17,7 +17,7 @@
 	    $bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\"";
     }
 
-    $tpl = new Template($phpgw_info["server"]["template_dir"]);
+    $tpl = CreateObject('phpgwapi.Template',$phpgw_info["server"]["template_dir"]);
     $tpl->set_unknowns("remove");
     $tpl->set_file(array("head" => "head.tpl"));
     $tpl->set_var("webserver_url", $phpgw_info["server"]["webserver_url"]);
diff --git a/phpgwapi/templates/verdilak/about.tpl b/phpgwapi/templates/verdilak/about.tpl
index 2910acf443..670940cfd8 100644
--- a/phpgwapi/templates/verdilak/about.tpl
+++ b/phpgwapi/templates/verdilak/about.tpl
@@ -1,7 +1,7 @@
 <table border="0" width="100%">
  <tr>
   <td align="left">
-   <a href="http://www.phpgroupware.org" target="_new"><img src="{webserver_url}/phpGroupWare.jpg" border="0"></a>
+   <a href="http://www.phpgroupware.org" target="_new"><img src="{webserver_url}/logo.gif" border="0"></a>
   </td>
  </tr>
  <tr>
@@ -23,4 +23,4 @@
 
   </td>
  </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/phpgwapi/templates/verdilak/head.inc.php b/phpgwapi/templates/verdilak/head.inc.php
index a4411f7b2b..0ed5612a19 100644
--- a/phpgwapi/templates/verdilak/head.inc.php
+++ b/phpgwapi/templates/verdilak/head.inc.php
@@ -16,7 +16,7 @@
       $bodyheader .= "topmargin=\"0\" marginheight=\"0\" marginwidth=\"0\" leftmargin=\"0\"";
     }
 
-    $tpl = new Template($phpgw_info["server"]["template_dir"]);
+    $tpl = CreateObject('phpgwapi.Template',$phpgw_info["server"]["template_dir"]);
     $tpl->set_unknowns("remove");
     $tpl->set_file(array("head" => "head.tpl"));
     $tpl->set_var("website_title", $phpgw_info["server"]["site_title"]);