diff --git a/ui/icon/src/icon.ts b/ui/icon/src/icon.ts
index c91e9a9ce..616c037f5 100644
--- a/ui/icon/src/icon.ts
+++ b/ui/icon/src/icon.ts
@@ -91,6 +91,7 @@ export class AlwatrIcon extends DirectionMixin(SignalMixin(AlwatrBaseElement)) {
 
   protected async _fetchIcon(): Promise<void> {
     this._logger.logMethodArgs('_fetchIcon', {name: this.name});
+    this._svg = null;
 
     if (this.name == null || this.name === '') {
       // if (this._svg != null) this._svg = null;
diff --git a/ui/ui-kit/src/button/icon-button.ts b/ui/ui-kit/src/button/icon-button.ts
index 84acddf9f..384be9d5e 100644
--- a/ui/ui-kit/src/button/icon-button.ts
+++ b/ui/ui-kit/src/button/icon-button.ts
@@ -33,7 +33,7 @@ export interface IconButtonContent extends StringifyableRecord {
    */
   clickDetail?: Stringifyable;
 
-  disabled?: true;
+  disabled?: boolean;
 }
 
 /**
@@ -99,7 +99,7 @@ export class AlwatrStandardIconButton extends AlwatrSurface {
     if (this.content == null) return;
 
     const disabled = Boolean(this.content.disabled);
-    if (this.hasAttribute('disabled') === disabled) {
+    if (this.hasAttribute('disabled') !== disabled) {
       this.toggleAttribute('disabled', disabled);
     }