diff --git a/include/eepp/ui/uihtmlwidget.hpp b/include/eepp/ui/uihtmlwidget.hpp
index d9b7ec470..16fd915e4 100644
--- a/include/eepp/ui/uihtmlwidget.hpp
+++ b/include/eepp/ui/uihtmlwidget.hpp
@@ -57,6 +57,8 @@ class EE_API UIHTMLWidget : public UILayout {
 
 	virtual RichText* getRichTextPtr() { return nullptr; }
 
+	virtual bool isMergeable() const { return false; }
+
 	virtual void invalidateIntrinsicSize();
 
 	bool isOutOfFlow() const;
diff --git a/include/eepp/ui/uirichtext.hpp b/include/eepp/ui/uirichtext.hpp
index 6941c7bab..5c684f745 100644
--- a/include/eepp/ui/uirichtext.hpp
+++ b/include/eepp/ui/uirichtext.hpp
@@ -150,7 +150,6 @@ class EE_API UIRichText : public UIHTMLWidget {
 	virtual void onChildCountChange( Node* child, const bool& removed );
 	virtual void onFontChanged();
 	virtual void onFontStyleChanged();
-	virtual void onAlphaChange();
 	virtual void onSelectionChange();
 
 	void selCurInit( const Int64& init );
diff --git a/include/eepp/ui/uitextspan.hpp b/include/eepp/ui/uitextspan.hpp
index 03d22f1d7..c41cf0281 100644
--- a/include/eepp/ui/uitextspan.hpp
+++ b/include/eepp/ui/uitextspan.hpp
@@ -2,14 +2,14 @@
 #define EE_UI_UITEXTSPAN_HPP
 
 #include <eepp/ui/uifontstyleconfig.hpp>
-#include <eepp/ui/uihtmlwidget.hpp>
+#include <eepp/ui/uirichtext.hpp>
 #include <eepp/ui/uiwidget.hpp>
 
 namespace EE { namespace UI {
 
 using SpanHitBoxes = SmallVector<Rectf, 4>;
 
-class EE_API UITextSpan : public UIHTMLWidget {
+class EE_API UITextSpan : public UIRichText {
   public:
 	static UITextSpan* New();
 
@@ -41,6 +41,8 @@ class EE_API UITextSpan : public UIHTMLWidget {
 
 	virtual bool isType( const Uint32& type ) const;
 
+	virtual bool isMergeable() const;
+
 	virtual void draw();
 
 	virtual bool applyProperty( const StyleSheetProperty& attribute );
@@ -54,7 +56,7 @@ class EE_API UITextSpan : public UIHTMLWidget {
 
 	UITextSpan* setText( const String& text );
 
-	const UIFontStyleConfig& getFontStyleConfig() const;
+	const FontStyleConfig& getFontStyleConfig() const;
 
 	virtual void loadFromXmlNode( const pugi::xml_node& node );
 
@@ -100,7 +102,7 @@ class EE_API UITextSpan : public UIHTMLWidget {
 
 	UITextSpan* setFontShadowOffset( const Vector2f& offset );
 
-	void setInheritedStyle( const UIFontStyleConfig& fontStyleConfig );
+	void setInheritedStyle( const FontStyleConfig& fontStyleConfig );
 
 	enum StyleState {
 		StyleStateNone = 0,
@@ -137,7 +139,6 @@ class EE_API UITextSpan : public UIHTMLWidget {
   protected:
 	Uint32 mStyleState{ StyleStateNone };
 	String mText;
-	UIFontStyleConfig mFontStyleConfig;
 	SpanHitBoxes mHitBoxes;
 
 	explicit UITextSpan( const std::string& tag = "span" );
@@ -150,10 +151,6 @@ class EE_API UITextSpan : public UIHTMLWidget {
 
 	virtual void onFontStyleChanged();
 
-	virtual void onAlphaChange();
-
-	virtual void onChildCountChange( Node* child, const bool& removed );
-
 	virtual Uint32 onMessage( const NodeMessage* Msg );
 };
 
diff --git a/src/eepp/ui/blocklayouter.cpp b/src/eepp/ui/blocklayouter.cpp
index 463c00e01..7f6436643 100644
--- a/src/eepp/ui/blocklayouter.cpp
+++ b/src/eepp/ui/blocklayouter.cpp
@@ -143,7 +143,8 @@ void BlockLayouter::positionRichTextChildren( Graphics::RichText* rt ) {
 			p = p->getParent();
 		}
 
-		if ( widget->isType( UI_TYPE_TEXTSPAN ) ) {
+		if ( widget->isType( UI_TYPE_HTML_WIDGET ) &&
+			 widget->asType<UIHTMLWidget>()->isMergeable() ) {
 			UITextSpan* textSpan = widget->asType<UITextSpan>();
 			Int64 startChar = curCharIdx;
 			Int64 endChar = curCharIdx;
diff --git a/src/eepp/ui/uirichtext.cpp b/src/eepp/ui/uirichtext.cpp
index 199513322..ccec38811 100644
--- a/src/eepp/ui/uirichtext.cpp
+++ b/src/eepp/ui/uirichtext.cpp
@@ -592,10 +592,6 @@ void UIRichText::onFontStyleChanged() {
 	notifyLayoutAttrChangeParent();
 }
 
-void UIRichText::onAlphaChange() {
-	UIHTMLWidget::onAlphaChange();
-}
-
 void UIRichText::rebuildRichText( UILayout* container, RichText& richText, IntrinsicMode mode ) {
 	richText.clear();
 	Float maxWidth = 0;
@@ -630,10 +626,19 @@ void UIRichText::rebuildRichText( UILayout* container, RichText& richText, Intri
 		richText.setMaxWidth( 0.f ); // Let it grow unbounded to query text bounds later
 	}
 
+	if ( container->isType( UI_TYPE_TEXTSPAN ) ) {
+		UITextSpan* selfSpan = container->asType<UITextSpan>();
+		if ( !selfSpan->getText().empty() && !selfSpan->isMergeable() &&
+			 NULL != selfSpan->getFontStyleConfig().Font ) {
+			richText.addSpan( selfSpan->getText(), selfSpan->getFontStyleConfig() );
+		}
+	}
+
 	auto processWidget = [&]( UIWidget* widget, auto& processWidgetRef ) -> void {
-		if ( widget->isType( UI_TYPE_TEXTSPAN ) ) {
+		if ( widget->isType( UI_TYPE_HTML_WIDGET ) &&
+			 widget->asType<UIHTMLWidget>()->isMergeable() ) {
 			UITextSpan* span = widget->asType<UITextSpan>();
-			if ( !span->getText().empty() ) {
+			if ( !span->getText().empty() && NULL != span->getFontStyleConfig().Font ) {
 				Rectf margin = span->getLayoutPixelsMargin();
 				Rectf padding = span->getPixelsPadding();
 				richText.addSpan( span->getText(), span->getFontStyleConfig(), margin, padding );
diff --git a/src/eepp/ui/uitextspan.cpp b/src/eepp/ui/uitextspan.cpp
index 4342c369f..6fc1cb46b 100644
--- a/src/eepp/ui/uitextspan.cpp
+++ b/src/eepp/ui/uitextspan.cpp
@@ -1,5 +1,6 @@
 #include <eepp/graphics/fontmanager.hpp>
 #include <eepp/graphics/text.hpp>
+#include <eepp/scene/scenemanager.hpp>
 #include <eepp/ui/css/propertydefinition.hpp>
 #include <eepp/ui/tools/htmlformatter.hpp>
 #include <eepp/ui/uiborderdrawable.hpp>
@@ -21,23 +22,29 @@ UITextSpan* UITextSpan::NewWithTag( const std::string& tag ) {
 	return eeNew( UITextSpan, ( tag ) );
 }
 
-UITextSpan::UITextSpan( const std::string& tag ) : UIHTMLWidget( tag ) {
+UITextSpan::UITextSpan( const std::string& tag ) : UIRichText( tag ) {
 	mDisplay = CSSDisplay::Inline;
-	mFlags |= UI_HTML_ELEMENT | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_LOADS_ITS_CHILDREN;
+	setLayoutSizePolicy( SizePolicy::WrapContent, SizePolicy::WrapContent );
+	mFlags &= ~UI_OWNS_CHILDREN_POSITION;
+	mFlags |= UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_LOADS_ITS_CHILDREN;
 
-	UITheme* theme = getUISceneNode()->getUIThemeManager()->getDefaultTheme();
+	if ( NULL == mRichText.getFontStyleConfig().Font ) {
+		UISceneNode* sceneNode =
+			getUISceneNode() ? getUISceneNode() : SceneManager::instance()->getUISceneNode();
+		UITheme* theme = sceneNode ? sceneNode->getUIThemeManager()->getDefaultTheme() : nullptr;
 
-	if ( NULL != theme && NULL != theme->getDefaultFont() ) {
-		mFontStyleConfig.Font = theme->getDefaultFont();
-	} else if ( NULL != getUISceneNode()->getUIThemeManager()->getDefaultFont() ) {
-		mFontStyleConfig.Font = getUISceneNode()->getUIThemeManager()->getDefaultFont();
-	}
+		if ( NULL != theme && NULL != theme->getDefaultFont() ) {
+			mRichText.getFontStyleConfig().Font = theme->getDefaultFont();
+		} else if ( sceneNode && NULL != sceneNode->getUIThemeManager()->getDefaultFont() ) {
+			mRichText.getFontStyleConfig().Font = sceneNode->getUIThemeManager()->getDefaultFont();
+		}
 
-	if ( NULL != theme ) {
-		mFontStyleConfig.CharacterSize = theme->getDefaultFontSize();
-	} else {
-		mFontStyleConfig.CharacterSize =
-			getUISceneNode()->getUIThemeManager()->getDefaultFontSize();
+		if ( NULL != theme ) {
+			mRichText.getFontStyleConfig().CharacterSize = theme->getDefaultFontSize();
+		} else if ( sceneNode ) {
+			mRichText.getFontStyleConfig().CharacterSize =
+				sceneNode->getUIThemeManager()->getDefaultFontSize();
+		}
 	}
 }
 
@@ -48,7 +55,11 @@ Uint32 UITextSpan::getType() const {
 }
 
 bool UITextSpan::isType( const Uint32& type ) const {
-	return UITextSpan::getType() == type ? true : UIHTMLWidget::isType( type );
+	return UITextSpan::getType() == type ? true : UIRichText::isType( type );
+}
+
+bool UITextSpan::isMergeable() const {
+	return mDisplay == CSSDisplay::Inline;
 }
 
 void UITextSpan::drawBorder() {
@@ -62,7 +73,8 @@ void UITextSpan::drawBorder() {
 }
 
 void UITextSpan::draw() {
-	// Skip native generic rendering because it will be drawn by UIRichText
+	if ( !isMergeable() )
+		UIRichText::draw();
 }
 
 bool UITextSpan::applyProperty( const StyleSheetProperty& attribute ) {
@@ -109,7 +121,7 @@ bool UITextSpan::applyProperty( const StyleSheetProperty& attribute ) {
 			setTextDecoration( attribute.asTextDecoration() );
 			break;
 		default:
-			return UIHTMLWidget::applyProperty( attribute );
+			return UIRichText::applyProperty( attribute );
 	}
 
 	return true;
@@ -145,12 +157,12 @@ std::string UITextSpan::getPropertyString( const PropertyDefinition* propertyDef
 		case PropertyId::TextDecoration:
 			return Text::styleFlagToString( getTextDecoration() );
 		default:
-			return UIHTMLWidget::getPropertyString( propertyDef, propertyIndex );
+			return UIRichText::getPropertyString( propertyDef, propertyIndex );
 	}
 }
 
 std::vector<PropertyId> UITextSpan::getPropertiesImplemented() const {
-	auto props = UIHTMLWidget::getPropertiesImplemented();
+	auto props = UIRichText::getPropertiesImplemented();
 	auto local = { PropertyId::Text,
 				   PropertyId::FontFamily,
 				   PropertyId::FontSize,
@@ -179,26 +191,28 @@ UITextSpan* UITextSpan::setText( const String& text ) {
 	return this;
 }
 
-const UIFontStyleConfig& UITextSpan::getFontStyleConfig() const {
-	return mFontStyleConfig;
+const FontStyleConfig& UITextSpan::getFontStyleConfig() const {
+	return mRichText.getFontStyleConfig();
 }
 
 void UITextSpan::setFontStyleConfig( const UIFontStyleConfig& fontStyleConfig ) {
-	mFontStyleConfig = fontStyleConfig;
+	mRichText.getFontStyleConfig() = fontStyleConfig;
 	mStyleState = StyleStateAll;
-	onFontStyleChanged();
+	mRichText.invalidate();
 	onFontChanged();
+	onFontStyleChanged();
 	notifyLayoutAttrChange();
 }
 
 Graphics::Font* UITextSpan::getFont() const {
-	return mFontStyleConfig.getFont();
+	return mRichText.getFontStyleConfig().getFont();
 }
 
 UITextSpan* UITextSpan::setFont( Graphics::Font* font ) {
-	if ( mFontStyleConfig.Font != font ) {
-		mFontStyleConfig.Font = font;
+	if ( mRichText.getFontStyleConfig().Font != font ) {
+		mRichText.getFontStyleConfig().Font = font;
 		mStyleState |= StyleStateFont;
+		mRichText.invalidate();
 		onFontChanged();
 		notifyLayoutAttrChange();
 	}
@@ -206,13 +220,14 @@ UITextSpan* UITextSpan::setFont( Graphics::Font* font ) {
 }
 
 Uint32 UITextSpan::getFontSize() const {
-	return mFontStyleConfig.getFontCharacterSize();
+	return mRichText.getFontStyleConfig().getFontCharacterSize();
 }
 
 UITextSpan* UITextSpan::setFontSize( const Uint32& characterSize ) {
-	if ( mFontStyleConfig.CharacterSize != characterSize ) {
-		mFontStyleConfig.CharacterSize = characterSize;
+	if ( mRichText.getFontStyleConfig().CharacterSize != characterSize ) {
+		mRichText.getFontStyleConfig().CharacterSize = characterSize;
 		mStyleState |= StyleStateFontSize;
+		mRichText.invalidate();
 		onFontStyleChanged();
 		notifyLayoutAttrChange();
 	}
@@ -220,13 +235,14 @@ UITextSpan* UITextSpan::setFontSize( const Uint32& characterSize ) {
 }
 
 const Uint32& UITextSpan::getFontStyle() const {
-	return mFontStyleConfig.getFontStyle();
+	return mRichText.getFontStyleConfig().getFontStyle();
 }
 
 UITextSpan* UITextSpan::setFontStyle( const Uint32& fontStyle ) {
-	if ( mFontStyleConfig.Style != fontStyle ) {
-		mFontStyleConfig.Style = fontStyle;
+	if ( mRichText.getFontStyleConfig().Style != fontStyle ) {
+		mRichText.getFontStyleConfig().Style = fontStyle;
 		mStyleState |= StyleStateFontStyle;
+		mRichText.invalidate();
 		onFontStyleChanged();
 		notifyLayoutAttrChange();
 	}
@@ -234,16 +250,17 @@ UITextSpan* UITextSpan::setFontStyle( const Uint32& fontStyle ) {
 }
 
 Uint32 UITextSpan::getTextDecoration() const {
-	Uint32 flags = mFontStyleConfig.Style;
+	Uint32 flags = mRichText.getFontStyleConfig().Style;
 	flags &= ~( Text::Style::Bold | Text::Style::Italic | Text::Style::Shadow );
 	return flags;
 }
 
 UITextSpan* UITextSpan::setTextDecoration( const Uint32& textDecoration ) {
-	if ( mFontStyleConfig.Style != textDecoration ) {
-		mFontStyleConfig.Style &= ~( Text::Underlined | Text::StrikeThrough );
-		mFontStyleConfig.Style |= textDecoration;
+	if ( mRichText.getFontStyleConfig().Style != textDecoration ) {
+		mRichText.getFontStyleConfig().Style &= ~( Text::Underlined | Text::StrikeThrough );
+		mRichText.getFontStyleConfig().Style |= textDecoration;
 		mStyleState |= StyleStateFontStyle;
+		mRichText.invalidate();
 		onFontStyleChanged();
 		notifyLayoutAttrChange();
 	}
@@ -251,13 +268,14 @@ UITextSpan* UITextSpan::setTextDecoration( const Uint32& textDecoration ) {
 }
 
 const Float& UITextSpan::getOutlineThickness() const {
-	return mFontStyleConfig.getOutlineThickness();
+	return mRichText.getFontStyleConfig().getOutlineThickness();
 }
 
 UITextSpan* UITextSpan::setOutlineThickness( const Float& outlineThickness ) {
-	if ( mFontStyleConfig.OutlineThickness != outlineThickness ) {
-		mFontStyleConfig.OutlineThickness = outlineThickness;
+	if ( mRichText.getFontStyleConfig().OutlineThickness != outlineThickness ) {
+		mRichText.getFontStyleConfig().OutlineThickness = outlineThickness;
 		mStyleState |= StyleStateOutlineThickness;
+		mRichText.invalidate();
 		onFontStyleChanged();
 		notifyLayoutAttrChange();
 	}
@@ -265,56 +283,60 @@ UITextSpan* UITextSpan::setOutlineThickness( const Float& outlineThickness ) {
 }
 
 const Color& UITextSpan::getOutlineColor() const {
-	return mFontStyleConfig.getOutlineColor();
+	return mRichText.getFontStyleConfig().getOutlineColor();
 }
 
 UITextSpan* UITextSpan::setOutlineColor( const Color& outlineColor ) {
-	if ( mFontStyleConfig.OutlineColor != outlineColor ) {
-		mFontStyleConfig.OutlineColor = outlineColor;
+	if ( mRichText.getFontStyleConfig().OutlineColor != outlineColor ) {
+		mRichText.getFontStyleConfig().OutlineColor = outlineColor;
 		mStyleState |= StyleStateOutlineColor;
+		mRichText.invalidate();
 		onFontStyleChanged();
 	}
 	return this;
 }
 
 const Color& UITextSpan::getFontColor() const {
-	return mFontStyleConfig.getFontColor();
+	return mRichText.getFontStyleConfig().getFontColor();
 }
 
 UITextSpan* UITextSpan::setFontColor( const Color& color ) {
-	if ( mFontStyleConfig.FontColor != color ) {
-		mFontStyleConfig.FontColor = color;
+	if ( mRichText.getFontStyleConfig().FontColor != color ) {
+		mRichText.getFontStyleConfig().FontColor = color;
 		mStyleState |= StyleStateFontColor;
+		mRichText.invalidate();
 		onFontStyleChanged();
 	}
 	return this;
 }
 
 const Color& UITextSpan::getFontBackgroundColor() const {
-	return mFontStyleConfig.getBackgroundColor();
+	return mRichText.getFontStyleConfig().getBackgroundColor();
 }
 
 UITextSpan* UITextSpan::setFontBackgroundColor( const Color& color ) {
-	if ( mFontStyleConfig.BackgroundColor != color ) {
-		mFontStyleConfig.BackgroundColor = color;
+	if ( mRichText.getFontStyleConfig().BackgroundColor != color ) {
+		mRichText.getFontStyleConfig().BackgroundColor = color;
 		mStyleState |= StyleStateFontBackgroundColor;
+		mRichText.invalidate();
 		onFontStyleChanged();
 	}
 	return this;
 }
 
 const Color& UITextSpan::getFontShadowColor() const {
-	return mFontStyleConfig.getFontShadowColor();
+	return mRichText.getFontStyleConfig().getFontShadowColor();
 }
 
 UITextSpan* UITextSpan::setFontShadowColor( const Color& color ) {
-	if ( mFontStyleConfig.ShadowColor != color ) {
-		mFontStyleConfig.ShadowColor = color;
+	if ( mRichText.getFontStyleConfig().ShadowColor != color ) {
+		mRichText.getFontStyleConfig().ShadowColor = color;
 		if ( color != Color::Transparent )
-			mFontStyleConfig.Style |= Graphics::Text::Shadow;
+			mRichText.getFontStyleConfig().Style |= Graphics::Text::Shadow;
 		else
-			mFontStyleConfig.Style &= ~Graphics::Text::Shadow;
+			mRichText.getFontStyleConfig().Style &= ~Graphics::Text::Shadow;
 		mStyleState |= StyleStateFontShadowColor;
+		mRichText.invalidate();
 		onFontStyleChanged();
 		notifyLayoutAttrChange();
 	}
@@ -322,24 +344,20 @@ UITextSpan* UITextSpan::setFontShadowColor( const Color& color ) {
 }
 
 const Vector2f& UITextSpan::getFontShadowOffset() const {
-	return mFontStyleConfig.getFontShadowOffset();
+	return mRichText.getFontStyleConfig().getFontShadowOffset();
 }
 
 UITextSpan* UITextSpan::setFontShadowOffset( const Vector2f& offset ) {
-	if ( mFontStyleConfig.ShadowOffset != offset ) {
-		mFontStyleConfig.ShadowOffset = offset;
+	if ( mRichText.getFontStyleConfig().ShadowOffset != offset ) {
+		mRichText.getFontStyleConfig().ShadowOffset = offset;
 		mStyleState |= StyleStateFontShadowOffset;
+		mRichText.invalidate();
 		onFontStyleChanged();
 		notifyLayoutAttrChange();
 	}
 	return this;
 }
 
-void UITextSpan::onAlphaChange() {
-	UIHTMLWidget::onAlphaChange();
-	notifyLayoutAttrChange();
-}
-
 void UITextSpan::onFontChanged() {
 	sendCommonEvent( Event::OnFontChanged );
 	notifyLayoutAttrChange();
@@ -356,16 +374,10 @@ void UITextSpan::onTextChanged() {
 	notifyLayoutAttrChange();
 }
 
-void UITextSpan::onChildCountChange( Node* child, const bool& removed ) {
-	UIHTMLWidget::onChildCountChange( child, removed );
-	if ( !removed && child->isWidget() && child->isType( UI_TYPE_TEXTSPAN ) ) {
-		static_cast<UITextSpan*>( child )->setInheritedStyle( mFontStyleConfig );
-	}
-	notifyLayoutAttrChange();
-	notifyLayoutAttrChangeParent();
-}
-
 Uint32 UITextSpan::onMessage( const NodeMessage* Msg ) {
+	if ( !isMergeable() )
+		return UIRichText::onMessage( Msg );
+
 	switch ( Msg->getMsg() ) {
 		case NodeMessage::LayoutAttributeChange: {
 			notifyLayoutAttrChangeParent();
@@ -401,7 +413,7 @@ void UITextSpan::loadFromXmlNode( const pugi::xml_node& node ) {
 				if ( !text.empty() ) {
 					UITextSpan* span = UITextSpan::New();
 					span->setParent( this );
-					span->setInheritedStyle( mFontStyleConfig );
+					span->setInheritedStyle( mRichText.getFontStyleConfig() );
 					span->setText( text );
 				}
 			}
@@ -417,57 +429,65 @@ void UITextSpan::loadFromXmlNode( const pugi::xml_node& node ) {
 	endAttributesTransaction();
 }
 
-void UITextSpan::setInheritedStyle( const UIFontStyleConfig& fontStyleConfig ) {
+void UITextSpan::setInheritedStyle( const FontStyleConfig& fontStyleConfig ) {
 	bool fontChanged = false;
 	bool fontStyleChanged = false;
 
-	if ( !hasFont() && mFontStyleConfig.Font != fontStyleConfig.Font ) {
-		mFontStyleConfig.Font = fontStyleConfig.Font;
+	if ( !hasFont() && mRichText.getFontStyleConfig().Font != fontStyleConfig.Font ) {
+		mRichText.getFontStyleConfig().Font = fontStyleConfig.Font;
 		fontChanged = true;
 	}
 
-	if ( !hasFontSize() && mFontStyleConfig.CharacterSize != fontStyleConfig.CharacterSize ) {
-		mFontStyleConfig.CharacterSize = fontStyleConfig.CharacterSize;
+	if ( !hasFontSize() &&
+		 mRichText.getFontStyleConfig().CharacterSize != fontStyleConfig.CharacterSize ) {
+		mRichText.getFontStyleConfig().CharacterSize = fontStyleConfig.CharacterSize;
 		fontStyleChanged = true;
 	}
 
-	if ( !hasFontStyle() && mFontStyleConfig.Style != fontStyleConfig.Style ) {
-		mFontStyleConfig.Style = fontStyleConfig.Style;
+	if ( !hasFontStyle() && mRichText.getFontStyleConfig().Style != fontStyleConfig.Style ) {
+		mRichText.getFontStyleConfig().Style = fontStyleConfig.Style;
 		fontStyleChanged = true;
 	}
 
-	if ( !hasFontColor() && mFontStyleConfig.FontColor != fontStyleConfig.FontColor ) {
-		mFontStyleConfig.FontColor = fontStyleConfig.FontColor;
+	if ( !hasFontColor() &&
+		 mRichText.getFontStyleConfig().FontColor != fontStyleConfig.FontColor ) {
+		mRichText.getFontStyleConfig().FontColor = fontStyleConfig.FontColor;
 		fontStyleChanged = true;
 	}
 
 	if ( !hasOutlineThickness() &&
-		 mFontStyleConfig.OutlineThickness != fontStyleConfig.OutlineThickness ) {
-		mFontStyleConfig.OutlineThickness = fontStyleConfig.OutlineThickness;
+		 mRichText.getFontStyleConfig().OutlineThickness != fontStyleConfig.OutlineThickness ) {
+		mRichText.getFontStyleConfig().OutlineThickness = fontStyleConfig.OutlineThickness;
 		fontStyleChanged = true;
 	}
 
-	if ( !hasOutlineColor() && mFontStyleConfig.OutlineColor != fontStyleConfig.OutlineColor ) {
-		mFontStyleConfig.OutlineColor = fontStyleConfig.OutlineColor;
+	if ( !hasOutlineColor() &&
+		 mRichText.getFontStyleConfig().OutlineColor != fontStyleConfig.OutlineColor ) {
+		mRichText.getFontStyleConfig().OutlineColor = fontStyleConfig.OutlineColor;
 		fontStyleChanged = true;
 	}
 
-	if ( !hasFontShadowColor() && mFontStyleConfig.ShadowColor != fontStyleConfig.ShadowColor ) {
-		mFontStyleConfig.ShadowColor = fontStyleConfig.ShadowColor;
+	if ( !hasFontShadowColor() &&
+		 mRichText.getFontStyleConfig().ShadowColor != fontStyleConfig.ShadowColor ) {
+		mRichText.getFontStyleConfig().ShadowColor = fontStyleConfig.ShadowColor;
 		fontStyleChanged = true;
 	}
 
-	if ( !hasFontShadowOffset() && mFontStyleConfig.ShadowOffset != fontStyleConfig.ShadowOffset ) {
-		mFontStyleConfig.ShadowOffset = fontStyleConfig.ShadowOffset;
+	if ( !hasFontShadowOffset() &&
+		 mRichText.getFontStyleConfig().ShadowOffset != fontStyleConfig.ShadowOffset ) {
+		mRichText.getFontStyleConfig().ShadowOffset = fontStyleConfig.ShadowOffset;
 		fontStyleChanged = true;
 	}
 
 	if ( !hasFontBackgroundColor() &&
-		 mFontStyleConfig.BackgroundColor != fontStyleConfig.BackgroundColor ) {
-		mFontStyleConfig.BackgroundColor = fontStyleConfig.BackgroundColor;
+		 mRichText.getFontStyleConfig().BackgroundColor != fontStyleConfig.BackgroundColor ) {
+		mRichText.getFontStyleConfig().BackgroundColor = fontStyleConfig.BackgroundColor;
 		fontStyleChanged = true;
 	}
 
+	if ( fontChanged || fontStyleChanged )
+		mRichText.invalidate();
+
 	if ( fontChanged )
 		onFontChanged();
 
@@ -480,7 +500,7 @@ void UITextSpan::setInheritedStyle( const UIFontStyleConfig& fontStyleConfig ) {
 	Node* child = mChild;
 	while ( NULL != child ) {
 		if ( child->isWidget() && child->isType( UI_TYPE_TEXTSPAN ) ) {
-			static_cast<UITextSpan*>( child )->setInheritedStyle( mFontStyleConfig );
+			static_cast<UITextSpan*>( child )->setInheritedStyle( mRichText.getFontStyleConfig() );
 		}
 		child = child->getNextNode();
 	}
diff --git a/src/tests/unit_tests/uihtml_tests.cpp b/src/tests/unit_tests/uihtml_tests.cpp
index fe69939bb..53b3752e6 100644
--- a/src/tests/unit_tests/uihtml_tests.cpp
+++ b/src/tests/unit_tests/uihtml_tests.cpp
@@ -1063,7 +1063,7 @@ UTEST( UIHTML, InlineBlockExplicitWidth ) {
 }
 
 UTEST( UIHTML, InlineBlockMixedContent ) {
-	Engine::instance()->createWindow( WindowSettings( 1024, 768, "Inline Block Mixed Content Test",
+	Engine::instance()->createWindow( WindowSettings( 1024, 653, "Inline Block Mixed Content Test",
 													  WindowStyle::Default, WindowBackend::Default,
 													  32, {}, 1, false, true ),
 									  ContextSettings( false, 0, 0, GLv_default, true, false ) );
@@ -1093,7 +1093,7 @@ UTEST( UIHTML, InlineBlockMixedContent ) {
 }
 
 UTEST( UIHTML, InlineBlockWrapIssue ) {
-	Engine::instance()->createWindow( WindowSettings( 1024, 768, "Inline Block Wrap Issue Test",
+	Engine::instance()->createWindow( WindowSettings( 1024, 653, "Inline Block Wrap Issue Test",
 													  WindowStyle::Default, WindowBackend::Default,
 													  32, {}, 1, false, true ),
 									  ContextSettings( false, 0, 0, GLv_default, true, false ) );
@@ -1115,3 +1115,61 @@ UTEST( UIHTML, InlineBlockWrapIssue ) {
 
 	Engine::destroySingleton();
 }
+
+UTEST( UIHTML, InlineBlockBrowserTest ) {
+	Engine::instance()->createWindow( WindowSettings( 1024, 653, "Inline Block Browser Test",
+													  WindowStyle::Default, WindowBackend::Default,
+													  32, {}, 1, false, true ),
+									  ContextSettings( false, 0, 0, GLv_default, true, false ) );
+
+	UI::UISceneNode* sceneNode = init_test_inline_block();
+
+	const std::string html = R"HTML(
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<style>
+  .parent-container {
+    width: 450px;
+  }
+  .target {
+    background-color: #e0f7fa;
+  }
+  .is-inline-block {
+    display: inline-block;
+  }
+  .is-inline {
+    display: inline;
+  }
+</style>
+</head>
+<body>
+  <div class="parent-container" id="parent-ib">
+    <span id="t1">Here is some normal starting text.</span>
+    <span id="ib" class="target is-inline-block">This is the target inline-block element. If the container gets too narrow, this solid block drops to the next line, and its internal text will wrap, making the block taller without breaking.</span>
+    <span id="t2">And here is the text that comes immediately after. It gets pushed down correctly.</span>
+  </div>
+</body>
+</html>
+)HTML";
+
+	sceneNode->loadLayoutFromString( HTMLFormatter::HTMLtoXML( html ) );
+	sceneNode->update( Seconds( 1 ) );
+
+	auto ib = sceneNode->getRoot()->find( "ib" )->asType<UIWidget>();
+	auto t1 = sceneNode->getRoot()->find( "t1" )->asType<UIWidget>();
+	auto t2 = sceneNode->getRoot()->find( "t2" )->asType<UIWidget>();
+
+	ASSERT_TRUE( ib != nullptr && t1 != nullptr && t2 != nullptr );
+
+	// If it drops to the next line:
+	EXPECT_GT( ib->getPixelsPosition().y, t1->getPixelsPosition().y );
+	// And t2 should be AFTER ib (either horizontally or vertically)
+	EXPECT_GE( t2->getPixelsPosition().y, ib->getPixelsPosition().y );
+	if ( t2->getPixelsPosition().y == ib->getPixelsPosition().y ) {
+		EXPECT_GE( t2->getPixelsPosition().x,
+				   ib->getPixelsPosition().x + ib->getPixelsSize().getWidth() );
+	}
+
+	Engine::destroySingleton();
+}