diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
index 4a9f4ab8fea..e5008aaf3b0 100644
--- a/application/helpers/update/updatedb_helper.php
+++ b/application/helpers/update/updatedb_helper.php
@@ -3757,7 +3757,21 @@ function ($v) {
             $oTransaction->commit();
         }
 
-        if ($iOldDBVersion < 442) { 
+        if ($iOldDBVersion < 442) {
+            $oTransaction = $oDB->beginTransaction();
+            $questionTheme = new QuestionTheme();
+            $questionsMetaData = $questionTheme->getAllQuestionMetaData(false, false, true)['available_themes'];
+            foreach ($questionsMetaData as $questionMetaData) {
+                $oQuestionTheme = QuestionTheme::model()->findByAttributes([
+                    "name" => $questionMetaData['name'],
+                    "extends" => $questionMetaData['questionType'],
+                    "theme_type" => $questionMetaData['type']
+                ]);
+                if (!empty($oQuestionTheme) && $oQuestionTheme->image_path != $questionMetaData['image_path']) {
+                    $oQuestionTheme->image_path = $questionMetaData['image_path'];
+                    $oQuestionTheme->save();
+                }
+            }
             $oTransaction = $oDB->beginTransaction();
             $oDB->createCommand()->insert("{{plugins}}", [
                 'name'               => 'TwoFactorAdminLogin',
diff --git a/application/models/QuestionTheme.php b/application/models/QuestionTheme.php
index 04582092a5b..ecee5a83119 100644
--- a/application/models/QuestionTheme.php
+++ b/application/models/QuestionTheme.php
@@ -714,7 +714,7 @@ public static function findAllQuestionMetaDataForSelector()
             $baseQuestion['image_path'] = str_replace(
                 '//',
                 '/',
-                App()->getConfig('publicurl') . $baseQuestion['image_path']
+                Yii::app()->baseUrl . '/' . $baseQuestion['image_path']
             );
             $baseQuestionsModified[] = $baseQuestion;
         }