diff --git a/src/_h5ai/backend/php/core/class-setup.php b/src/_h5ai/backend/php/core/class-setup.php
index 59618842..affec3f1 100644
--- a/src/_h5ai/backend/php/core/class-setup.php
+++ b/src/_h5ai/backend/php/core/class-setup.php
@@ -109,10 +109,12 @@ class Setup {
         $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('APP_PATH')), false));
 
         $this->set('PUBLIC_HREF', Util::normalize_path($this->get('APP_HREF') . '/public', true));
-        $this->set('INDEX_HREF', Util::normalize_path($this->get('APP_HREF') . '/public/index.php', false));
+        $this->set('PUBLIC_PATH', Util::normalize_path($this->get('APP_PATH') . '/public', false));
 
-        $this->set('CACHE_PUB_HREF', Util::normalize_path($this->get('APP_HREF') . '/public/cache', true));
-        $this->set('CACHE_PUB_PATH', Util::normalize_path($this->get('APP_PATH') . '/public/cache', false));
+        $this->set('INDEX_HREF', Util::normalize_path($this->get('PUBLIC_HREF') . '/index.php', false));
+
+        $this->set('CACHE_PUB_HREF', Util::normalize_path($this->get('PUBLIC_HREF') . '/cache', true));
+        $this->set('CACHE_PUB_PATH', Util::normalize_path($this->get('PUBLIC_PATH') . '/cache', false));
         $this->set('HAS_WRITABLE_CACHE_PUB', @is_writable($this->get('CACHE_PUB_PATH')));
 
         $this->set('CACHE_PRV_PATH', Util::normalize_path($this->get('APP_PATH') . '/backend/cache', false));
diff --git a/src/_h5ai/backend/php/core/class-theme.php b/src/_h5ai/backend/php/core/class-theme.php
index 5790c2a7..f6549f89 100644
--- a/src/_h5ai/backend/php/core/class-theme.php
+++ b/src/_h5ai/backend/php/core/class-theme.php
@@ -13,9 +13,9 @@ class Theme {
 
     public function get_icons() {
 
-        $app_path = $this->context->get_setup()->get('APP_PATH');
+        $public_path = $this->context->get_setup()->get('PUBLIC_PATH');
         $theme = $this->context->query_option('view.theme', '-NONE-');
-        $theme_path = $app_path . '/client/images/themes/' . $theme;
+        $theme_path = $public_path . '/images/themes/' . $theme;
 
         $icons = [];