From 2f88971101c858d51a04b68d9abe005542151dd7 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 2 Nov 2012 12:38:03 -0400
Subject: [PATCH] Updated hr.gif paths.

---
 .../shared/webapps/ca/GenUnexpectedError.template    |  2 +-
 .../webapps/ca/admin/GenUnexpectedError.template     |  2 +-
 .../webapps/ca/admin/ca/EnrollSuccess.template       |  2 +-
 .../shared/webapps/ca/admin/ca/adminEnroll.html      |  4 ++--
 .../ca-ui/shared/webapps/ca/agent/GenError.template  |  2 +-
 .../webapps/ca/agent/GenUnexpectedError.template     |  2 +-
 .../webapps/ca/agent/ca/EnrollSuccess.template       |  2 +-
 .../shared/webapps/ca/agent/ca/ListRequests.html     |  2 +-
 .../webapps/ca/agent/ca/ProfileApprove.template      |  2 +-
 .../shared/webapps/ca/agent/ca/ProfileList.template  |  2 +-
 .../webapps/ca/agent/ca/ProfileProcess.template      |  2 +-
 .../webapps/ca/agent/ca/ProfileReview.template       |  2 +-
 .../webapps/ca/agent/ca/ProfileSelect.template       |  2 +-
 .../ca-ui/shared/webapps/ca/agent/ca/SrchCert.html   | 20 ++++++++++----------
 .../shared/webapps/ca/agent/ca/SrchRequests.html     | 10 +++++-----
 .../shared/webapps/ca/agent/ca/SrchRevokeCert.html   | 12 ++++++------
 .../ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html  |  2 +-
 .../webapps/ca/agent/ca/cloneRedirect.template       |  2 +-
 .../webapps/ca/agent/ca/displayBySerial.template     |  2 +-
 .../webapps/ca/agent/ca/displayBySerial2.template    |  2 +-
 .../shared/webapps/ca/agent/ca/displayCRL.template   |  2 +-
 .../ca/agent/ca/displayCertFromRequest.template      |  2 +-
 .../shared/webapps/ca/agent/ca/getOCSPInfo.template  |  2 +-
 .../shared/webapps/ca/agent/ca/getStats.template     |  2 +-
 dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html |  2 +-
 .../shared/webapps/ca/agent/ca/monitor.template      |  2 +-
 .../webapps/ca/agent/ca/processCertReq.template      |  4 ++--
 .../shared/webapps/ca/agent/ca/processReq.template   |  2 +-
 .../shared/webapps/ca/agent/ca/queryBySerial.html    |  2 +-
 .../ca-ui/shared/webapps/ca/agent/ca/queryCert.html  | 16 ++++++++--------
 .../shared/webapps/ca/agent/ca/queryCert.template    |  4 ++--
 .../shared/webapps/ca/agent/ca/queryReq.template     |  2 +-
 .../webapps/ca/agent/ca/reasonToRevoke.template      |  2 +-
 .../ca-ui/shared/webapps/ca/agent/ca/revokeCert.html | 10 +++++-----
 .../shared/webapps/ca/agent/ca/srchCert.template     |  4 ++--
 .../shared/webapps/ca/agent/ca/toDisplayCRL.template |  2 +-
 .../shared/webapps/ca/agent/ca/toUpdateCRL.template  |  2 +-
 .../ca-ui/shared/webapps/ca/agent/ca/updateCRL.html  |  2 +-
 .../shared/webapps/ca/agent/ca/updateCRL.template    |  2 +-
 .../shared/webapps/ca/agent/ca/updateDir.template    |  2 +-
 dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html  |  4 ++--
 .../shared/webapps/ca/ee/ca/CertBasedDualEnroll.html |  4 ++--
 .../webapps/ca/ee/ca/CertBasedEncryptionEnroll.html  |  4 ++--
 .../webapps/ca/ee/ca/CertBasedSingleEnroll.html      |  4 ++--
 .../shared/webapps/ca/ee/ca/DirPinUserEnroll.html    |  4 ++--
 .../ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html |  4 ++--
 dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html |  2 +-
 dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html |  2 +-
 .../shared/webapps/ca/ee/ca/ManObjSignEnroll.html    |  4 ++--
 .../ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html |  4 ++--
 .../ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html |  4 ++--
 .../shared/webapps/ca/ee/ca/PortalEnrollment.html    |  4 ++--
 .../shared/webapps/ca/ee/ca/ProfileList.template     |  2 +-
 .../shared/webapps/ca/ee/ca/ProfileSelect.template   |  2 +-
 .../shared/webapps/ca/ee/ca/ProfileSubmit.template   |  2 +-
 .../ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html  |  4 ++--
 .../ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html   |  4 ++--
 .../shared/webapps/ca/ee/ca/UserRevocation.html      |  4 ++--
 .../ca-ui/shared/webapps/ca/ee/ca/checkRequest.html  |  2 +-
 .../shared/webapps/ca/ee/ca/displayBySerial.template |  2 +-
 .../webapps/ca/ee/ca/displayBySerial2.template       |  2 +-
 .../shared/webapps/ca/ee/ca/displayCRL.template      |  2 +-
 .../shared/webapps/ca/ee/ca/displayCaCert.template   |  4 ++--
 .../webapps/ca/ee/ca/displayCertFromRequest.template |  2 +-
 .../ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html |  2 +-
 dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html  | 14 +++++++-------
 .../ca-ui/shared/webapps/ca/ee/ca/queryCert.template |  4 ++--
 .../shared/webapps/ca/ee/ca/reasonToRevoke.template  |  2 +-
 .../webapps/ca/ee/ca/remoteAuthConfig.template       |  2 +-
 .../shared/webapps/ca/ee/ca/requestStatus.template   |  2 +-
 dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html   | 16 ++++++++--------
 .../ca-ui/shared/webapps/ca/ee/ca/srchCert.template  |  4 ++--
 .../shared/webapps/ca/ee/ca/toDisplayCRL.template    |  2 +-
 .../shared/webapps/kra/GenUnexpectedError.template   |  2 +-
 .../shared/webapps/kra/agent/GenError.template       |  2 +-
 .../webapps/kra/agent/GenUnexpectedError.template    |  2 +-
 .../shared/webapps/kra/agent/kra/GrantRecovery.html  |  2 +-
 .../shared/webapps/kra/agent/kra/ListRequests.html   |  2 +-
 .../kra-ui/shared/webapps/kra/agent/kra/SrchKey.html | 12 ++++++------
 .../shared/webapps/kra/agent/kra/SrchRecoverKey.html | 12 ++++++------
 .../webapps/kra/agent/kra/displayBySerial.template   |  4 ++--
 .../webapps/kra/agent/kra/displayBySerial2.template  |  2 +-
 .../agent/kra/displayBySerialForRecovery.template    |  2 +-
 .../webapps/kra/agent/kra/examineRecovery.template   |  2 +-
 .../shared/webapps/kra/agent/kra/getStats.template   |  2 +-
 .../shared/webapps/kra/agent/kra/monitor.template    |  2 +-
 .../shared/webapps/kra/agent/kra/processReq.template |  2 +-
 .../shared/webapps/kra/agent/kra/queryKey.template   |  6 +++---
 .../kra/agent/kra/queryKeyForRecovery.template       |  6 +++---
 .../shared/webapps/kra/agent/kra/queryReq.template   |  2 +-
 .../shared/webapps/kra/agent/kra/srchKey.template    |  6 +++---
 .../kra/agent/kra/srchKeyForRecovery.template        |  6 +++---
 .../shared/webapps/ocsp/GenUnexpectedError.template  |  2 +-
 .../shared/webapps/ocsp/agent/GenError.template      |  2 +-
 .../webapps/ocsp/agent/GenUnexpectedError.template   |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/AddCA.html        |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/AddCRL.html       |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/CheckCert.html    |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/addCA.template    |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/addCRL.template   |  2 +-
 .../webapps/ocsp/agent/ocsp/checkCert.template       |  2 +-
 .../webapps/ocsp/agent/ocsp/getOCSPInfo.template     |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/getStats.template |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/listCAs.template  |  2 +-
 .../shared/webapps/ocsp/agent/ocsp/removeCA.template |  2 +-
 .../shared/webapps/tks/GenUnexpectedError.template   |  2 +-
 .../shared/webapps/tks/agent/GenError.template       |  2 +-
 .../webapps/tks/agent/GenUnexpectedError.template    |  2 +-
 .../shared/webapps/tks/agent/tks/getStats.template   |  2 +-
 109 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
index 1e51f85e9ac61b9fdd904deb1d6e30d36553cad6..312559994fa961767c37578ea37bcd30ad0dc478 100644
--- a/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
index 7a47f2c2bb626b0688af9629c29ddad9232cfb7d..57d118aa55c753816cfc6cd0c35392bb43b58410 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/admin/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
index d0e5af3dd474cdfbf217e0d4a8baf3a52f82897d..d3709831e9f9c1bba686fb5f45adec01a7e82e28 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
@@ -59,7 +59,7 @@ document.writeln('Congratulations a certificate has been issued and ' +
 document.writeln('<P>');
 document.writeln('Issued Certificates: </font>');
 document.writeln('<P>');
-document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/ca/admin/graphics/hr.gif" width="100%">');
+document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">');
 document.writeln('  <tr> ');
 document.writeln('    <td>&nbsp;</td>');
 document.writeln('  </tr>');
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
index 4fc9e01327109ed4fcf52e9b1b4c52d880238120..42db2311a87f179f82afd073103cafe6ba222f7a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
@@ -293,7 +293,7 @@ Administrator/Agent Certificate Enrollment<br>
   again, or to enroll other users, please see the documentation.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background=/ca/admin/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -311,7 +311,7 @@ Administrator/Agent Certificate Enrollment<br>
   </tr>
 </table>
 
-<table border="0" cellspacing="0" cellpadding="0" background=/ca/admin/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
index 33133ce3d3330a416de6f82671cb303f8594ded8..19f85f7abf2ca934db28c2e9eeda88c5183ac551 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
@@ -29,7 +29,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
index b00295c2f66d1d7d36dd707ac3f1ddc6658a2924..58534e03b2dfb4656aa8127a33a1a7a6e4e94c85 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
index a2f8e499de9b6ce85bc53b96107f47fbf42932cf..08bcd5240af0bbdcd01a0af441d83cddc7313db6 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
@@ -64,7 +64,7 @@ document.writeln('Congratulations a certificate has been issued and ' +
 document.writeln('<P>');
 document.writeln('Issued Certificates: </font>');
 document.writeln('<P>');
-document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">');
+document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">');
 document.writeln('  <tr> ');
 document.writeln('    <td>&nbsp;</td>');
 document.writeln('  </tr>');
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
index 967e5592f201f7bd37ea6b8c9a302baba9855858..882f43ee306da46752cc9106d5d5fcccfffaff57 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
@@ -46,7 +46,7 @@ function doSubmit(form)
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">List Requests<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to show a list of certificate requests.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
index 6e0558df9e2e4c68da85feb7460f8e3549f9efd1..ff8613b42469a52ae2f2b10e5dd7466e7eca10b1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
@@ -21,7 +21,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">Manage Certificate Profiles<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to approve a certificate profile.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
index 1514ad7540b8cc653383808c8c77a4ae72e8574e..42e0f5cb3cf00e5323750c22acdf1a3d47b4f7da 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
@@ -21,7 +21,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">Manage Certificate Profiles<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to approve a certificate profile.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
index 70e7b2ae8c4db3316fb06bd1daf9aa869eac6a2e..95c38b2f3aca7f3103629322ee70f81620e301c2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
@@ -34,7 +34,7 @@ if (typeof(requestId) != "undefined") {
 document.writeln('<br></font>');
 </script>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif"></font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
index 4e27f5245b97350dceab632f2ebe79317856a8c8..d3b9970265cc3d2a6eaaa209246cccc1548a33e3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
@@ -40,7 +40,7 @@ document.writeln(requestId);
 document.writeln('<br></font>');
 </script>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif"></font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif"
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif"
 width="100%">
   <tr>
     <td>&nbsp;</td>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
index 4c7139d69b3761b190e5fd3ac99441d2b0012fb2..87bf61f45096151f90b773c74c3b6b922f8a5be2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
@@ -21,7 +21,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">Approve Certificate Profile<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to approve a certificate profile.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
index 175efd7440af0a6b7cfd9f14404e279bc5c0ac23..f3c8db0264a2ea88d994771d3e84d3cd90723d6e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
@@ -32,7 +32,7 @@
 Use this form to compose queries based on properties of the certificate.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -45,7 +45,7 @@ Leave a box unchecked to ignore that filter.  You can click more than one box
 to get a combination of search criteria.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -166,7 +166,7 @@ function serialNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -208,7 +208,7 @@ function statusRangeCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -343,7 +343,7 @@ function subjectCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -641,7 +641,7 @@ function revocationReasonCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -901,7 +901,7 @@ function issuedOnCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1357,7 +1357,7 @@ function validityLengthCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1397,7 +1397,7 @@ function basicConstraints()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1649,7 +1649,7 @@ function doSubmit(form)
 <INPUT TYPE="HIDDEN" NAME="SSLClient" VALUE="">
 <INPUT TYPE="HIDDEN" NAME="SSLServer" VALUE="">
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
index cadce80eff06e4197db2bcf91c22a394f39c2153..08433aa7d30d6090c38589a6ec08a15484a489b9 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
@@ -32,7 +32,7 @@
 Use this form to compose queries based on properties of the request.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -45,7 +45,7 @@ Leave a box unchecked to ignore that filter.  You can click more than one box
 to get a combination of search criteria.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -150,7 +150,7 @@ function requestNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -192,7 +192,7 @@ function typeRangeCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -285,7 +285,7 @@ function doSubmit(form)
 <INPUT TYPE="HIDDEN" NAME="op" VALUE="">
 <INPUT TYPE="HIDDEN" NAME="queryRequestFilter" VALUE="">
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
index b811853126c46fd7211661358f0b38cfd25ad80d..4f11ddf334d77f4ab828147b73e03feef72bdf60 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
@@ -33,7 +33,7 @@ Use this form to revoke a set of certificates determined by one
 or more properties of the certificate.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -51,7 +51,7 @@ they are revoked.
 </font>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -172,7 +172,7 @@ function serialNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -312,7 +312,7 @@ function subjectCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -543,7 +543,7 @@ function issuedOnCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1091,7 +1091,7 @@ function doSubmit(form)
 <INPUT TYPE="HIDDEN" NAME="count" VALUE="">
 <INPUT TYPE="HIDDEN" NAME="unit" VALUE="">
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
index 9febeabdbcf5d9a5ccd97ea81dc715d9c6488b16..1fb9541cdf058986e59411326cee6ca0cb5c8da7 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
@@ -244,7 +244,7 @@ the update may not be reflected in the directory.
 You can use this form again to update those certificates.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
index ef763e83f9f8aeda3be806843dbfb6235c73cd8b..0f1ad7812e335aba2ef92dbb98d393fa8ad9e53b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
@@ -25,7 +25,7 @@
 Feature Unavailable to Clones
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
index 4f2d6f2d58e73091d4337d919cd9e4c2b791d4a5..5d994cd4325e8b6ba4d27b73be6dd7ca41840e46 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
@@ -104,7 +104,7 @@ if (navigator.appName == 'Netscape' &&
 //-->
 </SCRIPT>
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
index 5c700da66d7be89f38ff27b4ffd39a266fac2003..4a193e3243e79074feabd21e0094f4b5cea635b9 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
@@ -67,7 +67,7 @@ if (navigator.appName == 'Netscape' &&
 //-->
 </SCRIPT>
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="art/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
index b3f0a50a0504bd9d51590bbcb1fcf3d2eae02b58..988c6db51ff77147ec792476964aba14135e41ea 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
@@ -36,7 +36,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Certificate Revocation List
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
index 13bbb166b237ef791f1f82c6faf01682a936a03c..f1148570c5e1cd3c251ee64008228da2e710b421 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
@@ -55,7 +55,7 @@ function displayCert(cert)
 		'</font><br>');
 	document.writeln(
 		'<table border="0" cellspacing="0" cellpadding="0" '+
-		'background="/ca/agent/graphics/hr.gif" width="100%">'+
+		'background="/pki/images/hr.gif" width="100%">'+
 		'<tr>'+
 		'<td>&nbsp;</td>'+
 		'</tr>'+
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
index 46e4ccf3221a4d7523b988c5468dbfe3923ad002..cfafd620841ea22bbedddcbbfc0bf18fa9e2eccc 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
@@ -36,7 +36,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 OCSP Service
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
index 59c59eea58913eadf84606b9a40c0110e77939dc..0af670816ec222ab04d6e8c67fcdb68e36add836 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
@@ -36,7 +36,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Statistics
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
index 5b520f924e05d97e51fa379df7366514a4a27670..59e2f407827c17793c02bdc1ed19d2b05dda8d51 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
@@ -30,7 +30,7 @@
 <font size=-1 face="PrimaSans BT, Verdana, sans-serif">
 Use this form to query performance of this authority within a specified time range.</font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
index 1d84f9f207abb4a52c8b437236974c22e350206b..73c3eb7360180d03a4a1e10a1f2971a4d32fcf4b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
@@ -24,7 +24,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
 Monitor
 </font>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
index 4378959349131b4af63ba48fd35ec522ea04b024..4d263fefd44f4e75a6cf9e376312ded196a42c59 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
@@ -74,7 +74,7 @@ function renderFoot()
 if (result.header.seqNum == null) {
     document.writeln('<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
     document.writeln('Problem Processing Your Request</font>');
-    document.writeln('<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif">');
+    document.writeln('<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif">');
     agent/document.writeln('<tr><td>&nbsp;</td></tr></table>');
     document.writeln('<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
     document.write('<P>The Certificate Manager encountered a problem while processing your request.');
@@ -91,7 +91,7 @@ if (result.header.seqNum == null) {
 } else {
     document.writeln('<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
     document.writeln('Request <b>' + result.header.seqNum + '</b></font>');
-    document.writeln('<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif">');
+    document.writeln('<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif">');
     document.writeln('<tr><td>&nbsp;</td></tr></table>');
     document.writeln('<font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">');
 
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
index 2f8fc7778b5f49963470566d76b542a917a0a609..172125e3869ce72103fb2a3c94fa6ac7ce9dc526 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
@@ -1348,7 +1348,7 @@ document.writeln('Request <a href="/ca/agent/ca/processReq?seqNum='+
 				 'request \')" onMouseOut="return helpstatus(\'\')">'+
 				 result.header.seqNum + '</a></font>');
 
-document.writeln('<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif">');
+document.writeln('<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif">');
 document.writeln('<tr><td>&nbsp;</td></tr></table>');
 
 document.writeln('<FORM ACTION=/ca/processCertReq METHOD=POST ' +
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
index 3232205af9c14bac6cc4dfa85238934a74384a64..4cc7b9163dafbbcfe09379c568e83b5dc636ddda 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
@@ -118,7 +118,7 @@ function doSubmit(form)
 <font size=-1 face="PrimaSans BT, Verdana, sans-serif">
 Use this form to list certificates whose serial numbers fall within a specified range.</font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
index 401d59f082b0d25bf0540e4201566702f897fca0..a7ba0d045a60c06aeec59ceb4f1b1d7301051929 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
@@ -32,7 +32,7 @@
 Use this form to compose queries based on properties of the certificate.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -45,7 +45,7 @@ Leave a box unchecked to ignore that filter.  You can click more than one box
 to get a combination of search criteria.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -161,7 +161,7 @@ function serialNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -199,7 +199,7 @@ function statusRangeCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -321,7 +321,7 @@ function subjectCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -619,7 +619,7 @@ function revocationReasonCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -860,7 +860,7 @@ function issuedOnCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1335,7 +1335,7 @@ function validityLengthCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
index 32f30d22610f54f969f8524ddaeeaa0da8b55417..40ee64b0c0b62a0ff409f2617b956647b8779b59 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
@@ -64,7 +64,7 @@ table#t td {
 <body bgcolor="#FFFFFF" link="#000000" vlink="#000000" alink="#000000">
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">Search Results
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -383,7 +383,7 @@ document.write("</table>\n");
 	if ((result.header.revokeAll != null && result.header.totalRecordCount > 1) ||
         (result.header.querySentinelDown != null)) {
         document.write("<br>&nbsp;\n" +
-            "<table border='0' cellspacing='0' cellpadding='0' background='/graphics/hr.gif' width='100%'>\n"+
+            "<table border='0' cellspacing='0' cellpadding='0' background='/pki/images/hr.gif' width='100%'>\n"+
             "<tr><td>&nbsp;</td></tr></table>\n");
     }
 
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
index 9fb63a1097a11124ea9cb02f3ea63fd767a583d3..ed8285bb62a2dbf9b857927ebc77a2047b7409be 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
@@ -60,7 +60,7 @@ DIV.subject  A:hover {text-decoration: underline;}
 <font size=+1 face="PrimaSans BT, Verdana, sans-serif">Request Queue</font>
 <br>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
index 5752d14de888c87dcfc804a0f6f6fb3c16a5e0f0..ffb648beb117a304a5b6382c129dade20fbb3a09 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
@@ -261,7 +261,7 @@ Certificate Revocation Confirmation</font><br>
 Use this form to confirm certificate revocation by selecting appropriate
 revocation reason and submitting the form.</font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
index 8bbfd12a542d0d2bbfc834ae6a1d8a205046e630..7bfc6f6ef7420ae84fc580518096b19f9c781bf1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
@@ -33,7 +33,7 @@ Use this form to revoke a set of certificates determined by one
 or more properties of the certificate.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -51,7 +51,7 @@ they are revoked.
 </font>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -167,7 +167,7 @@ function serialNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -291,7 +291,7 @@ function subjectCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -531,7 +531,7 @@ function issuedOnCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
index fcaa1adf851ebfe2f5598f53275eaa8dee3f0c8b..001b0e3b5bde043997b6bdb4e1e12f3e10e87526 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
@@ -25,7 +25,7 @@
 <body bgcolor="#FFFFFF" link="#000000" vlink="#000000" alink="#000000">
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">Search Results
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/agent/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -319,7 +319,7 @@ if (result.recordSet.length == 0) {
          result.header.totalRecordCount > 1) ||
         (result.header.querySentinel != null)) {
         document.write("<br>&nbsp;\n" +
-            "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" background=\"/ca/agent/graphics/hr.gif\" width=\"100%\">\n"+
+            "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" background=\"/pki/images/hr.gif\" width=\"100%\">\n"+
             "<tr><td>&nbsp;</td></tr></table>\n");
     }
 
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
index a1467810e7ec4e881241f6dd34cfca86a6c8cca7..a2a30dd644b35279694bb5528786f3f6d01edf77 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
@@ -36,7 +36,7 @@ The numbers displayed in the recent changes column are
 representing newly revoked, taken off hold, and expired certificates.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
index 1d804a604598a50329c17d60505b11e87f85eb37..8f7e1990c8ac1f14c250a65c60d2776b76e09c19 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
@@ -35,7 +35,7 @@ In a few situations, however, you may want to update the CRL manually.
 Use this form to update the CRL manually.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
index 70216a5314618fabf126f89ecc7267e91e6a87a9..700d167cf32be89b99536e220b8a44dfa6564e6d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
@@ -34,7 +34,7 @@ In a few situations, however, you may want to update the CRL manually.
 Use this form to update the CRL manually.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
index ebe318599166fe36242b5f2472d983f4e993bb21..2b05486b4fdf8ada508c1ff7f6f9050f93126562 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
@@ -25,7 +25,7 @@
 Update Certificate Revocation List Result 
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
index 64954a257e46894d1105a8fb314f352d7c9bdb5d..942db568d59991aa05775bc5772b369a4c2a1f59 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
@@ -24,7 +24,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
 Update Directory Server Results 
 </font>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
index 7304e9690d6173ff33a7c50abfa85b9e5fb79057..60c8fe34c6dbfb6fea51c61a0f3877095d7cec95 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
@@ -150,7 +150,7 @@ AIM User Enrollment <br>
   automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -165,7 +165,7 @@ AIM User Enrollment <br>
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
index ac0698d7862e3358a0346cd945549ba5e4843efb..70b039dbf7d5593278db405f3f0ff990768d857f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
@@ -168,7 +168,7 @@ encryption cert can be found, and the user ID and password are correct your cert
 certificates, you want to remove the original pair from your database.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -183,7 +183,7 @@ certificates, you want to remove the original pair from your database.
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
index c6d6f416e408b5fa75919729a20f0de00ebce60c..68b466cb83eda30616528b3c53f5716bced91927 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
@@ -230,7 +230,7 @@ password are correct your certificate will be issued
   automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -245,7 +245,7 @@ password are correct your certificate will be issued
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
index 80e4358c72f65e386af7ac8d88245ac1fd3b590b..5591ac820ac9dfaa0473a79398d44815814382a3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
@@ -231,7 +231,7 @@ password are correct your certificate will be issued
   automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -246,7 +246,7 @@ password are correct your certificate will be issued
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
index 6371d744f3166c96baa7c4728b6a5710d099df28..a75fa76e1ac0de775cbfd5f0e6cc7fbc03b9eaad 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
@@ -240,7 +240,7 @@ Directory And PIN Based User Enrollment <br>
   your certificate will be issued automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -255,7 +255,7 @@ Directory And PIN Based User Enrollment <br>
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
index 668710343722e9f9ace09b223a53ef978d1d0629..e96f6bbf968831e6b487235c6ace78a91534a355 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
@@ -238,7 +238,7 @@ Directory Based User Enrollment <br>
   automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -253,7 +253,7 @@ Directory Based User Enrollment <br>
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
index 47fb11a0a2bd494fcd1b203cd08fea3e2c824197..52834145802a9ad3f7f777ee2b6559f3e0903810 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
@@ -78,7 +78,7 @@ Use this form to check whether a particular certificate has been revoked or
 to import the latest Certificate Revocation List. 
 </font>
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
index 4afe4dd49877e7f0bde3bed3084d4b822d73a399..d34610d5ede6abd4393d14333215de55cf06ff73 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
@@ -44,7 +44,7 @@ Use this form to import the CA certificate chain into your browser (users)
 or your server (administrators). This is a one-time operation. 
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
index 3a8b70d2ed62569f7d0ab8e10cd1406bb2c625fb..cf08033f3f6b6ddebbd3f09a5b3b835c81f1a76f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
@@ -327,7 +327,7 @@ Manual Object Signing Enrollment
   you will receive the certificate in email, along with instructions for 
   installing it.
   </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -342,7 +342,7 @@ Manual Object Signing Enrollment
 	  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
index b82ec1d0675f0130875ef4edb401ce8d887049df..4f3ecc10fd40bda69f4a1d8703023d3a5662f816 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
@@ -318,7 +318,7 @@ Manual User Enrollment
   you will receive the certificate in email, along with instructions for 
   installing it.
   </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -333,7 +333,7 @@ Manual User Enrollment
 	  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
index 3cf5b0e2ed41710bddd5cbac4917a1be1fc07d06..77cde040354adbb62f79206daf03f6b29725b661 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
@@ -230,7 +230,7 @@ NIS Based User Enrollment <br>
   automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -245,7 +245,7 @@ NIS Based User Enrollment <br>
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
index eebc08a59d43c42ff2168651d4a74fc31e3b4e7e..7df6433aec8449f18533f9ba1eb72f289ec4ce0c 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
@@ -272,7 +272,7 @@ Portal User Enrollment <br>
   will be done automatically.
   </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -287,7 +287,7 @@ Portal User Enrollment <br>
 	plan to use your certificate.  </font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
index de7c32c930106c5c54c04c66e7018bbed06ad687..fc063e15251e300e49684c6a6b3652b3be961e2a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
@@ -25,7 +25,7 @@ Certificate Profile
   Use this form to select a certificate profile for the request.
 <p> 
 </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif"
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif"
 width="100%">
   <tr>
     <td>&nbsp;</td>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
index 6a63a0a92a52688c72f68ee7439e7e66405e3f9e..bcb047dbf80c578c05ef83d8ac407189235502f1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
@@ -25,7 +25,7 @@ Certificate Profile
   Use this form to submit the request.
 <p>
 </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif"
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif"
 width="100%">
   <tr>
     <td>&nbsp;</td>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
index 6fa3a0d7197712a39fb79036095cab2f9ee0e20b..ce1ec122e726ac4986e79151413e4836ef5021fd 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
@@ -24,7 +24,7 @@ Certificate Profile
   <Font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
 <p>
 </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif"
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif"
 width="100%">
   <tr>
     <td>&nbsp;</td>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
index a286e826009105e8987f6ed9dbb0a2faac8c24e7..833a9a51ee3dd87d358addb7d6b8d1045342a143 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
@@ -235,7 +235,7 @@ End Sub
   automatically.
 </font>
 
-<table border="0" cellspacing="0" cellpadding="2" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="2" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -253,7 +253,7 @@ End Sub
   </tr>
 </table>
 
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
index 2a73318098cbdb6a9e8df6c3604d5e9115321c1e..df65046b6020807df7d6a4e40af2e724bdc98a9a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
@@ -34,7 +34,7 @@
   certificates you can send to the server. Select the 
   certificate you want to renew from this window. 
   </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -49,7 +49,7 @@
 	</font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
index d9013c160bfe4070659b90f3a62a9e231b6bdde3..f8d653e054bee190aceb508bf7afa4e84f8c08f0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
@@ -32,7 +32,7 @@
   certificates you can send to the server. Select the certificate you 
   want to revoke from this window.
 </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -48,7 +48,7 @@
 	</font></td>
   </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
index b43e5845938c262f8ddd44d4f517ddc0fe4c1a40..2fbaa048db468077d9322c346f894049bc56cd52 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
@@ -33,7 +33,7 @@
 Use this form to verify status of the specified certificate request.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
index e01e4e123f8d7395788e146123e88dafd8dd3eb6..e9b4d72bfb2b23a67c15282ae521b513d7a5dbfd 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
@@ -74,7 +74,7 @@ if (navigator.appName == 'Netscape' &&
 //-->
 </SCRIPT>
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
index 909cf8030f9f0f654464a96ef39523a806c8af5d..f8f30649920979e888c9a9fb91a5e563eca0270a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
@@ -67,7 +67,7 @@ if (navigator.appName == 'Netscape' &&
 //-->
 </SCRIPT>
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
index 2b98ed588b8c900f2a3992b3aff63cfd309af5e4..e829387c1ec5f99eb4df246da131dde320c99534 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
@@ -28,7 +28,7 @@
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Certificate Revocation List
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
index 7ce74f91f378a4939b9f298aadbf3bae2fd787c8..4e93919f53d553872ff9ee98356d81edda9a7640 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
@@ -28,7 +28,7 @@
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 CA Certificate Chain
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width=
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width=
 "100%">
   <tr>
     <td>&nbsp;</td>
@@ -66,7 +66,7 @@ if (result.header.displayFormat == "chain") {
 
 function displayCertificate(cert,i)
 {
-    document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">' + '\n' +
+    document.writeln('<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">' + '\n' +
     '  <tr>' + '\n' +
     '    <td>&nbsp;</td>' + '\n' +
     '  </tr>' + '\n' +
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
index d30744150b829df9fd79e49a4a40dec50ed67023..aafa17aca89305e5a5789dbe43a14e5a4f5a6047 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
@@ -55,7 +55,7 @@ function displayCert(cert)
 		'</font><br>');
 	document.writeln(
 		'<table border="0" cellspacing="0" cellpadding="0" '+
-		'background="/ca/ee/graphics/hr.gif" width="100%">'+
+		'background="/pki/images/hr.gif" width="100%">'+
 		'<tr>'+
 		'<td>&nbsp;</td>'+
 		'</tr>'+
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
index 1afb746e8d0163d6834eaffb7f78937bcac4c007..557a1cf171bb5a89b110030e2f4a74f41b2e85a6 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
@@ -122,7 +122,7 @@ function doSubmit(form)
 Use this form to list certificates whose serial numbers fall within a 
 specified range.</font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
index 25eaca6d3acca3908f61fbffec47cad3792d8c4d..32e2ac64402ba7972e247d51c03de20abee0914d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
@@ -34,7 +34,7 @@ Search for Certificates
 Use this form to compose queries based on properties of the certificate.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -47,7 +47,7 @@ Leave a box unchecked to ignore that filter.  You can click more than one box
 to get a combination of search criteria.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -165,7 +165,7 @@ function serialNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -299,7 +299,7 @@ function subjectCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -596,7 +596,7 @@ function revocationReasonCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -838,7 +838,7 @@ function issuedOnCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1316,7 +1316,7 @@ function validityLengthCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
index a6dcf31f378f2b886c6b6d86c9789ba9cca46764..1165cb309431cf4e7f83eed6759925b86d11d23e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
@@ -62,7 +62,7 @@ table#t td {
 <body bgcolor="#FFFFFF" link="#000000" vlink="#000000" alink="#000000">
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">Search Results
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -358,7 +358,7 @@ document.write("</table>\n");
 	if ((result.header.revokeAll != null && result.header.totalRecordCount > 1) ||
         (result.header.querySentinelDown != null)) {
         document.write("<br>&nbsp;\n" +
-            "<table border='0' cellspacing='0' cellpadding='0' background='/graphics/hr.gif' width='100%'>\n"+
+            "<table border='0' cellspacing='0' cellpadding='0' background='/pki/images/hr.gif' width='100%'>\n"+
             "<tr><td>&nbsp;</td></tr></table>\n");
     }
 
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
index b8b161a93e89f0e5d5bba3e6a3320c16fa6781d7..7edfe7e29db58d2190f738d2c9dc6f4ac021284a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
@@ -257,7 +257,7 @@ Certificate Revocation Confirmation</font><br>
 Use this form to confirm certificate revocation by selecting appropriate
 revocation reason and submitting the form.</font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
index 777c61575152ddc2371322e307a6d60e0c8723e9..f66f683cf02f2e38766c73c9b7e62e4e8f03aa78 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
@@ -32,7 +32,7 @@ Delegated Administrator
 <font size="-1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
 Directory Enrollment Setup.
 </font>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
index b00e55766ee5520c74e9a691203d277f01f4578a..a25f5e2ada419cbf515168783e83cf9c4fcd4697 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
@@ -31,7 +31,7 @@
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Request Status
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/ca/ee/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
index 04331b7b649003f169822de6a262f864b281c6be..2676d2592218d9da1b26dc44e08f130a1e2fb6c5 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
@@ -34,7 +34,7 @@ Search for Certificates
 Use this form to compose queries based on properties of the certificate.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -47,7 +47,7 @@ Leave a box unchecked to ignore that filter.  You can click more than one box
 to get a combination of search criteria.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -170,7 +170,7 @@ function serialNumberRangeCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -320,7 +320,7 @@ function subjectCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -619,7 +619,7 @@ function revocationReasonCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -852,7 +852,7 @@ function issuedOnCrit()
 </SCRIPT>
 
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1310,7 +1310,7 @@ function validityLengthCrit()
 //-->
 </SCRIPT>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -1544,7 +1544,7 @@ function doSubmit(form)
 <INPUT TYPE="HIDDEN" NAME="SSLClient" VALUE="">
 <INPUT TYPE="HIDDEN" NAME="SSLServer" VALUE="">
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
index 6381cec87d62353f45c13eb2f6180314094e33d4..4213d000a94eb19d12a93029c7483f316756186b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
@@ -61,7 +61,7 @@ table#t td {
 <body bgcolor="#FFFFFF" link="#000000" vlink="#000000" alink="#000000">
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">Search Results
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
@@ -372,7 +372,7 @@ document.write("</table>\n");
 	if ((result.header.revokeAll != null && result.header.totalRecordCount > 1) ||
         (result.header.querySentinel != null)) {
         document.write("<br>&nbsp;\n" +
-            "<table border='0' cellspacing='0' cellpadding='0' background='/graphics/hr.gif' width='100%'>\n"+
+            "<table border='0' cellspacing='0' cellpadding='0' background='/pki/images/hr.gif' width='100%'>\n"+
             "<tr><td>&nbsp;</td></tr></table>\n");
     }
 
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
index 53c353e8d15ef6e4667aeb61798f5a2ec6145f4a..2a158381fa37e8bc7da0acf16f03f373dd434116 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
@@ -84,7 +84,7 @@ Use this form to check whether a particular certificate has been revoked or
 to import the latest Certificate Revocation List. 
 </font>
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/ca/ee/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
index a6ec193bced55f17491e903030284e628d9c38f5..8cf1a05b968e601c5217d2c9ea4ab689161a573c 100644
--- a/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
+++ b/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/kra/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
index 2ecb08cf597d23f761cde1b1a3345d530f9b3654..00fc21da0224bf239969fc5deceddb8f3f6d1450 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/kra/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
index 0af3aa15db773c46ec0af8ec3062ac0f64637ccd..2427a67b606321e3e2093880ca7984a2864b09e1 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/kra/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
index 225bbdb3053dce97130d362851aae9b43f1f37ea..4a2cf018ed020343710bc8b3091cd2513f55f972 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
@@ -12,7 +12,7 @@
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to approve a key recovery.
 </font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
index 89fe2f30e10ad6552dbdc204c587fa676670540f..7150c5d6096e2b3f690bc71b354421c0782825c3 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
@@ -30,7 +30,7 @@ function doSubmit(form)
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">List Requests<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to show a list of key service requests.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
index 685405465ac92f3513a3ddbba01a0f6e47b6b55e..ce2d8843363ba7da75a6d2ef831210d65f4462be 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
@@ -153,7 +153,7 @@ function doSubmit(form)
 </font>
 <br><font size=-1 face="PrimaSans BT, Verdana, sans-serif">Use this form
 to search for archived keys according to the criteria you specify. 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -166,7 +166,7 @@ In the list of keys found by the search, you can click a button to display
 details about individual keys.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -190,7 +190,7 @@ belonging to a particular owner</font>
 </blockquote>
 </form>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -236,7 +236,7 @@ key identifier:</font>
 </blockquote>
 </form>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -252,7 +252,7 @@ Copy the certificate, then paste it into this text area.</font>
 <textarea name="publicKeyData" rows=10 cols=64></textarea></form>
 </blockquote>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -281,7 +281,7 @@ Note: Archiver information is available only when the Certificate Manager or Reg
 <input type="HIDDEN" name="op" value="">
 <input type="HIDDEN" name="maxCount" VALUE="5">
 <input type="HIDDEN" name="queryFilter" VALUE="">
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
index f4de8ca1f848368840093ea9f0ecc6d8bbdbf1d4..ccffb0775e719677b2932dd430f410bb1d60f401 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
@@ -158,7 +158,7 @@ function doSubmit(form)
 Recover Keys (for Administrators)</font>
 <br><font size=-1 face="PrimaSans BT, Verdana, sans-serif">Use this form
 to search for archived keys according to the criteria you specify. 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -169,7 +169,7 @@ lets you specify a key property. Select a property, then fill in any needed deta
 In the list of keys found by the search, you can click a button to recover individual keys.
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -193,7 +193,7 @@ keys belonging to a particular owner</font>
 </blockquote>
 </form>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -239,7 +239,7 @@ key identifier:</font>
 </blockquote>
 </form>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -255,7 +255,7 @@ Copy the certificate, then paste it into this text area.</font>
 <textarea name="publicKeyData" rows=10 cols=64></textarea></form>
 </blockquote>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -286,7 +286,7 @@ Note: Archiver information is available only when the Certificate Manager or Reg
 <input type="HIDDEN" name="maxCount" VALUE="5">
 <input type="HIDDEN" name="queryFilter" VALUE="">
 <input type="HIDDEN" name="publicKeyData" VALUE="">
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
index 8b6795365930bb3e9cb468412091a30978cdf6fd..117535fa18f451f9620af33222e7d9202891668a 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
@@ -59,7 +59,7 @@ if (result.header.errorDetails != null) {
         'request \')" onMouseOut="return helpstatus(\'\')">' +
         renderHexNumber(result.header.serialNumber,8) +
         '</a></font></font>');
-	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
 	document.writeln('<table border="0" cellspacing="2" cellpadding="2" width="100%">');
 	document.writeln('<tr><td valign="top" align="left" colspan="3" bgcolor="#e5e5e5">');
@@ -113,7 +113,7 @@ if (result.header.errorDetails != null) {
     }
 
 	document.write("</table>");
-	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 }
 </script>
 </body>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
index 332d205c2b5975551bb6b9bc734e2ef5fff6891e..30af980ec7c45184bd5d20de2fde8b64b8c653bd 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
@@ -50,7 +50,7 @@ if (navigator.appName == 'Netscape' &&
 //-->
 </SCRIPT>
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="art/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
index b1c931b123a1bfaadfa6da5147c12966aa6def5f..125e02e4a95c770de129c25146f0281251e34991 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
@@ -100,7 +100,7 @@ if (result.header.errorDetails != null) {
         renderHexNumber(result.header.serialNumber,8) +
         '</a></font></font>');
 
-        document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
     	document.write('<form method=post ' +
           'action="' + '/kra/agent/kra/recoverBySerial' + '">\n');
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
index 240f7e9e447e3473f4d3f41ecf32db669339a326..f5a1f1f14acdfabdf168ba9a6d21e59017929136 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
@@ -53,7 +53,7 @@ if (result.header.errorDetails != null) {
         'Recovery Operation ' + result.header.recoveryID +
         '</font></font>');
 
-	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
        document.write('<form method=post ' +
           'action="' + '/kra/agent/kra/grantRecovery' + '">\n');
 
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
index cfd2f31939c72ee8f421895a8e7bb9d1a3fae4a4..b2cb3415a95ff810c462cbe1162cd161143b66d7 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
@@ -20,7 +20,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Statistics
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
index 27fa7f84aa79203a223a7bf729bbb6118d95c66b..35896baf16b0533bf0e1a042b02d0926f516b6a0 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
@@ -8,7 +8,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
 Monitor
 </font>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
index a5292102df7e9e24134221fdeb89728e795c3e68..078764d989640f46a4a711def96c0bced016b37a 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
@@ -68,7 +68,7 @@ document.writeln(
 	'request \')" onMouseOut="return helpstatus(\'\')">' +
 	result.header.seqNum + 
 	'</a></font></font>');
-document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD></TD></TR></TABLE>');
+document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD></TD></TR></TABLE>');
 
 
 document.writeln('<form action="/kra/agent/kra/getAsyncPk12" method=post onSubmit="return passwdValidate()">');
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
index f7560a1938516f87cd2d87e9a7a1c6f40b0a7bc6..fd2348dc6af04b012a3d2e053471eb25cf7aa0d7 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
@@ -174,11 +174,11 @@ if (result.header.errorDetails != null) {
 	writeError(result.header.errorDetails);
 } else if (result.header.totalRecordCount == 0) {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<div align=left><b><font face="PrimaSans BT, Verdana, sans-serif" size="+1">No Matching Key Found</font></b></div>\n');
 } else {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>');
 	document.write('Authority: ' +
 (result.header.archiverName != null ? result.header.archiverName : "UNKNOWN"));
@@ -195,7 +195,7 @@ if (result.header.errorDetails != null) {
 		displayKeyRecord(result.recordSet[i]);
 	}
 	document.write('</table>');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
 	if (result.header.querySentinel != null) {
 		displayNextForm();
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
index 590584dd404f226d0895850e3c7da270a2ddfa0a..aec54464d1e12b4bd8d230ec5287783a798bf61d 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
@@ -186,11 +186,11 @@ if (result.header.errorDetails != null) {
 	writeError(result.header.errorDetails);
 } else if (result.header.totalRecordCount == 0) {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<div align=left><b><font face="PrimaSans BT, Verdana, sans-serif" size="+1">No Matching Key Found</font></b></div>\n');
 } else {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>');
 	document.write('Authority: ' +
 (result.header.archiverName != null ? result.header.archiverName : "UNKNOWN"));
@@ -207,7 +207,7 @@ if (result.header.errorDetails != null) {
 		displayKeyRecord(result.recordSet[i]);
 	}
 	document.write('</table>');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
 	if (result.header.querySentinel != null) {
 		displayNextForm();
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
index 47db884fae685812ae6f648ffb15ad485024f17a..61a7bb0a202637035963eb2e387411c252fe9339 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
@@ -38,7 +38,7 @@ table#t td {
 <font size=+1 face="PrimaSans BT, Verdana, sans-serif">Request Queue</font>
 <br>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
index bc64ea44501bfc69ae9e826c67c63a8250363451..f9d39e19491df5b8f557e74cb0c59cf34bae0fea 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
@@ -174,11 +174,11 @@ if (result.header.errorDetails != null) {
 	writeError(result.header.errorDetails);
 } else if (result.header.totalRecordCount == 0) {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<div align=left><b><font face="PrimaSans BT, Verdana, sans-serif" size="+1">No Matching Key Found</font></b></div>\n');
 } else {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>');
 	document.write('Authority: ' +
 (result.header.archiverName != null ? result.header.archiverName : "UNKNOWN"));
@@ -203,7 +203,7 @@ if (result.header.errorDetails != null) {
 		displayKeyRecord(result.recordSet[i]);
 	}
 	document.write('</table>');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
 }
 
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
index 2c421a5e754198e898487b79828915ae45c40542..a4605ff9a0d2475c6fa2e115b5ece97ca73872fd 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
@@ -187,11 +187,11 @@ if (result.header.errorDetails != null) {
 	writeError(result.header.errorDetails);
 } else if (result.header.totalRecordCount == 0) {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<div align=left><b><font face="PrimaSans BT, Verdana, sans-serif" size="+1">No Matching Key Found</font></b></div>\n');
 } else {
         document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>Search Results</font>\n');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 	document.write('<font face="PrimaSans BT, Verdana, sans-serif" size=+1>');
 	document.write('Authority: ' +
 (result.header.archiverName != null ? result.header.archiverName : "UNKNOWN"));
@@ -217,7 +217,7 @@ if (result.header.errorDetails != null) {
 		displayKeyRecord(result.recordSet[i]);
 	}
 	document.write('</table>');
-        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/graphics/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
+        document.write('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
 }
 
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
index b7842462633774be45dfd6b8e4690e0d63527cd2..824bdb9e95756540012e912bbf0e66eb7a217003 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ocsp/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
index c2b45826e590dc9c9ace9d5b6542ec1f89a9cd78..13996d5d4436c8c4ceeb335479eabddbcad4044a 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ocsp/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
index d68d10a19852c557036c01e348eb248351356c7a..a929c760f57e5824c4c9bfa3908f28cabda8fb12 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/ocsp/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
index a9a67bf95d546c7e7308e94677a37a2320370e68..43f2503a137a4d5908e959b1eb0b50a523502006 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
@@ -27,7 +27,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">Add Certificate Authority<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to add the certificate chain of a Certificate Authority whose CRL will be accepted by this OCSP Authority.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
index 42855a726ed126a0393c4e4aa822731bd54800a7..4a6878a00d8b9b968c41df65cd694c2b5ca4236c 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
@@ -27,7 +27,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">Add Certificate Revocation List<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to add the certificate revocation list of a Certificate Authority.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
index 541c899c694ce8d9e1f762dc267a7f35c670e8e2..ca15f1404ba6b6cc5197bf9c29e2f729c6546541 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
@@ -27,7 +27,7 @@
 <font size="+1" face="PrimaSans BT, Verdana, sans-serif">Check Certificate Status<br></font>
 <font size="-1" face="PrimaSans BT, Verdana, sans-serif">
 Use this form to confirm the status of a certificate.</font>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
index 5d71adca84ac450f2eb6c44018b649a586be4239..3205ee0b9573ac8070793ace213edbb3e7462945 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Adding Certificate Authority
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
index 12f4ce1d392a7ee8e0f9d14b90b9a11cf61becb0..99f227c47936c2269698fb4757c785c1df788396 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Adding Certificate Revocation List
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
index d00e15c315a846e63b70f4bc540ce79cf3aad3c7..5e8b8938c3239b9936836d3f4aab4f336d45dc21 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Online Certificate Status
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
index 8b739b45dd714e90b27e1d13a6a1cab4c5fa0bec..9a2769777ee0aa8931220ef79324873dd1f358b8 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 OCSP Service
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
index a08a6fe6076fb4da8b454080fbe56025de15bd0d..59ae3e6d37ba0e1ca6ad50412bb9a7794e0d47e1 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Statistics
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
index 6fbf5fd73f2a1181972566bff984deb728c72da1..93cc6cdf344574bfe4985d21c396da1b9c96928b 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 List Certificate Authorities
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
index 1b85bba9542b72d489591ab4074d60d41a1b0199..7da892454c1d8be1509a0c175d31b8bf6d500e31 100755
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Removing Certificate Authority
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
index 53e975d1498c801211d1713a95d3df8577bba0c5..af0683fa073b22f948c24b5b4b2ef8ac66f35c87 100644
--- a/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
+++ b/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/tks/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
index e4a49ae0757c4380e653d8b9473aebd3156caf63..0db5d1d22a100d400dc46b854049981f4a51fada 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/tks/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
index 53287a8a08c9a6df7d7b052e378824bd570fc1be..4047cd6161f9dc6afa6664d5417b859793f3a143 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
@@ -27,7 +27,7 @@
 Problem Processing Your Request
 </font>
 
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/tks/agent/graphics/hr.gif" >
+<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif" >
   <tr>
     <td>&nbsp;</td>
   </tr>
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template b/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
index a08a6fe6076fb4da8b454080fbe56025de15bd0d..59ae3e6d37ba0e1ca6ad50412bb9a7794e0d47e1 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
@@ -37,7 +37,7 @@ if (navigator.appName == "Microsoft Internet Explorer") {
 <font face="PrimaSans BT, Verdana, sans-serif" size="+1">
 Statistics
 </font><br>
-<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" background="/pki/images/hr.gif" width="100%">
   <tr> 
     <td>&nbsp;</td>
   </tr>
-- 
1.7.12.1

