diff --git a/Extension/src/LanguageServer/settingsPanel.ts b/Extension/src/LanguageServer/settingsPanel.ts
index c939c8f05..da1939796 100644
--- a/Extension/src/LanguageServer/settingsPanel.ts
+++ b/Extension/src/LanguageServer/settingsPanel.ts
@@ -356,11 +356,16 @@ export class SettingsPanel {
content = fs.readFileSync(util.getLocalizedHtmlPath("ui/settings.html")).toString();
- content = content.replace(
- /{{root}}/g,
- vscode.Uri.file(util.extensionPath)
- .with({ scheme: 'vscode-resource' })
- .toString());
+ if (this.panel && this.panel.webview) {
+ const cppImageUri: vscode.Uri = this.panel.webview.asWebviewUri(vscode.Uri.file(path.join(util.extensionPath, 'LanguageCCPP_color_128x.png')));
+ content = content.replace(
+ /{{cpp_image_uri}}/g,
+ cppImageUri.toString());
+ const settingsJsUri: vscode.Uri = this.panel.webview.asWebviewUri(vscode.Uri.file(path.join(util.extensionPath, 'out/ui/settings.js')));
+ content = content.replace(
+ /{{settings_js_uri}}/g,
+ settingsJsUri.toString());
+ }
content = content.replace(
/{{nonce}}/g,
diff --git a/Extension/ui/settings.html b/Extension/ui/settings.html
index 25820bc41..ae8add75c 100644
--- a/Extension/ui/settings.html
+++ b/Extension/ui/settings.html
@@ -3,7 +3,7 @@
-
+