diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 915ccaacd..5b90964fc 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -376,14 +376,10 @@ class Theme
      */
     public function getPreviewImageUrl()
     {
-        $previewPath = $this->getConfigValue('preview');
+        $previewPath = $this->getConfigValue('previewImage', 'assets/images/theme-preview.png');
 
-        if (!$previewPath) {
-            $previewPath = '/assets/images/theme-preview.png';
-        }
-
-        if (File::exists($this->getPath().$previewPath)) {
-            return Url::asset('themes/'.$this->getDirName().$previewPath);
+        if (File::exists($this->getPath().'/'.$previewPath)) {
+            return Url::asset('themes/'.$this->getDirName().'/'.$previewPath);
         }
 
         return Url::asset('modules/cms/assets/images/default-theme-preview.png');
diff --git a/modules/cms/classes/theme/fields.yaml b/modules/cms/classes/theme/fields.yaml
index fb5ee6414..7b1a1286d 100644
--- a/modules/cms/classes/theme/fields.yaml
+++ b/modules/cms/classes/theme/fields.yaml
@@ -45,10 +45,3 @@ tabs:
         code:
             label: cms::lang.theme.code_label
             placeholder: cms::lang.theme.code_placeholder
-            span: auto
-
-        preview:
-            label: cms::lang.theme.preview_label
-            placeholder: cms::lang.theme.preview_placeholder
-            default: '/assets/images/theme-preview.png'
-            span: auto
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index b73e09a7d..56fdb4751 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -45,8 +45,8 @@ return [
         'homepage_placeholder' => 'Website URL',
         'code_label' => 'Code',
         'code_placeholder' => 'A unique code for this theme used for distribution',
-        'preview_label' => 'Preview',
-        'preview_placeholder' => 'The path of theme preview image.',
+        'preview_image_label' => 'Preview image',
+        'preview_image_placeholder' => 'The path of theme preview image.',
         'dir_name_label' => 'Directory name',
         'dir_name_create_label' => 'The destination theme directory',
         'theme_label' => 'Theme',