From 3b602bc4fc8ef4119b82b28bcaff810628239509 Mon Sep 17 00:00:00 2001
From: Heiko Tietze <tietze.heiko@gmail.com>
Date: Sat, 26 Sep 2026 09:30:45 +0200
Subject: [PATCH] Related tdf#173606 - Show an icon in combobox depending on
 msg type

Following the prototype of gtk3

Change-Id: Id25c0a61c3c38427e86525f58c6bb40b9cd257ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211476
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
---
 icon-themes/colibre/vcl/res/error.png             | Bin 0 -> 457 bytes
 icon-themes/colibre/vcl/res/information.png       | Bin 0 -> 596 bytes
 icon-themes/colibre/vcl/res/warning.png           | Bin 0 -> 540 bytes
 icon-themes/colibre_dark/vcl/res/error.png        | Bin 0 -> 583 bytes
 icon-themes/colibre_dark/vcl/res/information.png  | Bin 0 -> 643 bytes
 icon-themes/colibre_dark/vcl/res/warning.png      | Bin 0 -> 546 bytes
 icon-themes/colibre_dark_svg/vcl/res/error.svg    |   1 +
 .../colibre_dark_svg/vcl/res/information.svg      |   1 +
 icon-themes/colibre_dark_svg/vcl/res/warning.svg  |   1 +
 icon-themes/colibre_svg/vcl/res/error.svg         |   1 +
 icon-themes/colibre_svg/vcl/res/information.svg   |   1 +
 icon-themes/colibre_svg/vcl/res/warning.svg       |   1 +
 include/vcl/toolkit/edit.hxx                      |   3 +++
 vcl/inc/bitmaps.hlst                              |   4 ++++
 vcl/source/app/salvtables.cxx                     |  12 +++++++-----
 vcl/source/control/edit.cxx                       |  13 ++++++++++++-
 16 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 icon-themes/colibre/vcl/res/error.png
 create mode 100644 icon-themes/colibre/vcl/res/information.png
 create mode 100644 icon-themes/colibre/vcl/res/warning.png
 create mode 100644 icon-themes/colibre_dark/vcl/res/error.png
 create mode 100644 icon-themes/colibre_dark/vcl/res/information.png
 create mode 100644 icon-themes/colibre_dark/vcl/res/warning.png
 create mode 100644 icon-themes/colibre_dark_svg/vcl/res/error.svg
 create mode 100644 icon-themes/colibre_dark_svg/vcl/res/information.svg
 create mode 100644 icon-themes/colibre_dark_svg/vcl/res/warning.svg
 create mode 100644 icon-themes/colibre_svg/vcl/res/error.svg
 create mode 100644 icon-themes/colibre_svg/vcl/res/information.svg
 create mode 100644 icon-themes/colibre_svg/vcl/res/warning.svg

diff --git a/icon-themes/colibre/vcl/res/error.png b/icon-themes/colibre/vcl/res/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..23d975167e0522a1dad14093bd2b91a1ac4e5263
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00079
z000790TVn4Hvj+t8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ai&w
zK~y-6rPIA?ltCB;;Ahmv!lXzLB%qZFiJ&M75&SE}CWxq=_L1Cxm4%&+oi`x<HG*s!
z8%05zbRiNDHW&miBkQqn+?{;8*yMwOnfJWs%$YgglqB}@9hg`x<sxq51PXrOo#b=3
zbzg^gSSj!E1&jEJZJfaerF>G#+%8U%zk}JZ71qP)VSR+phqdr4%>Apk4ZW}t4vmpV
zJqN4E$K3*)4Zp+rx;_@}HpH9Zc%3hVLAcZkJPzv(;ab=U55r0&EH(Jo@U#_p9iDgW
z-mfBq@SuY|3%w-66b567FjXTAraRdF${9L%6gHb3Zq%KZ!@cU{PJ^$7C+!hV)l0lw
z*GIzjhHxbut@CrW_d++uH=!S9{uAR=_!d?t{Rh((?1!rp$ctgK;<MudBav6t;`i_}
zyr{wnZ@Ui5#MfBLJZ|A+O`?yUWMiy#uh01p-V}RTk$IRs00000NkvXXu0mjfdOOLo

literal 0
HcmV?d00001

diff --git a/icon-themes/colibre/vcl/res/information.png b/icon-themes/colibre/vcl/res/information.png
new file mode 100644
index 0000000000000000000000000000000000000000..6116fdb25d31a0cd77e4a2a56a2d344673d9d504
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00079
z000790TVn4Hvj+t8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10pUqR
zK~y-6b(1}4Q*ji<f9JgyP+AHix|B+xeoY0fi=&ILDO%FOh;<Wj(JURLO<GH^NxCTL
zP^S(;2T?>6@>N8^#X)c>2vv|cI0%B!O_RLq5Pf~GeZAxTpL00({O^^Su~#Yk%muKg
zm%4jmb_&QZ4IyU+*(Am=V8B<f7j$&rUgv*A@y-tNRisZSIDl~-H#G<hVcf)Y1dmPm
zl}w@o`K8N9E0|4Lv+yp_?)dUJ1W%Brtv*)^1>_eGqtq8Hn6l>ln~;z$UBR?zjr_;$
zUS$%qRh;&S)fTsUBPewXRF9GY2y_Z*INGxM+$-P%UGGLD1G|8+7SCgO3>d)dSHd)F
zNEZRTfAC{?!A1;X9K<1m(FeSZy}8{Dy6(}40~|U8G5-4OIw&zr{-^`EQGphYjwgbX
z%F{`pwJji;KsJi$ZK3re`c*8(_Ju%ML?hzBd5AHsba^xcZGFxGX&}S<Ug7{sSI#0P
zX!9r(u=;EZ;||74rI$_sFwj{6#&Dd|{5-VUBbP@pdyX{of2Cu$AirEd+y>pl4IW#y
z@C`r{OCtoj2Fd{o*2q5yIlGSOeCZ61<^dlFFoZBr6}NNOstd92-X#z|oGb2QzdK0V
iGg5uut(N<pg!>C1UbLP}6KRnE0000<MNUMnLSTXyM*Fn@

literal 0
HcmV?d00001

diff --git a/icon-themes/colibre/vcl/res/warning.png b/icon-themes/colibre/vcl/res/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca90c094073bb3f3b076becb152e440dc5b27f09
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00079
z000790TVn4Hvj+t8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10jWtu
zK~y-6rIR~r6k!;JpEJ9L7{MeEFU2CkLM&_qu?R$2HkVGZNoi>l&~?~gt}IEbx#*%`
zM0DEx0%M94T1XI!_ycT&K+voag(PI=*aX>3#v2~^n)99aIqz3|vd#Y}|Er7JMRk(n
zhK=Gp^R-2P$jT{egRo17-NJj|#GdteC+6J4Wq(U&gUtFChJj866ctbe3QajCvZ4n7
z<zAgKR1A+>+gNRFV-+(Glq>x@`$vGF25jYHs`U+`FLj=8?=S{@jbm!R1%xH_VXjDw
z+*|f1K?mm8qgSpQ#(|!&q-&Xg$pJN4JOJK(Z0BjZslA&gz>3A(P`{2G0Bmkh0nP+s
zaACo58c?k|QNSQj*i9JP2e?^O!7u_mn_lvphPm&12Y{KEerplg+zESi`X?Y4FbyQ+
z8E<SoWTpZ!xz7t27Hrwf00g&6>Ou?{CT3rFtueeSMs3C#y}OHEH&lVEVV^GN1>Jy~
zMU;NGU^MLkG>d54+)vC!g*}{4%nGn3v7R-Mmd$bCq~U^WQ!eRJAg&{h{v}}3BAQ$B
e>&(yeFZu!Lg_$l+MQi2&0000<MNUMnLSTX?P~%Jh

literal 0
HcmV?d00001

diff --git a/icon-themes/colibre_dark/vcl/res/error.png b/icon-themes/colibre_dark/vcl/res/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..487de2137931ad5d7b13d481fcdec87f02c767e3
GIT binary patch
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00079
z000790TVn4Hvj+t8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10n|xE
zK~y-6rISBv6k!mDpLur!79nZG#zGL2pa{yT=qZsSo7=VV3~Cb)BC$~72k;Z*69|HZ
zh=OQi4nYX_?p{0)$$=tzphW~zrL<B!N!WKR_Hx<#(}+{fJHKasGt4Wh%KwBvG;8g7
zM6LpphzP3R5veje+vqQq9tYMQ0G=Qc0!`o}s*1=7-~#X#&%43Q%+?^F(b&)Sb`z0b
zIJZC)eeP*huOGv?$G|~6@9ZwbbPINN9wG9Zc6)k23=jlg867PFTcqjJ-E;=1)e696
zjJZXn@{_f-Ls)ygD~{s|aXdk>*v7d<phT@Uy$3Mn3eX}5-gn#_M&t!?d=G1vfGVm}
z07TIjU>#%T@*_;3x@S9z-T*g&Wkl`+cL~GSxq&_bNAiFa5ko#y#{dBo81LJN2c&tx
z22kieCrQ-lyoBlkuuPI%%K-`<O$VS_1&(6v#mrCILiG~m@<YP#84v*3eylwOoWZ#j
z$lpO6KL<`@%sGPK2g71@bqwEs2W(O<SMno($Q|Gh&NWGr(tx;LFXH>_z&=Js7Q3>Z
zQ%;g`oO^)CJR%#w2eN{bz;RSx;(5384rS<X%+7WW)hR>-_=YjB2!d9B>2Sb5#9tiY
VuvFVRZvy}T002ovPDHLkV1n})^LhXP

literal 0
HcmV?d00001

diff --git a/icon-themes/colibre_dark/vcl/res/information.png b/icon-themes/colibre_dark/vcl/res/information.png
new file mode 100644
index 0000000000000000000000000000000000000000..90d925859e86205c8ea19bf9d5adadf61f7c06ab
GIT binary patch
literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00079
z000790TVn4Hvj+t8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10uV_=
zK~y-6b(1@2R6!JmzcYK|T}X&XAQ)pLV0=^o6B`RfH-aW;*v5$3iP&hG6gECUtQEA-
z%0fsNL==1^WOl{YG9cK<N^*B265^xSdw2KFu}F5kyPFJ5G5>t?pP4h~h^n&Pn1d9+
z1&Fs}q}5=dSRU}y%m9-JgMb3x1YS9>_GqlP^GA|5$%QS2S3JxYF|te1Yo?>t-%*VR
z6mBTGPh#(@Emg8j5mgmcWif~@+Mv8<i{%q_t#vLI!?U&+{>m+f6Lk$$Wq$Q<uMNWA
zcBPz29<V`l$rdXkNi7$IlQsx{zFX67Ro!?(%6T^heV^%1=bCPZ9uagfsh!&6zd`xz
zhtc&$4n*agQ<+VI`BHV%DBaGv^|s6#nFY=Rc$?Y*F}l<o-Sr@3MNKD=PwvGrOU5vi
z`~_1}bxA1G=Pw|9YK;y+iW-|WQa31cs2to9-eMRyj7Z_XfiUlosU$Q9DI8shcHM8O
z7t~Fm?nA@Ch&~bFvR$bR*O{JDG>tG0WRC|M83(XI`54HAdhxS{!O7j}f++XI=<9qj
zIs~w`?mtD$sKboxT=ky=*p<pK#=KN?re4xby^sqkw-LRi$U_nLBGZ@t4v<@p_KVT0
zDl)CY-LXFZas5nNGkq*okH+fm2%G^NAb=vgb+J4+y>~~`cefcdj0&V(D(Y7st^DzW
d@gbtExPMpg5eIgzHaY+R002ovPDHLkV1ku#7!Uve

literal 0
HcmV?d00001

diff --git a/icon-themes/colibre_dark/vcl/res/warning.png b/icon-themes/colibre_dark/vcl/res/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..5be7ab2d99bea30a0c7ba609598d76b33a9df98e
GIT binary patch
literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00079
z000790TVn4Hvj+t8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10k26!
zK~y-6rIS5qlTjFjpYtWwCdLM}RfizO!AU3uaS&7rqJwFrLmgcNmrjCWe+jxP)ozN|
z%v}^y1!o5-(#1hH7ok|R$tPMvYwmG~KTVUCiZ9&d-t#{1IhT87oByfgrYDuh-9gDK
zfFgXKZ2$XKGPQK@VK(JV>J4z<*Uo3HeLqUq(ASO9s1-G2(j!2(6#Asl2joIBHMu<p
z<<cRGx0Yt2?8;Su5T~YOE~`cl`||I$bYL+JRHMj+5T}YEPR~SW9Qfh{(_2S~OJ{)r
zNu%t}f0F5x-9`3%S@HyMhDvF06Tobn1NVRhvMUdp!e$p90P}_^KEBx13@E3sA&w|`
z7=~(101810!$2<VT)o~1Sbm<fJZgBv-u_pAoAj-|e!CcWZ79mzAf7w?2M`o)10njc
zV`BYG$+y&2yV;OAxi*5R+T5uFmgi1Lz9^Wa^W5TkvCWuQqw$6$nZYGN0epeV)6+>3
zoWvNn7dNI>A{uMH3&8C~RK1IITrNN9HPJk<2rRX1Xs-RhK{*_&zr@P3QvqKR?$}PZ
kA&yLuJ^7cdKhr<dPe6>Lu@k6ll>h($07*qoM6N<$f?VtE_W%F@

literal 0
HcmV?d00001

diff --git a/icon-themes/colibre_dark_svg/vcl/res/error.svg b/icon-themes/colibre_dark_svg/vcl/res/error.svg
new file mode 100644
index 000000000000..f41640278066
--- /dev/null
+++ b/icon-themes/colibre_dark_svg/vcl/res/error.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="-5 -10 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#ffbaba"><path d="m45.168769-2.1797647c11.133 0 21.812 4.4219 29.684 12.2969997 7.875 7.8711 12.297 18.551 12.297 29.684s-4.4219 21.812-12.297 29.684c-7.8711 7.875-18.551 12.297-29.684 12.297s-21.812-4.4219-29.684-12.297c-7.8749996-7.8711-12.2969996-18.551-12.2969996-29.684.011719-11.129 4.4414-21.801 12.3089996-29.672 7.8711-7.8671997 18.543-12.2969997 29.672-12.3089997zm0 75.9609997c9.0117 0 17.656-3.582 24.027-9.9531s9.9531-15.016 9.9531-24.027-3.582-17.656-9.9531-24.027c-6.3711-6.3709997-15.016-9.9530997-24.027-9.9530997s-17.656 3.582-24.027 9.9530997c-6.371 6.3711-9.9531 15.016-9.9531 24.027.01172 9.0078 3.5938 17.645 9.9648 24.016s15.008 9.9531 24.016 9.9648z"/><path d="m59.488769 25.480735c-1.5625-1.5625-4.0977-1.5625-5.6562 0l-8.6641 8.6641-8.6641-8.6641c-1.5586-1.5625-4.0938-1.5625-5.6562 0s-1.5625 4.0977 0 5.6562l8.6641 8.6641-8.6641 8.6641c-1.5625 1.5586-1.5625 4.0938 0 5.6562s4.0977 1.5625 5.6562 0l8.6641-8.6641 8.6641 8.6641c1.5586 1.5625 4.0938 1.5625 5.6562 0s1.5625-4.0977 0-5.6562l-8.6641-8.6641 8.6641-8.6641c1.5625-1.5586 1.5625-4.0938 0-5.6562z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/vcl/res/information.svg b/icon-themes/colibre_dark_svg/vcl/res/information.svg
new file mode 100644
index 000000000000..483b97bd90ac
--- /dev/null
+++ b/icon-themes/colibre_dark_svg/vcl/res/information.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#bde5f8" stroke-width=".999996"><path d="m49.847796 5.9426952c-24.052564 0-43.622116 19.9597898-43.622116 44.4919878 0 24.532196 19.569552 44.491983 43.622116 44.491983s43.622117-19.959787 43.622117-44.491983c0-24.532198-19.569553-44.4919878-43.622117-44.4919878zm0 82.1390538c-20.352514 0-36.911021-16.888702-36.911021-37.647066s16.558507-37.647067 36.911021-37.647067c20.352515 0 36.911023 16.888703 36.911023 37.647067s-16.558508 37.647066-36.911023 37.647066z"/><path d="m55.363192 67.818183h-1.363192v-23.636366c0-2.302461-1.832129-4.171125-4.089572-4.171125h-5.452765c-2.257446 0-4.089574 1.868664-4.089574 4.171125 0 2.30246 1.832128 4.171123 4.089574 4.171123h1.36319v19.465243h-1.36319c-2.257446 0-4.089574 1.868663-4.089574 4.171124 0 2.30246 1.832128 4.171123 4.089574 4.171123h10.905529c2.257443 0 4.089578-1.868663 4.089578-4.171123 0-2.302461-1.832135-4.171124-4.089578-4.171124z"/><ellipse cx="49.148602" cy="31.996174" rx="4.362212" ry="4.449198"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/vcl/res/warning.svg b/icon-themes/colibre_dark_svg/vcl/res/warning.svg
new file mode 100644
index 000000000000..d0c8a5f2a9ba
--- /dev/null
+++ b/icon-themes/colibre_dark_svg/vcl/res/warning.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#feefb3"><path d="m94.9 70.8-33-55.6c-2.5-4.3-6.9-6.8-11.8-6.8s-9.4 2.5-11.8 6.8l-33 55.6c-2.8 4.3-2.8 9.5-.3 13.8s6.9 6.9 12 6.9h65.9c5.1 0 9.5-2.6 12-6.9 2.6-4.3 2.6-9.5 0-13.8zm-7.9 9.4c-.5.8-1.5 2.3-4 2.3h-66c-2.5 0-3.5-1.7-4-2.3-.5-.8-1.2-2.6 0-4.6l33-55.6c1.2-2 3.2-2.3 4-2.3s2.8.2 4 2.3l33 55.6c1.3 2 .3 3.8 0 4.6z"/><path d="m50 30.4c-2.6 0-4.6 2-4.6 4.6v24.6c0 2.6 2 4.6 4.6 4.6s4.6-2 4.6-4.6v-24.6c0-2.4-2-4.6-4.6-4.6z"/><path d="m50 66.7c-2.6 0-4.6 2-4.6 4.6v1.5c0 2.6 2 4.6 4.6 4.6s4.6-2 4.6-4.6v-1.5c0-2.6-2-4.6-4.6-4.6z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/vcl/res/error.svg b/icon-themes/colibre_svg/vcl/res/error.svg
new file mode 100644
index 000000000000..f5ed3982b566
--- /dev/null
+++ b/icon-themes/colibre_svg/vcl/res/error.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="-5 -10 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#7a0006"><path d="m45.168769-2.1797647c11.133 0 21.812 4.4219 29.684 12.2969997 7.875 7.8711 12.297 18.551 12.297 29.684s-4.4219 21.812-12.297 29.684c-7.8711 7.875-18.551 12.297-29.684 12.297s-21.812-4.4219-29.684-12.297c-7.8749996-7.8711-12.2969996-18.551-12.2969996-29.684.011719-11.129 4.4414-21.801 12.3089996-29.672 7.8711-7.8671997 18.543-12.2969997 29.672-12.3089997zm0 75.9609997c9.0117 0 17.656-3.582 24.027-9.9531s9.9531-15.016 9.9531-24.027-3.582-17.656-9.9531-24.027c-6.3711-6.3709997-15.016-9.9530997-24.027-9.9530997s-17.656 3.582-24.027 9.9530997c-6.371 6.3711-9.9531 15.016-9.9531 24.027.01172 9.0078 3.5938 17.645 9.9648 24.016s15.008 9.9531 24.016 9.9648z"/><path d="m59.488769 25.480735c-1.5625-1.5625-4.0977-1.5625-5.6562 0l-8.6641 8.6641-8.6641-8.6641c-1.5586-1.5625-4.0938-1.5625-5.6562 0s-1.5625 4.0977 0 5.6562l8.6641 8.6641-8.6641 8.6641c-1.5625 1.5586-1.5625 4.0938 0 5.6562s4.0977 1.5625 5.6562 0l8.6641-8.6641 8.6641 8.6641c1.5586 1.5625 4.0938 1.5625 5.6562 0s1.5625-4.0977 0-5.6562l-8.6641-8.6641 8.6641-8.6641c1.5625-1.5586 1.5625-4.0938 0-5.6562z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/vcl/res/information.svg b/icon-themes/colibre_svg/vcl/res/information.svg
new file mode 100644
index 000000000000..a069979cf797
--- /dev/null
+++ b/icon-themes/colibre_svg/vcl/res/information.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#004785" stroke-width=".999996"><path d="m49.847796 5.9426952c-24.052564 0-43.622116 19.9597898-43.622116 44.4919878 0 24.532196 19.569552 44.491983 43.622116 44.491983s43.622117-19.959787 43.622117-44.491983c0-24.532198-19.569553-44.4919878-43.622117-44.4919878zm0 82.1390538c-20.352514 0-36.911021-16.888702-36.911021-37.647066s16.558507-37.647067 36.911021-37.647067c20.352515 0 36.911023 16.888703 36.911023 37.647067s-16.558508 37.647066-36.911023 37.647066z"/><path d="m55.363192 67.818183h-1.363192v-23.636366c0-2.302461-1.832129-4.171125-4.089572-4.171125h-5.452765c-2.257446 0-4.089574 1.868664-4.089574 4.171125 0 2.30246 1.832128 4.171123 4.089574 4.171123h1.36319v19.465243h-1.36319c-2.257446 0-4.089574 1.868663-4.089574 4.171124 0 2.30246 1.832128 4.171123 4.089574 4.171123h10.905529c2.257443 0 4.089578-1.868663 4.089578-4.171123 0-2.302461-1.832135-4.171124-4.089578-4.171124z"/><ellipse cx="49.148602" cy="31.996174" rx="4.362212" ry="4.449198"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/vcl/res/warning.svg b/icon-themes/colibre_svg/vcl/res/warning.svg
new file mode 100644
index 000000000000..3ff0db263af9
--- /dev/null
+++ b/icon-themes/colibre_svg/vcl/res/warning.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#704300"><path d="m94.9 70.8-33-55.6c-2.5-4.3-6.9-6.8-11.8-6.8s-9.4 2.5-11.8 6.8l-33 55.6c-2.8 4.3-2.8 9.5-.3 13.8s6.9 6.9 12 6.9h65.9c5.1 0 9.5-2.6 12-6.9 2.6-4.3 2.6-9.5 0-13.8zm-7.9 9.4c-.5.8-1.5 2.3-4 2.3h-66c-2.5 0-3.5-1.7-4-2.3-.5-.8-1.2-2.6 0-4.6l33-55.6c1.2-2 3.2-2.3 4-2.3s2.8.2 4 2.3l33 55.6c1.3 2 .3 3.8 0 4.6z"/><path d="m50 30.4c-2.6 0-4.6 2-4.6 4.6v24.6c0 2.6 2 4.6 4.6 4.6s4.6-2 4.6-4.6v-24.6c0-2.4-2-4.6-4.6-4.6z"/><path d="m50 66.7c-2.6 0-4.6 2-4.6 4.6v1.5c0 2.6 2 4.6 4.6 4.6s4.6-2 4.6-4.6v-1.5c0-2.6-2-4.6-4.6-4.6z"/></g></svg>
\ No newline at end of file
diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx
index c731c0b4bbe7..49610dcddd0b 100644
--- a/include/vcl/toolkit/edit.hxx
+++ b/include/vcl/toolkit/edit.hxx
@@ -82,6 +82,7 @@ private:
     Link<Edit&,void>    maAutocompleteHdl;
     Link<Edit&,bool>    maActivateHdl;
     std::unique_ptr<VclBuilder> mpUIBuilder;
+    sal_uInt8           maEntryMessageType;
 
     css::uno::Reference<css::i18n::XBreakIterator> mxBreakIterator;
     css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC;
@@ -246,6 +247,8 @@ public:
     bool IsPassword() const { return mbPassword; }
 
     bool IsActivePopup() const { return mbActivePopup; }
+
+    void SetEntryMessageType(sal_uInt8 aEntryMessageType) { maEntryMessageType = aEntryMessageType; }
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index da7f30a3ee8b..1723a7cd45ea 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -227,4 +227,8 @@ inline constexpr OUString CHEVRON = u"sfx2/res/chevron.png"_ustr;
 inline constexpr OUString RID_UPDATE_AVAILABLE_16 = u"extensions/res/update/ui/onlineupdate_16.png"_ustr;
 inline constexpr OUString RID_UPDATE_AVAILABLE_26 = u"extensions/res/update/ui/onlineupdate_26.png"_ustr;
 
+inline constexpr OUString RID_MSGTYPE_INFO = u"vcl/res/information.png"_ustr;
+inline constexpr OUString RID_MSGTYPE_WARN = u"vcl/res/warning.png"_ustr;
+inline constexpr OUString RID_MSGTYPE_ERR = u"vcl/res/error.png"_ustr;
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 6bf73e7b2ffb..eeccc451098f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3213,14 +3213,14 @@ void set_message_type(Edit* pEntry, weld::EntryMessageType eType)
     switch (eType)
     {
         case weld::EntryMessageType::Normal:
+        case weld::EntryMessageType::Info:
             pEntry->SetForceControlBackground(false);
             pEntry->SetControlForeground();
             pEntry->SetControlBackground();
-            break;
-        case weld::EntryMessageType::Info:
-            pEntry->SetForceControlBackground(true);
-            pEntry->SetControlForeground(COL_BLACK);
-            pEntry->SetControlBackground(0xb4c7dc); // light blue 3
+            if (eType == weld::EntryMessageType::Normal)
+                pEntry->SetEntryMessageType(0);
+            else
+                pEntry->SetEntryMessageType(1);
             break;
         case weld::EntryMessageType::Warning:
             // tdf#114603: enable setting the background to a different color;
@@ -3228,6 +3228,7 @@ void set_message_type(Edit* pEntry, weld::EntryMessageType eType)
             pEntry->SetForceControlBackground(true);
             pEntry->SetControlForeground(COL_BLACK);
             pEntry->SetControlBackground(0xffffa6); // "light yellow 3"
+            pEntry->SetEntryMessageType(2);
             break;
         case weld::EntryMessageType::Error:
             // tdf#114603: enable setting the background to a different color;
@@ -3235,6 +3236,7 @@ void set_message_type(Edit* pEntry, weld::EntryMessageType eType)
             pEntry->SetForceControlBackground(true);
             pEntry->SetControlForeground(COL_BLACK); // contrast of 5.87 to the red background
             pEntry->SetControlBackground(0xffa6a6); // "light red 3"
+            pEntry->SetEntryMessageType(3);
             break;
     }
 }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 001314f3fcb0..6e6a2b5f6c91 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -43,6 +43,7 @@
 #include <window.h>
 #include <svdata.hxx>
 #include <strings.hrc>
+#include <bitmaps.hlst>
 
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
@@ -253,6 +254,7 @@ void Edit::ImplInitEditData()
     mpDDInfo                = nullptr;
     mpIMEInfos              = nullptr;
     mcEchoChar              = 0;
+    maEntryMessageType      = 0;
 
     // no default mirroring for Edit controls
     // note: controls that use a subedit will revert this (SpinField, ComboBox)
@@ -483,7 +485,16 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const tools::Rectangl
 
     ImplPaintBorder(rRenderContext);
 
-    bool bDrawSelection = maSelection.Len() && (HasFocus() || (GetStyle() & WB_NOHIDESELECTION) || mbActivePopup);
+    if (maEntryMessageType > 0)
+    {
+        const OUString sType(  maEntryMessageType == 1 ? RID_MSGTYPE_INFO
+                             : maEntryMessageType == 2 ? RID_MSGTYPE_WARN
+                                                       : RID_MSGTYPE_ERR);
+        const Point aPoint(rRectangle.Right() - 18, rRectangle.Bottom() / 2 - 8);
+        rRenderContext.DrawImage(aPoint, Image(StockImage::Yes, sType));
+    }
+    bool bDrawSelection
+        = maSelection.Len() && (HasFocus() || (GetStyle() & WB_NOHIDESELECTION) || mbActivePopup);
 
     aPos.setX( mnXOffset + ImplGetExtraXOffset() );
     if (bPaintPlaceholderText)