diff --git a/android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt b/android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt
index 086b5d8e9..8354ceb68 100644
--- a/android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt
+++ b/android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt
@@ -527,11 +527,11 @@ class EnrichedTextInputView : AppCompatEditText {
     parametrizedStyles?.setLinkSpan(start, end, text, url)
   }
 
-  fun addImage(src: String) {
+  fun addImage(src: String, width: Float, height: Float) {
     val isValid = verifyStyle(EnrichedSpans.IMAGE)
     if (!isValid) return
 
-    parametrizedStyles?.setImageSpan(src)
+    parametrizedStyles?.setImageSpan(src, width, height)
     layoutManager.invalidateLayout()
   }
 
diff --git a/android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt b/android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt
index 286a19b7b..439b4e87c 100644
--- a/android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt
+++ b/android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt
@@ -255,8 +255,8 @@ class EnrichedTextInputViewManager : SimpleViewManager<EnrichedTextInputView>(),
     view?.addLink(start, end, text, url)
   }
 
-  override fun addImage(view: EnrichedTextInputView?, src: String) {
-    view?.addImage(src)
+  override fun addImage(view: EnrichedTextInputView?, src: String, width: Float, height: Float) {
+    view?.addImage(src, width, height)
   }
 
   override fun startMention(view: EnrichedTextInputView?, indicator: String) {
diff --git a/android/src/main/java/com/swmansion/enriched/spans/EnrichedImageSpan.kt b/android/src/main/java/com/swmansion/enriched/spans/EnrichedImageSpan.kt
index 708050d62..8bf466310 100644
--- a/android/src/main/java/com/swmansion/enriched/spans/EnrichedImageSpan.kt
+++ b/android/src/main/java/com/swmansion/enriched/spans/EnrichedImageSpan.kt
@@ -1,6 +1,7 @@
 package com.swmansion.enriched.spans
 
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
@@ -8,17 +9,19 @@ import android.net.Uri
 import android.text.style.ImageSpan
 import androidx.core.graphics.withSave
 import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.styles.HtmlStyle
 
 class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
-  private var htmlStyle: HtmlStyle? = null
+  private var width: Int = 0
+  private var height: Int = 0
 
-  constructor(context: Context, uri: Uri, htmlStyle: HtmlStyle, ) : super(context, uri, ALIGN_BASELINE) {
-    this.htmlStyle = htmlStyle
+  constructor(context: Context, uri: Uri, width: Int, height: Int) : super(context, uri, ALIGN_BASELINE) {
+    this.width = width
+    this.height = height
   }
 
-  constructor(drawable: Drawable, source: String, htmlStyle: HtmlStyle) : super(drawable, source, ALIGN_BASELINE) {
-    this.htmlStyle = htmlStyle
+  constructor(drawable: Drawable, source: String, width: Int, height: Int) : super(drawable, source, ALIGN_BASELINE) {
+    this.width = width
+    this.height = height
   }
 
   override fun draw(
@@ -35,7 +38,17 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
 
   override fun getDrawable(): Drawable {
     val drawable = super.getDrawable()
-    drawable.setBounds(0, 0, htmlStyle!!.imgWidth, htmlStyle!!.imgHeight)
+    val scale = Resources.getSystem().displayMetrics.density
+    
+    drawable.setBounds(0, 0, (width * scale).toInt() , (height * scale).toInt())
     return drawable
   }
+
+  fun getWidth(): Int {
+    return width
+  }
+
+  fun getHeight(): Int {
+    return height
+  }
 }
diff --git a/android/src/main/java/com/swmansion/enriched/styles/HtmlStyle.kt b/android/src/main/java/com/swmansion/enriched/styles/HtmlStyle.kt
index 8a4b9088f..454c869cd 100644
--- a/android/src/main/java/com/swmansion/enriched/styles/HtmlStyle.kt
+++ b/android/src/main/java/com/swmansion/enriched/styles/HtmlStyle.kt
@@ -43,9 +43,6 @@ class HtmlStyle {
   var ulBulletSize: Int = 8
   var ulBulletColor: Int = Color.BLACK
 
-  var imgWidth: Int = 200
-  var imgHeight: Int = 200
-
   var aColor: Int = Color.BLACK
   var aUnderline: Boolean = true
 
@@ -100,10 +97,6 @@ class HtmlStyle {
     ulMarginLeft = parseFloat(ulStyle, "marginLeft").toInt()
     ulBulletSize = parseFloat(ulStyle, "bulletSize").toInt()
 
-    val imgStyle = style.getMap("img")
-    imgWidth = parseFloat(imgStyle, "width").toInt()
-    imgHeight = parseFloat(imgStyle, "height").toInt()
-
     val aStyle = style.getMap("a")
     aColor = parseColor(aStyle, "color")
     aUnderline = parseIsUnderline(aStyle)
@@ -124,8 +117,8 @@ class HtmlStyle {
   private fun parseFloat(map: ReadableMap?, key: String): Float {
     val safeMap = ensureValueIsSet(map, key)
 
-    val fontSize = safeMap.getDouble(key)
-    return ceil(PixelUtil.toPixelFromSP(fontSize))
+    val value = safeMap.getDouble(key)
+    return ceil(PixelUtil.toPixelFromSP(value))
   }
 
   private fun parseColorWithOpacity(map: ReadableMap?, key: String, opacity: Int): Int {
diff --git a/android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt b/android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt
index 9b8665606..5b80e9e96 100644
--- a/android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt
+++ b/android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt
@@ -170,26 +170,28 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     }
   }
 
-  fun setImageSpan(src: String) {
+  fun setImageSpan(src: String, width: Float, height: Float) {
     if (view.selection == null) return
 
     val spannable = view.text as SpannableStringBuilder
-    var (start, end) = view.selection.getInlineSelection()
-    val spans = spannable.getSpans(start, end, EnrichedImageSpan::class.java)
+    val (start, originalEnd) = view.selection.getInlineSelection()
 
-    for (s in spans) {
-      spannable.removeSpan(s)
-    }
-
-    if (start == end) {
+    if (start == originalEnd) {
       spannable.insert(start, "\uFFFC")
-      end++
+    } else {
+      val spans = spannable.getSpans(start, originalEnd, EnrichedImageSpan::class.java)
+      for (s in spans) {
+        spannable.removeSpan(s)
+      }
+
+      spannable.replace(start, originalEnd, "\uFFFC")
     }
 
+    val (imageStart, imageEnd) = spannable.getSafeSpanBoundaries(start, start + 1)
     val uri = Uri.fromFile(File(src))
-    val span = EnrichedImageSpan(view.context, uri, view.htmlStyle)
-    val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
-    spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+
+    val span = EnrichedImageSpan(view.context, uri, width.toInt(), height.toInt())
+    spannable.setSpan(span, imageStart, imageEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }
 
   fun startMention(indicator: String) {
diff --git a/android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java b/android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java
index 82fe9114a..b89e9a8aa 100644
--- a/android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java
+++ b/android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java
@@ -1,5 +1,9 @@
 package com.swmansion.enriched.utils;
 
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.Editable;
 import android.text.Layout;
@@ -9,6 +13,7 @@
 import android.text.TextUtils;
 import android.text.style.AlignmentSpan;
 import android.text.style.ParagraphStyle;
+import android.util.Log;
 
 import com.swmansion.enriched.spans.EnrichedBlockQuoteSpan;
 import com.swmansion.enriched.spans.EnrichedBoldSpan;
@@ -275,7 +280,16 @@ private static void withinParagraph(StringBuilder out, Spanned text, int start,
         if (style[j] instanceof EnrichedImageSpan) {
           out.append("<img src=\"");
           out.append(((EnrichedImageSpan) style[j]).getSource());
-          out.append("\">");
+          out.append("\"");
+
+          out.append(" width=\"");
+          out.append(((EnrichedImageSpan) style[j]).getWidth());
+          out.append("\"");
+
+          out.append(" height=\"");
+          out.append(((EnrichedImageSpan) style[j]).getHeight());
+
+          out.append("\"/>");
           // Don't output the placeholder character underlying the image.
           i = next;
         }
@@ -454,7 +468,7 @@ private void handleStartTag(String tag, Attributes attributes) {
     } else if (tag.equalsIgnoreCase("h3")) {
       startHeading(mSpannableStringBuilder, 3);
     } else if (tag.equalsIgnoreCase("img")) {
-      startImg(mSpannableStringBuilder, attributes, mImageGetter, mStyle);
+      startImg(mSpannableStringBuilder, attributes, mImageGetter);
     } else if (tag.equalsIgnoreCase("code")) {
       start(mSpannableStringBuilder, new Code());
     } else if (tag.equalsIgnoreCase("mention")) {
@@ -679,20 +693,51 @@ private static void end(Editable text, Class kind, Object repl) {
     }
   }
 
-  private static void startImg(Editable text, Attributes attributes, EnrichedParser.ImageGetter img, HtmlStyle style) {
+  private static void startImg(Editable text, Attributes attributes, EnrichedParser.ImageGetter img) {
     String src = attributes.getValue("", "src");
+    String width = attributes.getValue("", "width");
+    String height = attributes.getValue("", "height");
+
     Drawable d = null;
     if (img != null) {
       d = img.getDrawable(src);
     }
 
+    if (d == null) {
+      d = HtmlToSpannedConverter.prepareDrawableForImage(src);
+    }
+
     if (d == null) {
       return;
     }
 
     int len = text.length();
     text.append("");
-    text.setSpan(new EnrichedImageSpan(d, src, style), len, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+    text.setSpan(new EnrichedImageSpan(d, src, Integer.parseInt(width), Integer.parseInt(height)), len, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+  }
+
+  private static BitmapDrawable prepareDrawableForImage(String src) {
+    String cleanPath = src;
+    if (cleanPath.startsWith("file://")) {
+      cleanPath = cleanPath.substring(7);
+    }
+
+    BitmapDrawable drawable = null;
+
+    try {
+      Bitmap bitmap = BitmapFactory.decodeFile(cleanPath);
+      if (bitmap != null) {
+        drawable = new BitmapDrawable(Resources.getSystem(), bitmap);
+        // set bounds so it knows how big it is naturally,
+        // though EnrichedImageSpan will override this with the HTML width/height later.
+        drawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
+      }
+    } catch (Exception e) {
+      // Failed to load file
+      Log.e("EnrichedParser", "Failed to load image from path: " + cleanPath, e);
+    }
+
+    return drawable;
   }
 
   private static void startA(Editable text, Attributes attributes) {
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 3c29531fe..737bc66b9 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -27,6 +27,7 @@ import { type MentionItem, MentionPopup } from './components/MentionPopup';
 import { useUserMention } from './useUserMention';
 import { useChannelMention } from './useChannelMention';
 import { HtmlSection } from './components/HtmlSection';
+import { ImageModal } from './components/ImageModal';
 
 type StylesState = OnChangeStateEvent;
 
@@ -75,6 +76,7 @@ export default function App() {
   const [isChannelPopupOpen, setIsChannelPopupOpen] = useState(false);
   const [isUserPopupOpen, setIsUserPopupOpen] = useState(false);
   const [isLinkModalOpen, setIsLinkModalOpen] = useState(false);
+  const [isImageModalOpen, setIsImageModalOpen] = useState(false);
   const [isValueModalOpen, setIsValueModalOpen] = useState(false);
   const [currentHtml, setCurrentHtml] = useState('');
 
@@ -125,6 +127,14 @@ export default function App() {
     setIsLinkModalOpen(false);
   };
 
+  const openImageModal = () => {
+    setIsImageModalOpen(true);
+  };
+
+  const closeImageModal = () => {
+    setIsImageModalOpen(false);
+  };
+
   const openUserMentionPopup = () => {
     setIsUserPopupOpen(true);
   };
@@ -197,7 +207,7 @@ export default function App() {
     closeValueModal();
   };
 
-  const selectImage = async () => {
+  const selectImage = async (width: number, height: number) => {
     const response = await launchImageLibrary({
       mediaType: 'photo',
       selectionLimit: 1,
@@ -208,9 +218,11 @@ export default function App() {
         ? response.assets?.[0]?.originalPath
         : response.assets?.[0]?.uri;
 
-    if (!imageUri) return;
+    if (imageUri) {
+      ref.current?.setImage(imageUri, width, height);
+    }
 
-    ref.current?.setImage(imageUri);
+    closeImageModal();
   };
 
   const handleChangeMention = ({ indicator, text }: OnChangeMentionEvent) => {
@@ -294,7 +306,7 @@ export default function App() {
             stylesState={stylesState}
             editorRef={ref}
             onOpenLinkModal={openLinkModal}
-            onSelectImage={selectImage}
+            onSelectImage={openImageModal}
           />
         </View>
         <View style={styles.buttonStack}>
@@ -318,6 +330,11 @@ export default function App() {
         onSubmit={submitLink}
         onClose={closeLinkModal}
       />
+      <ImageModal
+        isOpen={isImageModalOpen}
+        onSubmit={selectImage}
+        onClose={closeImageModal}
+      />
       <ValueModal
         isOpen={isValueModalOpen}
         onSubmit={submitSetValue}
@@ -383,10 +400,6 @@ const htmlStyle: HtmlStyle = {
       textDecorationLine: 'none',
     },
   },
-  img: {
-    width: 50,
-    height: 50,
-  },
   ol: {
     gapWidth: 16,
     marginLeft: 24,
diff --git a/example/src/components/ImageModal.tsx b/example/src/components/ImageModal.tsx
new file mode 100644
index 000000000..6415d84f7
--- /dev/null
+++ b/example/src/components/ImageModal.tsx
@@ -0,0 +1,107 @@
+import { type FC, useState } from 'react';
+import { Modal, Pressable, StyleSheet, TextInput, View } from 'react-native';
+import { Button } from './Button';
+import { Icon } from './Icon';
+
+interface ImageModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSubmit: (width: number, height: number) => void;
+}
+
+const DEFAULT_IMAGE_WIDTH = 80;
+const DEFAULT_IMAGE_HEIGHT = 80;
+
+export const ImageModal: FC<ImageModalProps> = ({
+  isOpen,
+  onClose,
+  onSubmit,
+}) => {
+  const [width, setWidth] = useState('');
+  const [height, setHeight] = useState('');
+
+  const handleSave = () => {
+    const parsedWidth = parseFloat(width);
+    const parsedHeight = parseFloat(height);
+    const finalWidth = isNaN(parsedWidth) ? DEFAULT_IMAGE_WIDTH : parsedWidth;
+    const finalHeight = isNaN(parsedHeight)
+      ? DEFAULT_IMAGE_HEIGHT
+      : parsedHeight;
+
+    onSubmit(finalWidth, finalHeight);
+  };
+
+  return (
+    <Modal visible={isOpen} animationType="slide" transparent>
+      <View style={styles.container}>
+        <View style={styles.modal}>
+          <View style={styles.header}>
+            <Pressable onPress={onClose} style={styles.closeButton}>
+              <Icon name="close" color="rgb(0, 26, 114)" size={20} />
+            </Pressable>
+          </View>
+          <View style={styles.content}>
+            <TextInput
+              placeholder="Width"
+              style={styles.input}
+              value={width}
+              onChangeText={setWidth}
+            />
+            <TextInput
+              placeholder="Height"
+              style={styles.input}
+              value={height}
+              onChangeText={setHeight}
+            />
+            <Button
+              title="Choose Image"
+              onPress={handleSave}
+              style={styles.saveButton}
+            />
+          </View>
+        </View>
+      </View>
+    </Modal>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'rgb(0, 0, 0, 0.5)',
+  },
+  modal: {
+    width: 300,
+    height: 240,
+    backgroundColor: 'white',
+    borderRadius: 8,
+    padding: 16,
+  },
+  header: {
+    width: '100%',
+    alignItems: 'flex-end',
+  },
+  closeButton: {
+    justifyContent: 'center',
+    alignItems: 'center',
+    width: 24,
+    height: 24,
+  },
+  content: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  input: {
+    fontSize: 15,
+    borderBottomWidth: 1,
+    borderBottomColor: 'grey',
+    width: '100%',
+    marginVertical: 10,
+  },
+  saveButton: {
+    width: '75%',
+  },
+});
diff --git a/ios/EnrichedTextInputView.mm b/ios/EnrichedTextInputView.mm
index f145feefa..9490d8ddd 100644
--- a/ios/EnrichedTextInputView.mm
+++ b/ios/EnrichedTextInputView.mm
@@ -371,16 +371,6 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     stylePropChanged = YES;
   }
   
-  if(newViewProps.htmlStyle.img.width != oldViewProps.htmlStyle.img.width) {
-    [newConfig setImageWidth:newViewProps.htmlStyle.img.width];
-    stylePropChanged = YES;
-  }
-
-  if(newViewProps.htmlStyle.img.height != oldViewProps.htmlStyle.img.height) {
-    [newConfig setImageHeight:newViewProps.htmlStyle.img.height];
-    stylePropChanged = YES;
-  }
-  
   if(newViewProps.htmlStyle.a.textDecorationLine != oldViewProps.htmlStyle.a.textDecorationLine) {
     NSString *objcString = [NSString fromCppString:newViewProps.htmlStyle.a.textDecorationLine];
     if([objcString isEqualToString:DecorationUnderline]) {
@@ -808,7 +798,10 @@ - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
     [self toggleParagraphStyle:[CodeBlockStyle getStyleType]];
   } else if([commandName isEqualToString:@"addImage"]) {
     NSString *uri = (NSString *)args[0];
-    [self addImage:uri];
+    CGFloat imgWidth = [(NSNumber*)args[1] floatValue];
+    CGFloat imgHeight = [(NSNumber*)args[2] floatValue];
+    
+    [self addImage:uri width:imgWidth height:imgHeight];
   }
 }
 
@@ -955,13 +948,13 @@ - (void)addMention:(NSString *)indicator text:(NSString *)text attributes:(NSStr
   }
 }
 
-- (void)addImage:(NSString *)uri
+- (void)addImage:(NSString *)uri width:(float)width height:(float)height
 {
   ImageStyle *imageStyleClass = (ImageStyle *)stylesDict[@([ImageStyle getStyleType])];
   if(imageStyleClass == nullptr) { return; }
   
   if([self handleStyleBlocksAndConflicts:[ImageStyle getStyleType] range:textView.selectedRange]) {
-    [imageStyleClass addImage:uri];
+    [imageStyleClass addImage:uri width:width height:height];
     [self anyTextMayHaveBeenModified];
   }
 }
diff --git a/ios/config/InputConfig.h b/ios/config/InputConfig.h
index e73935413..4778807c7 100644
--- a/ios/config/InputConfig.h
+++ b/ios/config/InputConfig.h
@@ -70,8 +70,4 @@
 - (void)setCodeBlockBgColor:(UIColor *)newValue;
 - (CGFloat)codeBlockBorderRadius;
 - (void)setCodeBlockBorderRadius:(CGFloat)newValue;
-- (void)setImageWidth:(CGFloat)newValue;
-- (CGFloat)imageWidth;
-- (void)setImageHeight:(CGFloat)newValue;
-- (CGFloat)imageHeight;
 @end
diff --git a/ios/config/InputConfig.mm b/ios/config/InputConfig.mm
index 0e5287c74..952ea3f09 100644
--- a/ios/config/InputConfig.mm
+++ b/ios/config/InputConfig.mm
@@ -87,8 +87,6 @@ - (id)copyWithZone:(NSZone *)zone {
   copy->_codeBlockFgColor = [_codeBlockFgColor copy];
   copy->_codeBlockBgColor = [_codeBlockBgColor copy];
   copy->_codeBlockBorderRadius = _codeBlockBorderRadius;
-  copy->_imageWidth = _imageWidth;
-  copy->_imageHeight = _imageHeight;
   return copy;
 }
 
@@ -413,20 +411,4 @@ - (void)setCodeBlockBorderRadius:(CGFloat)newValue {
   _codeBlockBorderRadius = newValue;
 }
 
-- (CGFloat)imageWidth {
-  return _imageWidth;
-}
-
-- (void)setImageWidth:(CGFloat)newValue {
-  _imageWidth = newValue;
-}
-
-- (CGFloat)imageHeight {
-  return _imageHeight;
-}
-
-- (void)setImageHeight:(CGFloat)newValue {
-  _imageHeight = newValue;
-}
-
 @end
diff --git a/ios/inputParser/InputParser.mm b/ios/inputParser/InputParser.mm
index 10f250aba..34e48be8d 100644
--- a/ios/inputParser/InputParser.mm
+++ b/ios/inputParser/InputParser.mm
@@ -241,6 +241,7 @@ - (NSString *)parseToHtmlFromRange:(NSRange)range {
         NSString *tagContent = [self tagContentForStyle:style openingTag:YES location:currentRange.location];
         if ([style isEqualToNumber: @([ImageStyle getStyleType])]) {
           [result appendString: [NSString stringWithFormat:@"<%@/>", tagContent]];
+          [currentActiveStyles removeObject:@([ImageStyle getStyleType])];
         } else {
           [result appendString: [NSString stringWithFormat:@"<%@>", tagContent]];
         }
@@ -329,7 +330,7 @@ - (NSString *)tagContentForStyle:(NSNumber *)style openingTag:(BOOL)openingTag l
       if(imageStyle != nullptr) {
         ImageData *data = [imageStyle getImageDataAt:location];
         if(data != nullptr && data.uri != nullptr) {
-          return [NSString stringWithFormat:@"img src=\"%@\"", data.uri];
+          return [NSString stringWithFormat:@"img src=\"%@\" width=\"%f\" height=\"%f\"", data.uri, data.width, data.height];
         }
       }
       return @"img";
@@ -456,6 +457,9 @@ - (void)applyProcessedStyles:(NSArray *)processedStyles offsetFromBeginning:(NSI
       } else if([styleType isEqualToNumber: @([MentionStyle getStyleType])]) {
         MentionParams *params = (MentionParams *)stylePair.styleValue;
         [((MentionStyle *)baseStyle) addMentionAtRange:styleRange params:params];
+      } else if([styleType isEqualToNumber: @([ImageStyle getStyleType])]) {
+        ImageData *imgData = (ImageData *)stylePair.styleValue;
+        [((ImageStyle *)baseStyle) addImageAtRange:styleRange imageData:imgData withSelection:NO];
       } else {
         [baseStyle addAttributes:styleRange];
       }
@@ -546,6 +550,24 @@ - (NSString *)stringByAddingNewlinesToTag:(NSString *)tag inString:(NSString *)h
   return str;
 }
 
+- (void)finalizeTagEntry:(NSMutableString *)tagName ongoingTags:(NSMutableDictionary *)ongoingTags initiallyProcessedTags:(NSMutableArray *)processedTags plainText:(NSMutableString *)plainText
+{
+  NSMutableArray *tagEntry = [[NSMutableArray alloc] init];
+  
+  NSArray *tagData = ongoingTags[tagName];
+  NSInteger tagLocation = [((NSNumber *)tagData[0]) intValue];
+  NSRange tagRange = NSMakeRange(tagLocation, plainText.length - tagLocation);
+  
+  [tagEntry addObject:[tagName copy]];
+  [tagEntry addObject:[NSValue valueWithRange:tagRange]];
+  if(tagData.count > 1) {
+      [tagEntry addObject:[(NSString *)tagData[1] copy]];
+  }
+  
+  [processedTags addObject:tagEntry];
+  [ongoingTags removeObjectForKey:tagName];
+}
+
 - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
   NSMutableString *plainText = [[NSMutableString alloc] initWithString: @""];
   NSMutableDictionary *ongoingTags = [[NSMutableDictionary alloc] init];
@@ -573,6 +595,14 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
       gettingTagName = NO;
       gettingTagParams = NO;
       
+      BOOL isSelfClosing = NO;
+        
+      // Check if params ended with '/' (e.g. <img src="" />)
+      if ([currentTagParams hasSuffix:@"/"]) {
+        [currentTagParams deleteCharactersInRange:NSMakeRange(currentTagParams.length - 1, 1)];
+        isSelfClosing = YES;
+      }
+      
       if([currentTagName isEqualToString:@"p"] || [currentTagName isEqualToString:@"br"] || [currentTagName isEqualToString:@"li"]) {
         // do nothing, we don't include these tags in styles
       } else if(!closingTag) {
@@ -588,6 +618,10 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
         if([currentTagName isEqualToString:@"ul"] || [currentTagName isEqualToString:@"ol"] || [currentTagName isEqualToString:@"blockquote"] || [currentTagName isEqualToString:@"codeblock"]) {
           i += 1;
         }
+        
+        if (isSelfClosing) {
+          [self finalizeTagEntry:currentTagName ongoingTags:ongoingTags initiallyProcessedTags:initiallyProcessedTags plainText:plainText];
+        }
       } else {
         // we finish closing tags - pack tag name, tag range and optionally tag params into an entry that goes inside initiallyProcessedTags
         
@@ -596,20 +630,7 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
           plainText = [[plainText substringWithRange: NSMakeRange(0, plainText.length - 1)] mutableCopy];
         }
         
-        NSMutableArray *tagEntry = [[NSMutableArray alloc] init];
-      
-        NSArray *tagData = ongoingTags[currentTagName];
-        NSInteger tagLocation = [((NSNumber *)tagData[0]) intValue];
-        NSRange tagRange = NSMakeRange(tagLocation, plainText.length - tagLocation);
-        
-        [tagEntry addObject:[currentTagName copy]];
-        [tagEntry addObject:[NSValue valueWithRange:tagRange]];
-        if(tagData.count > 1) {
-          [tagEntry addObject:[(NSString *)tagData[1] copy]];
-        }
-        
-        [initiallyProcessedTags addObject:tagEntry];
-        [ongoingTags removeObjectForKey:currentTagName];
+        [self finalizeTagEntry:currentTagName ongoingTags:ongoingTags initiallyProcessedTags:initiallyProcessedTags plainText:plainText];
       }
       // post-tag cleanup
       closingTag = NO;
@@ -669,7 +690,7 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
     } else if([tagName isEqualToString:@"i"]) {
       [styleArr addObject:@([ItalicStyle getStyleType])];
     } else if([tagName isEqualToString:@"img"]) {
-      NSRegularExpression *srcRegex = [NSRegularExpression regularExpressionWithPattern:@"src=\".+\""
+      NSRegularExpression *srcRegex = [NSRegularExpression regularExpressionWithPattern:@"src=\"([^\"]+)\""
         options:0
         error:nullptr
       ];
@@ -686,6 +707,22 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
       ImageData *imageData = [[ImageData alloc] init];
       imageData.uri = uri;
       
+      NSRegularExpression *widthRegex = [NSRegularExpression regularExpressionWithPattern:@"width=\"([0-9.]+)\"" options:0 error:nil];
+      NSTextCheckingResult *widthMatch = [widthRegex firstMatchInString:params options:0 range:NSMakeRange(0, params.length)];
+
+      if (widthMatch) {
+        NSString *widthString = [params substringWithRange:[widthMatch rangeAtIndex:1]];
+        imageData.width = [widthString floatValue];
+      }
+
+      NSRegularExpression *heightRegex = [NSRegularExpression regularExpressionWithPattern:@"height=\"([0-9.]+)\"" options:0 error:nil];
+      NSTextCheckingResult *heightMatch = [heightRegex firstMatchInString:params options:0 range:NSMakeRange(0, params.length)];
+
+      if (heightMatch) {
+        NSString *heightString = [params substringWithRange:[heightMatch rangeAtIndex:1]];
+        imageData.height = [heightString floatValue];
+      }
+      
       stylePair.styleValue = imageData;
     } else if([tagName isEqualToString:@"u"]) {
       [styleArr addObject:@([UnderlineStyle getStyleType])];
diff --git a/ios/styles/ImageStyle.mm b/ios/styles/ImageStyle.mm
index 276014b99..fa0befb00 100644
--- a/ios/styles/ImageStyle.mm
+++ b/ios/styles/ImageStyle.mm
@@ -103,48 +103,61 @@ - (ImageData *)getImageDataAt:(NSUInteger)location
   return imageData;
 }
 
-- (void)addImage:(NSString *)uri {
-  ImageData *data = [[ImageData alloc] init];
-  data.uri = uri;
+- (void)addImageAtRange:(NSRange)range imageData:(ImageData *)imageData withSelection:(BOOL)withSelection
+{
+  UIImage *img = [self prepareImageFromUri:imageData.uri];
   
-  NSMutableDictionary *attributes = [@{
-    NSAttachmentAttributeName: [self prepareImageAttachement:uri],
-    ImageAttributeName: data,
+  if (img == nil) {
+    // Could not create image from URI, stop here to avoid the "OBJ" icon
+    return;
+  }
+  
+  NSDictionary *attributes = [@{
+    NSAttachmentAttributeName: [self prepareImageAttachement:img width:imageData.width height:imageData.height],
+    ImageAttributeName: imageData,
   } mutableCopy];
   
   // Use the Object Replacement Character for Image.
   // This tells TextKit "something non-text goes here".
   NSString *imagePlaceholder = @"\uFFFC";
   
-  if (_input->textView.selectedRange.length == 0) {
-    [TextInsertionUtils insertText:imagePlaceholder at:_input->textView.selectedRange.location additionalAttributes:nullptr input:_input withSelection:YES];
+  if (range.length == 0) {
+    [TextInsertionUtils insertText:imagePlaceholder at:range.location additionalAttributes:attributes input:_input withSelection:withSelection];
   } else {
     [TextInsertionUtils replaceText:imagePlaceholder
-                                 at:_input->textView.selectedRange
-               additionalAttributes:nullptr
+                                 at:range
+               additionalAttributes:attributes
                               input:_input
-                      withSelection:YES];
+                      withSelection:withSelection];
   }
+}
+
+- (void)addImage:(NSString *)uri width:(CGFloat)width height:(CGFloat)height {
+  ImageData *data = [[ImageData alloc] init];
+  data.uri = uri;
+  data.width = width;
+  data.height = height;
   
-  NSRange newSelection = _input->textView.selectedRange;
-  NSRange imageRange = NSMakeRange(newSelection.location - 1, 1);
-  
-  [_input->textView.textStorage beginEditing];
-  [_input->textView.textStorage addAttributes:attributes range:imageRange];
-  [_input->textView.textStorage endEditing];
+  [self addImageAtRange:_input->textView.selectedRange imageData:data withSelection:YES];
 }
 
--(NSTextAttachment *)prepareImageAttachement:(NSString *)uri
+-(NSTextAttachment *)prepareImageAttachement:(UIImage *)image width:(CGFloat)width height:(CGFloat)height
 {
-  NSURL *url = [NSURL URLWithString:uri];
-  NSData *imgData = [NSData dataWithContentsOfURL:url];
-  UIImage *image = [UIImage imageWithData:imgData];
   
   NSTextAttachment *attachment = [[NSTextAttachment alloc] init];
   attachment.image = image;
-  attachment.bounds = CGRectMake(0, 0, [_input->config imageWidth], [_input->config imageHeight]);
+  attachment.bounds = CGRectMake(0, 0, width, height);
 
   return attachment;
 }
 
+- (UIImage *)prepareImageFromUri:(NSString *)uri
+{
+  NSURL *url = [NSURL URLWithString:uri];
+  NSData *imgData = [NSData dataWithContentsOfURL:url];
+  UIImage *image = [UIImage imageWithData:imgData];
+  
+  return image;
+}
+
 @end
diff --git a/ios/utils/ImageData.h b/ios/utils/ImageData.h
index cfc440026..266ec6262 100644
--- a/ios/utils/ImageData.h
+++ b/ios/utils/ImageData.h
@@ -4,5 +4,7 @@
 @interface ImageData : NSObject
 
 @property NSString *uri;
+@property CGFloat width;
+@property CGFloat height;
 
 @end
diff --git a/ios/utils/StyleHeaders.h b/ios/utils/StyleHeaders.h
index f980529cc..2c0a745c9 100644
--- a/ios/utils/StyleHeaders.h
+++ b/ios/utils/StyleHeaders.h
@@ -82,6 +82,7 @@
 @end
 
 @interface ImageStyle : NSObject<BaseStyleProtocol>
-- (void)addImage:(NSString *)uri;
+- (void)addImage:(NSString *)uri width:(CGFloat)width height:(CGFloat)height;
+- (void)addImageAtRange:(NSRange)range imageData:(ImageData *)imageData withSelection:(BOOL)withSelection;
 - (ImageData *)getImageDataAt:(NSUInteger)location;
 @end
diff --git a/src/EnrichedTextInput.tsx b/src/EnrichedTextInput.tsx
index 07f2d2fe2..c2202c679 100644
--- a/src/EnrichedTextInput.tsx
+++ b/src/EnrichedTextInput.tsx
@@ -52,7 +52,7 @@ export interface EnrichedTextInputInstance extends NativeMethods {
   toggleOrderedList: () => void;
   toggleUnorderedList: () => void;
   setLink: (start: number, end: number, text: string, url: string) => void;
-  setImage: (src: string) => void;
+  setImage: (src: string, width: number, height: number) => void;
   startMention: (indicator: string) => void;
   setMention: (
     indicator: string,
@@ -99,10 +99,6 @@ export interface HtmlStyle {
     textDecorationLine?: 'underline' | 'none';
   };
   mention?: Record<string, MentionStyleProperties> | MentionStyleProperties;
-  img?: {
-    width?: number;
-    height?: number;
-  };
   ol?: {
     gapWidth?: number;
     marginLeft?: number;
@@ -272,8 +268,8 @@ export const EnrichedTextInput = ({
     setLink: (start: number, end: number, text: string, url: string) => {
       Commands.addLink(nullthrows(nativeRef.current), start, end, text, url);
     },
-    setImage: (uri: string) => {
-      Commands.addImage(nullthrows(nativeRef.current), uri);
+    setImage: (uri: string, width: number, height: number) => {
+      Commands.addImage(nullthrows(nativeRef.current), uri, width, height);
     },
     setMention: (
       indicator: string,
diff --git a/src/EnrichedTextInputNativeComponent.ts b/src/EnrichedTextInputNativeComponent.ts
index e0b943201..08980b3cf 100644
--- a/src/EnrichedTextInputNativeComponent.ts
+++ b/src/EnrichedTextInputNativeComponent.ts
@@ -105,10 +105,6 @@ export interface HtmlStyleInternal {
   // This is a workaround for the fact that codegen does not support Records.
   // On native Android side this will become a ReadableMap, on native iOS we can work with a folly::dynamic object.
   mention?: UnsafeMixed;
-  img?: {
-    width?: Float;
-    height?: Float;
-  };
   ol?: {
     gapWidth?: Float;
     marginLeft?: Float;
@@ -191,7 +187,12 @@ interface NativeCommands {
     text: string,
     url: string
   ) => void;
-  addImage: (viewRef: React.ElementRef<ComponentType>, uri: string) => void;
+  addImage: (
+    viewRef: React.ElementRef<ComponentType>,
+    uri: string,
+    width: Float,
+    height: Float
+  ) => void;
   startMention: (
     viewRef: React.ElementRef<ComponentType>,
     indicator: string
diff --git a/src/normalizeHtmlStyle.ts b/src/normalizeHtmlStyle.ts
index 96a7053ea..245ed2e4f 100644
--- a/src/normalizeHtmlStyle.ts
+++ b/src/normalizeHtmlStyle.ts
@@ -42,10 +42,6 @@ const defaultStyle: Required<HtmlStyle> = {
     backgroundColor: 'yellow',
     textDecorationLine: 'underline',
   },
-  img: {
-    width: 80,
-    height: 80,
-  },
   ol: {
     gapWidth: 16,
     marginLeft: 16,