diff --git a/packages/fighting-theme/src/avatar.scss b/packages/fighting-theme/src/avatar.scss
index 49d0ce8dd..7eeb0f026 100644
--- a/packages/fighting-theme/src/avatar.scss
+++ b/packages/fighting-theme/src/avatar.scss
@@ -5,6 +5,7 @@
   align-items: center;
   display: inline-flex;
   justify-content: center;
+  flex-shrink: 0;
   width: var(--avatar-size);
   height: var(--avatar-size);
   background-color: var(--avatar-background);
diff --git a/packages/fighting-theme/src/image.scss b/packages/fighting-theme/src/image.scss
index 237a18dd3..6e29b8e8d 100644
--- a/packages/fighting-theme/src/image.scss
+++ b/packages/fighting-theme/src/image.scss
@@ -2,6 +2,7 @@
   position: relative;
   vertical-align: top;
   display: inline-block;
+  flex-shrink: 0;
   width: var(--image-width);
   height: var(--image-height);
   border-radius: var(--image-round);