From f077cf4b9165f5b675dfade25b56e94f5aab7dca Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 2 Nov 2012 12:00:33 -0400
Subject: Updated logo_header.gif paths.

---
 base/common/shared/webapps/ROOT/index.jsp                               | 2 +-
 dogtag/ca-ui/shared/webapps/ca/404.html                                 | 2 +-
 dogtag/ca-ui/shared/webapps/ca/500.html                                 | 2 +-
 dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template    | 2 +-
 dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template             | 2 +-
 dogtag/ca-ui/shared/webapps/ca/agent/header.template                    | 2 +-
 dogtag/ca-ui/shared/webapps/ca/agent/index.template                     | 2 +-
 dogtag/ca-ui/shared/webapps/ca/agent/ports.template                     | 2 +-
 dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html                         | 2 +-
 dogtag/ca-ui/shared/webapps/ca/services.template                        | 2 +-
 dogtag/common-ui/shared/admin/console/config/header.vm                  | 2 +-
 .../common-ui/shared/admin/console/config/securitydomainloginpanel.vm   | 2 +-
 dogtag/kra-ui/shared/webapps/kra/404.html                               | 2 +-
 dogtag/kra-ui/shared/webapps/kra/500.html                               | 2 +-
 dogtag/kra-ui/shared/webapps/kra/agent/header.template                  | 2 +-
 dogtag/kra-ui/shared/webapps/kra/agent/index.template                   | 2 +-
 dogtag/kra-ui/shared/webapps/kra/services.template                      | 2 +-
 dogtag/ocsp-ui/shared/webapps/ocsp/404.html                             | 2 +-
 dogtag/ocsp-ui/shared/webapps/ocsp/500.html                             | 2 +-
 dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template                | 2 +-
 dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template                 | 2 +-
 dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template                 | 2 +-
 dogtag/ocsp-ui/shared/webapps/ocsp/services.template                    | 2 +-
 dogtag/ra-ui/shared/docroot/404.html                                    | 2 +-
 dogtag/ra-ui/shared/docroot/500.html                                    | 2 +-
 dogtag/ra-ui/shared/docroot/header.vm                                   | 2 +-
 dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm           | 2 +-
 .../shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm  | 2 +-
 dogtag/tks-ui/shared/webapps/tks/404.html                               | 2 +-
 dogtag/tks-ui/shared/webapps/tks/500.html                               | 2 +-
 dogtag/tks-ui/shared/webapps/tks/agent/header.template                  | 2 +-
 dogtag/tks-ui/shared/webapps/tks/agent/index.template                   | 2 +-
 dogtag/tks-ui/shared/webapps/tks/agent/ports.template                   | 2 +-
 dogtag/tks-ui/shared/webapps/tks/services.template                      | 2 +-
 dogtag/tps-ui/shared/docroot/404.html                                   | 2 +-
 dogtag/tps-ui/shared/docroot/500.html                                   | 2 +-
 dogtag/tps-ui/shared/docroot/header.vm                                  | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/addConfig.template                 | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/addResults.template                | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template         | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template           | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template                | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template      | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template       | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/delete.template                    | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template             | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/doToken.template                   | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template            | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/edit.template                      | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/editConfig.template                | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/editResults.template               | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/editUser.template                  | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/error.template                     | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/index.template                     | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template                | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template             | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/new.template                       | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/newUser.template                   | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/revoke.template                    | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/search.template                    | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template            | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template       | 2 +-
 .../tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template   | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template     | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template               | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template        | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template         | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template  | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchResults.template             | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchUser.template                | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template         | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template              | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/selfTest.template                  | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template           | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/show.template                      | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template                 | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/showCert.template                  | 2 +-
 dogtag/tps-ui/shared/docroot/tokendb/userDelete.template                | 2 +-
 dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm         | 2 +-
 .../shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm | 2 +-
 80 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/base/common/shared/webapps/ROOT/index.jsp b/base/common/shared/webapps/ROOT/index.jsp
index ed5b4611e..ae2faa9d7 100644
--- a/base/common/shared/webapps/ROOT/index.jsp
+++ b/base/common/shared/webapps/ROOT/index.jsp
@@ -26,7 +26,7 @@
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ca-ui/shared/webapps/ca/404.html b/dogtag/ca-ui/shared/webapps/ca/404.html
index 406e6a4fd..ed13c7e54 100755
--- a/dogtag/ca-ui/shared/webapps/ca/404.html
+++ b/dogtag/ca-ui/shared/webapps/ca/404.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/ca/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/ca-ui/shared/webapps/ca/500.html b/dogtag/ca-ui/shared/webapps/ca/500.html
index ecc2cb869..428eca67c 100755
--- a/dogtag/ca-ui/shared/webapps/ca/500.html
+++ b/dogtag/ca-ui/shared/webapps/ca/500.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/ca/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
index 206127f90..aa6d948c8 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
@@ -30,7 +30,7 @@
 
 <div id="wrap">
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
index cbe086b02..b35881ed6 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
@@ -27,7 +27,7 @@
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366" onLoad="document.cookieForm.submit()">
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/ca/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/header.template b/dogtag/ca-ui/shared/webapps/ca/agent/header.template
index dfe7061f1..d52b4b913 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/header.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/ca/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/dogtag/ca-ui/shared/webapps/ca/agent/index.template
index 99ea3a090..b4696a859 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/index.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ca/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
index 46ab91d60..cf5081b30 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ca/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
         </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
index 3e97a1f2b..d1158d270 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
@@ -313,7 +313,7 @@ function loadTabs()
 		writeln('<tr><td>');
 		writeln('<table border=0 cellspacing=12 cellpadding=0>');
 		writeln('<tr>');
-		writeln('<td><img src="/ca/ee/graphics/logo_header.gif"></td>');
+		writeln('<td><img src="/pki/images/logo_header.gif"></td>');
 		writeln('<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>');
 	if (subsystemname == 'ca') {
 		writeln('<td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#cccccc" size="-2">&reg;</font></sup> Certificate Manager</b></font></td>');
diff --git a/dogtag/ca-ui/shared/webapps/ca/services.template b/dogtag/ca-ui/shared/webapps/ca/services.template
index e068a9b38..cb14d8833 100644
--- a/dogtag/ca-ui/shared/webapps/ca/services.template
+++ b/dogtag/ca-ui/shared/webapps/ca/services.template
@@ -27,7 +27,7 @@
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/common-ui/shared/admin/console/config/header.vm b/dogtag/common-ui/shared/admin/console/config/header.vm
index 7966ba745..e0fe6a962 100644
--- a/dogtag/common-ui/shared/admin/console/config/header.vm
+++ b/dogtag/common-ui/shared/admin/console/config/header.vm
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <div id="header">
-    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="../img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headerpaddedtitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
index c675f00f9..33c9576cd 100644
--- a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
@@ -31,7 +31,7 @@
 
 <div id="wrap">
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headerpaddedtitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/kra-ui/shared/webapps/kra/404.html b/dogtag/kra-ui/shared/webapps/kra/404.html
index 5d31f52f0..b73192ef4 100755
--- a/dogtag/kra-ui/shared/webapps/kra/404.html
+++ b/dogtag/kra-ui/shared/webapps/kra/404.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/kra/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/kra-ui/shared/webapps/kra/500.html b/dogtag/kra-ui/shared/webapps/kra/500.html
index 3f7883909..cb5d9294a 100755
--- a/dogtag/kra-ui/shared/webapps/kra/500.html
+++ b/dogtag/kra-ui/shared/webapps/kra/500.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/kra/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/header.template b/dogtag/kra-ui/shared/webapps/kra/agent/header.template
index 0de93919a..3f2865393 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/header.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/kra/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/dogtag/kra-ui/shared/webapps/kra/agent/index.template
index 2a6c6b972..ecf61b863 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/index.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/kra/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/services.template b/dogtag/kra-ui/shared/webapps/kra/services.template
index 731ce3cc1..1164edb81 100644
--- a/dogtag/kra-ui/shared/webapps/kra/services.template
+++ b/dogtag/kra-ui/shared/webapps/kra/services.template
@@ -27,7 +27,7 @@
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
index 4cf46fe1b..a17f7adbc 100755
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/ocsp/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
index 14b2c50fc..dda605cbb 100755
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/ocsp/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
index 4697e78f7..afba60008 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/ocsp/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
index 79f6f592e..d21a30a51 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ocsp/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
index c4b21fca7..84ebd9c3f 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/ocsp/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
         </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
index 4749f4f0f..be228bd0f 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
@@ -27,7 +27,7 @@
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ra-ui/shared/docroot/404.html b/dogtag/ra-ui/shared/docroot/404.html
index f7518fa82..e0333dcfd 100755
--- a/dogtag/ra-ui/shared/docroot/404.html
+++ b/dogtag/ra-ui/shared/docroot/404.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/ra/admin/console/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/ra-ui/shared/docroot/500.html b/dogtag/ra-ui/shared/docroot/500.html
index fd39ba999..1222cc635 100755
--- a/dogtag/ra-ui/shared/docroot/500.html
+++ b/dogtag/ra-ui/shared/docroot/500.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/ra/admin/console/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/ra-ui/shared/docroot/header.vm b/dogtag/ra-ui/shared/docroot/header.vm
index 18862497b..3824b87f3 100644
--- a/dogtag/ra-ui/shared/docroot/header.vm
+++ b/dogtag/ra-ui/shared/docroot/header.vm
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <div id="header">
-    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information"><img src="/ra/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
index d4cea30c2..e653da5c1 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
@@ -17,7 +17,7 @@
      --- END COPYRIGHT BLOCK --- -->
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="../img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headerpaddedtitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
index 79e15b1e5..d5192db9b 100644
--- a/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
@@ -31,7 +31,7 @@
 
 <div id="wrap">
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headerpaddedtitle">
     <a href="/" title="Dogtag">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/tks-ui/shared/webapps/tks/404.html b/dogtag/tks-ui/shared/webapps/tks/404.html
index 847a87f43..bec78e1a5 100755
--- a/dogtag/tks-ui/shared/webapps/tks/404.html
+++ b/dogtag/tks-ui/shared/webapps/tks/404.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/tks/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/tks-ui/shared/webapps/tks/500.html b/dogtag/tks-ui/shared/webapps/tks/500.html
index d54db32e6..073396a37 100755
--- a/dogtag/tks-ui/shared/webapps/tks/500.html
+++ b/dogtag/tks-ui/shared/webapps/tks/500.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/tks/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/header.template b/dogtag/tks-ui/shared/webapps/tks/agent/header.template
index dc92d82ad..bc459fbc1 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/header.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/header.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tks/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/dogtag/tks-ui/shared/webapps/tks/agent/index.template
index 588712364..c5a09dcb4 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/index.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/index.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/tks/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Agent Services</b></font></td>
         </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
index e1f1ee73e..076372c85 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr> 
-          <td><img src="/tks/agent/graphics/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> Services Summary</b></font></td>
         </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/services.template b/dogtag/tks-ui/shared/webapps/tks/services.template
index e3ea6878c..2fd7c4189 100644
--- a/dogtag/tks-ui/shared/webapps/tks/services.template
+++ b/dogtag/tks-ui/shared/webapps/tks/services.template
@@ -27,7 +27,7 @@
 <body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
 
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/tps-ui/shared/docroot/404.html b/dogtag/tps-ui/shared/docroot/404.html
index 63674aae5..bf64b5c25 100755
--- a/dogtag/tps-ui/shared/docroot/404.html
+++ b/dogtag/tps-ui/shared/docroot/404.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/tps/admin/console/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/tps-ui/shared/docroot/500.html b/dogtag/tps-ui/shared/docroot/500.html
index 8334276fc..d0912dfc6 100755
--- a/dogtag/tps-ui/shared/docroot/500.html
+++ b/dogtag/tps-ui/shared/docroot/500.html
@@ -57,7 +57,7 @@ document.write('//');
 document.write(hostname);
 document.write(':');
 document.write(port);
-document.write('/tps/admin/console/img/logo_header.gif');
+document.write('/pki/images/logo_header.gif');
 document.write('" alt="Dogtag" id="myLogo" /></a>');
 </script>
     <div id="headertitle">
diff --git a/dogtag/tps-ui/shared/docroot/header.vm b/dogtag/tps-ui/shared/docroot/header.vm
index 0dec954b8..3824b87f3 100755
--- a/dogtag/tps-ui/shared/docroot/header.vm
+++ b/dogtag/tps-ui/shared/docroot/header.vm
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <div id="header">
-    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information"><img src="/tps/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headertitle">
     <a href="/" title="Dogtag homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
index 9a9bc46d8..ce0177c1a 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/addResults.template b/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
index d44073747..eca814f8b 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
index f1cba3972..af782c190 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
index 05da5830a..9abce847a 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
index 71c203b54..ff299530c 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template b/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
index 87fd9132b..ef541d732 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
index 42341f3fa..3b1ab8b47 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/delete.template b/dogtag/tps-ui/shared/docroot/tokendb/delete.template
index d31cd1d00..4d3243db1 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/delete.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/delete.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template b/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
index 56b63725e..606e11bb0 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/doToken.template b/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
index d430f3542..419a9a240 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template b/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
index b68a41485..16bd2a191 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/edit.template b/dogtag/tps-ui/shared/docroot/tokendb/edit.template
index 302e701ea..163ae3bd1 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/edit.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/edit.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
index 8b242ab76..a4091870a 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/editResults.template b/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
index ea9444166..783b065c3 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/editUser.template b/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
index f346eba35..55b587cbe 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/error.template b/dogtag/tps-ui/shared/docroot/tokendb/error.template
index 1bdf3dd32..8f629ff72 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/error.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/error.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/index.template b/dogtag/tps-ui/shared/docroot/tokendb/index.template
index a51a8b696..4aa9f0cdd 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/index.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/index.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
index c6a672089..97086257b 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
index cf1cf1f9e..1b1902843 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/new.template b/dogtag/tps-ui/shared/docroot/tokendb/new.template
index deba4f783..f4bf1475d 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/new.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/new.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/newUser.template b/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
index 45c60a573..f1e7e6e35 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/revoke.template b/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
index 2fd13d95f..6a62ea116 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/search.template b/dogtag/tps-ui/shared/docroot/tokendb/search.template
index 8b83fca66..305c9cd74 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/search.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/search.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
index b9af1108b..e831a2872 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
index 2deb2c5f8..da201d97f 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
index 65b25c25d..d8f6587aa 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
index 8522b24f0..1f97860a0 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
index da68089f0..b0960f571 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
index be6222437..ab0a471c2 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
index 9d9e31cee..788491fbf 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
index c709a3751..bb6dcabf3 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
index cb11b82fc..f4644b355 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template b/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
index 70bc31209..57e3a5507 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
index d0cf11fe0..bbb885f31 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
index 120579d7e..33f560461 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
@@ -29,7 +29,7 @@
     <td> 
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">Red Hat<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template b/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
index 46b8bfdbf..163437d17 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template b/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
index 3a352f0c7..aeb49d711 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/show.template b/dogtag/tps-ui/shared/docroot/tokendb/show.template
index 5b75c6722..a9dd39334 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/show.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/show.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
index 592c6be15..fe3292011 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/showCert.template b/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
index 54fec4f4f..964035887 100644
--- a/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template b/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
index 2b7e6a6e1..db4b226cd 100755
--- a/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
@@ -28,7 +28,7 @@
     <td>
       <table border="0" cellspacing="12" cellpadding="0">
         <tr>
-          <td><img src="/tps/admin/console/img/logo_header.gif"></td>
+          <td><img src="/pki/images/logo_header.gif"></td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
           <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">&reg;</font></sup> TPS Services</b></font></td>
         </tr>
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
index 7966ba745..e0fe6a962 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
@@ -16,7 +16,7 @@
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <div id="header">
-    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="../img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headerpaddedtitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index 56c40dfa6..1f47d7fb6 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
@@ -30,7 +30,7 @@
 
 <div id="wrap">
 <div id="header">
-    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/ca/admin/console/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
+    <a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/images/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
     <div id="headerpaddedtitle">
     <a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
     </div>
-- 
cgit