diff --git a/components/lib/fieldset/Fieldset.vue b/components/lib/fieldset/Fieldset.vue
index ecbf29b87..8ac66d4e9 100755
--- a/components/lib/fieldset/Fieldset.vue
+++ b/components/lib/fieldset/Fieldset.vue
@@ -18,7 +18,7 @@
                 v-bind="{ ...toggleButtonProps, ...ptm('toggler') }"
             >
                 <slot name="togglericon" :collapsed="d_collapsed">
-                    <component :is="d_collapsed ? 'PlusIcon' : 'MinusIcon'" v-bind="ptm('togglericon')" class="p-fieldset-toggler" />
+                    <component :is="d_collapsed ? 'PlusIcon' : 'MinusIcon'" class="p-fieldset-toggler" v-bind="ptm('togglericon')" />
                 </slot>
                 <slot name="legend">
                     <span class="p-fieldset-legend-text" v-bind="ptm('legendtitle')">{{ legend }}</span>
@@ -37,9 +37,9 @@
 
 <script>
 import BaseComponent from 'primevue/basecomponent';
-import Ripple from 'primevue/ripple';
 import MinusIcon from 'primevue/icon/minus';
 import PlusIcon from 'primevue/icon/plus';
+import Ripple from 'primevue/ripple';
 import { UniqueComponentId } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/inlinemessage/InlineMessage.vue b/components/lib/inlinemessage/InlineMessage.vue
index 2964400d6..0595f1503 100755
--- a/components/lib/inlinemessage/InlineMessage.vue
+++ b/components/lib/inlinemessage/InlineMessage.vue
@@ -1,17 +1,18 @@
 <template>
     <div aria-live="polite" :class="containerClass">
         <slot name="messageicon">
-            <component :is="icon ? 'i' : iconComponent" :class="['p-inline-message-icon', icon]"></component>
+            <component :is="icon ? 'span' : iconComponent" :class="['p-inline-message-icon', icon]"></component>
         </slot>
         <span class="p-inline-message-text"><slot>&nbsp;</slot></span>
     </div>
 </template>
 
 <script>
-import InfoCircleIcon from 'primevue/icon/infocircle';
 import CheckIcon from 'primevue/icon/check';
 import ExclamationTriangleIcon from 'primevue/icon/exclamationtriangle';
+import InfoCircleIcon from 'primevue/icon/infocircle';
 import TimesCircleIcon from 'primevue/icon/timescircle';
+
 export default {
     name: 'InlineMessage',
     props: {
diff --git a/components/lib/message/Message.vue b/components/lib/message/Message.vue
index f447df6e0..f31295a00 100755
--- a/components/lib/message/Message.vue
+++ b/components/lib/message/Message.vue
@@ -3,7 +3,7 @@
         <div v-show="visible" :class="containerClass" role="alert" aria-live="assertive" aria-atomic="true">
             <div class="p-message-wrapper">
                 <slot name="messageicon">
-                    <component :is="icon ? 'i' : iconComponent" :class="['p-message-icon', icon]"></component>
+                    <component :is="icon ? 'span' : iconComponent" :class="['p-message-icon', icon]"></component>
                 </slot>
                 <div class="p-message-text">
                     <slot></slot>
@@ -19,12 +19,12 @@
 </template>
 
 <script>
-import Ripple from 'primevue/ripple';
-import TimesIcon from 'primevue/icon/times';
-import InfoCircleIcon from 'primevue/icon/infocircle';
 import CheckIcon from 'primevue/icon/check';
 import ExclamationTriangleIcon from 'primevue/icon/exclamationtriangle';
+import InfoCircleIcon from 'primevue/icon/infocircle';
+import TimesIcon from 'primevue/icon/times';
 import TimesCircleIcon from 'primevue/icon/timescircle';
+import Ripple from 'primevue/ripple';
 
 export default {
     name: 'Message',