diff --git a/Mail/Helpers/RichTextEditor.swift b/Mail/Helpers/RichTextEditor.swift
index 0ade3665d..a06b923da 100644
--- a/Mail/Helpers/RichTextEditor.swift
+++ b/Mail/Helpers/RichTextEditor.swift
@@ -241,7 +241,7 @@ class MailEditorView: SQTextEditorView {
     }
 
     public func getToolbar() -> UIToolbar {
-        let newToolbar = UIToolbar(frame: CGRect(x: 0, y: 0, width: 320, height: 55))
+        let newToolbar = UIToolbar(frame: CGRect(x: 0, y: 0, width: 320, height: 48))
         newToolbar.tintColor = MailResourcesAsset.textSecondaryColor.color
         newToolbar.barTintColor = MailResourcesAsset.backgroundSecondaryColor.color
         newToolbar.isTranslucent = false
@@ -351,7 +351,7 @@ enum ToolbarAction: Int {
         case .link:
             return MailResourcesAsset.hyperlink.image
         case .programMessage:
-            return MailResourcesAsset.clock.image
+            return MailResourcesAsset.waitingMessage.image
         }
     }
 
diff --git a/MailResources/Assets.xcassets/hyperlink.imageset/hyperlink.svg b/MailResources/Assets.xcassets/hyperlink.imageset/hyperlink.svg
index 270a2a572..165fe005c 100644
--- a/MailResources/Assets.xcassets/hyperlink.imageset/hyperlink.svg
+++ b/MailResources/Assets.xcassets/hyperlink.imageset/hyperlink.svg
@@ -1,11 +1,5 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_4693_49263)">
-<path d="M5.42493 23.9944C4.22493 23.9944 3.09893 23.5284 2.25293 22.6834L1.31393 21.7444C-0.43407 19.9954 -0.43407 17.1504 1.31393 15.4024L7.41993 9.2944C8.26593 8.4484 9.39293 7.9834 10.5919 7.9834C11.7909 7.9834 12.9179 8.4494 13.7639 9.2944L14.7029 10.2344C14.8979 10.4294 14.8979 10.7464 14.7029 10.9414C14.6079 11.0354 14.4829 11.0874 14.3489 11.0874C14.2149 11.0874 14.0899 11.0354 13.9949 10.9414L13.0559 10.0014C12.3989 9.3444 11.5229 8.9824 10.5909 8.9824C9.65893 8.9824 8.78293 9.3444 8.12593 10.0014L2.01993 16.1084C0.66193 17.4674 0.66193 19.6774 2.01993 21.0364L2.95893 21.9754C3.61593 22.6324 4.49193 22.9944 5.42393 22.9944C6.35593 22.9944 7.23193 22.6324 7.88893 21.9754L12.1159 17.7484C12.2099 17.6544 12.3359 17.6024 12.4699 17.6024C12.6039 17.6024 12.7289 17.6544 12.8239 17.7484C13.0189 17.9434 13.0189 18.2604 12.8239 18.4554L8.59693 22.6824C7.75093 23.5284 6.62393 23.9944 5.42493 23.9944Z" fill="black"/>
-<path d="M13.4089 16.0101C12.2099 16.0101 11.0839 15.5441 10.2379 14.6991C10.2329 14.6951 10.2239 14.6851 10.2199 14.6801L9.29688 13.7581C9.20288 13.6631 9.15088 13.5381 9.15088 13.4041C9.15088 13.2701 9.20288 13.1451 9.29788 13.0511C9.39188 12.9571 9.51688 12.9051 9.65088 12.9051C9.78488 12.9051 9.90988 12.9571 10.0049 13.0511L10.9439 13.9911C11.6049 14.6501 12.4789 15.0111 13.4079 15.0111C14.3399 15.0111 15.2159 14.6491 15.8729 13.9911L21.9789 7.88409C23.3369 6.52509 23.3369 4.31509 21.9789 2.95609L21.0429 2.02109C20.3799 1.35909 19.5049 0.996094 18.5749 0.996094C17.6429 0.996094 16.7679 1.35909 16.1099 2.01709L11.8829 6.24309C11.7889 6.33709 11.6629 6.38909 11.5289 6.38909C11.3949 6.38909 11.2699 6.33709 11.1749 6.24309C11.0799 6.14909 11.0299 6.02309 11.0299 5.89009C11.0299 5.75609 11.0819 5.63109 11.1769 5.53609L15.4039 1.31009C16.2509 0.463094 17.3769 -0.00390625 18.5749 -0.00390625C19.7719 -0.00390625 20.8969 0.461094 21.7429 1.30509L22.6869 2.24809C24.4349 3.99709 24.4349 6.84209 22.6869 8.59009L16.5809 14.6971C15.7349 15.5441 14.6079 16.0101 13.4089 16.0101Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4693_49263">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.49563 8.49563C2.45326 7.53799 3.75209 7 5.10639 7H6.6383C7.35335 7.00139 8.06103 7.15384 8.71306 7.44737C9.36508 7.7409 9.94773 8.16888 10.4228 8.70327C10.6102 8.91404 10.5913 9.2368 10.3805 9.42418C10.1697 9.61156 9.84696 9.5926 9.65957 9.38184C9.28007 8.95497 8.81465 8.6131 8.29382 8.37863C7.77313 8.14423 7.20881 8.02245 6.6378 8.02128H5.10639C4.02295 8.02128 2.98389 8.45167 2.21778 9.21778C1.45167 9.98389 1.02128 11.023 1.02128 12.1064C1.02128 13.1898 1.45167 14.2289 2.21778 14.995C2.98389 15.7611 4.02295 16.1915 5.10639 16.1915L6.63711 16.1915C6.63697 16.1915 6.63725 16.1915 6.63711 16.1915C7.20817 16.1901 7.77293 16.0682 8.29366 15.8338C8.81452 15.5993 9.28001 15.2575 9.65971 14.8308C9.84718 14.6201 10.1699 14.6013 10.3806 14.7887C10.5913 14.9762 10.6102 15.299 10.4227 15.5097C9.94745 16.0438 9.36482 16.4716 8.7129 16.7651C8.06097 17.0585 7.35444 17.2111 6.6395 17.2128L5.10639 17.2128C3.75209 17.2128 2.45326 16.6748 1.49563 15.7172C0.537993 14.7595 0 13.4607 0 12.1064C0 10.7521 0.537993 9.45326 1.49563 8.49563Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.3617 7L18.8936 7C20.2479 7 21.5467 7.53799 22.5044 8.49563C23.462 9.45326 24 10.7521 24 12.1064C24 13.4607 23.462 14.7595 22.5044 15.7172C21.5467 16.6748 20.2479 17.2128 18.8936 17.2128L17.3606 17.2128C16.6456 17.2112 15.939 17.0587 15.287 16.7652C14.635 16.4717 14.0524 16.0438 13.5772 15.5096C13.3898 15.2989 13.4087 14.9761 13.6194 14.7887C13.8302 14.6012 14.1529 14.6201 14.3404 14.8309C14.72 15.2577 15.1854 15.5995 15.7063 15.834C16.227 16.0684 16.7913 16.1902 17.3623 16.1915C17.3622 16.1915 17.3625 16.1915 17.3623 16.1915H18.8936C19.9771 16.1915 21.0161 15.7611 21.7822 14.995C22.5483 14.2289 22.9787 13.1898 22.9787 12.1064C22.9787 11.023 22.5483 9.98389 21.7822 9.21778C21.0161 8.45167 19.9771 8.02128 18.8936 8.02128H17.3622C16.7912 8.02239 16.2268 8.14414 15.7061 8.37854C15.1853 8.61301 14.7199 8.9549 14.3405 9.3818C14.1531 9.59259 13.8303 9.61158 13.6196 9.42422C13.4088 9.23686 13.3898 8.9141 13.5771 8.70331C14.0522 8.16885 14.6349 7.74082 15.2869 7.44728C15.939 7.15374 16.6466 7.00131 17.3617 7Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12767 12.1054C6.12767 11.8234 6.35629 11.5948 6.63831 11.5948H17.3617C17.6437 11.5948 17.8724 11.8234 17.8724 12.1054C17.8724 12.3874 17.6437 12.616 17.3617 12.616H6.63831C6.35629 12.616 6.12767 12.3874 6.12767 12.1054Z" fill="black"/>
 </svg>
diff --git a/MailResources/Assets.xcassets/waiting-message.imageset/waiting-message.svg b/MailResources/Assets.xcassets/waiting-message.imageset/waiting-message.svg
index 6a2f5cf3c..c2c999538 100644
--- a/MailResources/Assets.xcassets/waiting-message.imageset/waiting-message.svg
+++ b/MailResources/Assets.xcassets/waiting-message.imageset/waiting-message.svg
@@ -1,12 +1,12 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_4680_48924)">
-<path d="M20.002 24C19.868 24 19.743 23.948 19.648 23.854L17.281 21.488C15.695 22.478 13.874 23.001 12.001 23.001C10.128 23.001 8.30795 22.479 6.72095 21.488L4.35395 23.854C4.26095 23.948 4.13495 24 4.00195 24C3.86895 24 3.74295 23.948 3.64795 23.854C3.45295 23.659 3.45295 23.342 3.64795 23.147L5.88795 20.907C3.44895 19.016 2.00195 16.082 2.00195 13.001C2.00195 7.48698 6.48795 3.00098 12.002 3.00098C17.516 3.00098 22.002 7.48698 22.002 13.001C22.002 16.082 20.554 19.016 18.115 20.907L20.355 23.147C20.55 23.342 20.55 23.659 20.355 23.854C20.261 23.948 20.135 24 20.002 24ZM12.002 4.00098C7.03895 4.00098 3.00195 8.03798 3.00195 13.001C3.00195 17.964 7.03895 22.001 12.002 22.001C16.965 22.001 21.002 17.964 21.002 13.001C21.002 8.03798 16.964 4.00098 12.002 4.00098Z" fill="black"/>
-<path d="M15.6 13.001C15.8208 13.001 16 12.809 16 12.5724C16 12.3358 15.8208 12.1438 15.6 12.1438H12.8V7.42955C12.8 7.19298 12.6208 7.00098 12.4 7.00098C12.1792 7.00098 12 7.19298 12 7.42955V12.5724C12 12.809 12.1792 13.001 12.4 13.001H15.6Z" fill="black"/>
-<path d="M1.89378 8.01128C1.77478 8.01128 1.65878 7.96828 1.56778 7.89028C1.24778 7.61528 0.96778 7.29728 0.73578 6.94328C-0.62222 4.87128 -0.0412197 2.08028 2.03078 0.722281C2.76378 0.242281 3.61278 -0.0117188 4.48778 -0.0117188C6.01178 -0.0117188 7.41978 0.746281 8.25178 2.01728C8.32478 2.12828 8.34978 2.26228 8.32278 2.39328C8.29578 2.52328 8.21878 2.63628 8.10778 2.70928C8.02578 2.76328 7.93078 2.79128 7.83378 2.79128C7.66478 2.79128 7.50778 2.70728 7.41578 2.56528C6.76778 1.57728 5.67378 0.988281 4.48778 0.988281C3.80878 0.988281 3.14778 1.18528 2.57878 1.55928C1.79878 2.07028 1.26378 2.85528 1.07378 3.76928C0.88378 4.68228 1.06078 5.61528 1.57278 6.39628C1.75278 6.67028 1.97078 6.91728 2.21978 7.13128C2.32078 7.21828 2.38278 7.33928 2.39278 7.47228C2.40278 7.60528 2.36078 7.73428 2.27378 7.83628C2.17878 7.94728 2.04078 8.01128 1.89378 8.01128Z" fill="black"/>
-<path d="M22.108 8.01135C21.962 8.01135 21.824 7.94835 21.729 7.83735C21.642 7.73535 21.6 7.60535 21.61 7.47235C21.62 7.33935 21.682 7.21835 21.783 7.13135C22.032 6.91835 22.249 6.67035 22.43 6.39535C23.486 4.78435 23.034 2.61535 21.424 1.55935C20.852 1.18435 20.193 0.986352 19.517 0.986352C19.277 0.986352 19.035 1.01135 18.798 1.06035C17.884 1.25035 17.1 1.78535 16.588 2.56535C16.496 2.70635 16.339 2.79135 16.17 2.79135C16.072 2.79135 15.977 2.76335 15.896 2.70935C15.785 2.63635 15.708 2.52435 15.681 2.39335C15.654 2.26235 15.679 2.12935 15.753 2.01735C16.411 1.01335 17.42 0.326352 18.595 0.0813516C18.9 0.0183516 19.211 -0.0146484 19.519 -0.0146484C20.39 -0.0146484 21.239 0.240352 21.974 0.722352C22.976 1.37935 23.663 2.38935 23.908 3.56535C24.153 4.74135 23.926 5.94135 23.269 6.94335C23.037 7.29735 22.757 7.61635 22.436 7.89035C22.343 7.96835 22.228 8.01135 22.108 8.01135Z" fill="black"/>
+<g clip-path="url(#clip0_33_1178)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.7513 20.4705C20.0584 18.6798 21.543 15.8808 21.543 12.735C21.543 7.32887 17.1582 2.94678 11.7499 2.94678C6.34156 2.94678 1.95679 7.32887 1.95679 12.735C1.95679 15.8808 3.44147 18.6798 5.74858 20.4705L3.57086 22.6463C3.37551 22.8414 3.37537 23.158 3.57054 23.3534C3.76572 23.5487 4.0823 23.5489 4.27765 23.3537L6.58231 21.0511C8.08228 21.9842 9.85314 22.5232 11.7499 22.5232C13.6467 22.5232 15.4176 21.9842 16.9176 21.0511L19.2223 23.3537C19.4177 23.5489 19.7342 23.5487 19.9294 23.3534C20.1246 23.158 20.1244 22.8414 19.9291 22.6463L17.7513 20.4705ZM11.7499 3.94678C6.89335 3.94678 2.95679 7.88165 2.95679 12.735C2.95679 15.7276 4.45349 18.371 6.73969 19.9581C6.78136 19.9785 6.82077 20.0051 6.85657 20.0378C8.25541 20.9759 9.93867 21.5232 11.7499 21.5232C13.5554 21.5232 15.2337 20.9794 16.6299 20.0467C16.6727 20.0051 16.7211 19.9727 16.7726 19.9494C19.0518 18.3614 20.543 15.7222 20.543 12.735C20.543 7.88165 16.6064 3.94678 11.7499 3.94678Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2391 6.8575C12.5153 6.8575 12.7391 7.08136 12.7391 7.3575V12.7237H15.4853C15.7615 12.7237 15.9853 12.9476 15.9853 13.2237C15.9853 13.4999 15.7615 13.7237 15.4853 13.7237H12.2391C11.963 13.7237 11.7391 13.4999 11.7391 13.2237V7.3575C11.7391 7.08136 11.963 6.8575 12.2391 6.8575Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.13288 0.187867C3.73679 0.00567029 4.3728 -0.0447831 4.99791 0.0399152C5.62301 0.124614 6.22263 0.342491 6.75624 0.678825C7.28984 1.01516 7.74498 1.46211 8.09086 1.98947C8.2423 2.22038 8.17789 2.53034 7.94698 2.68179C7.71607 2.83323 7.40611 2.76882 7.25467 2.53791C6.98733 2.1303 6.63552 1.7848 6.22301 1.5248C5.81051 1.26479 5.34693 1.09634 4.86364 1.03086C4.38034 0.965376 3.88862 1.00438 3.42172 1.14525C2.95482 1.28611 2.52364 1.52553 2.15735 1.84731C1.79106 2.16908 1.4982 2.56571 1.29855 3.01034C1.09889 3.45498 0.997108 3.93728 1.00006 4.42461C1.00302 4.91194 1.11064 5.39297 1.31567 5.83516C1.5207 6.27735 1.81835 6.6704 2.18852 6.98771C2.39817 7.16743 2.42243 7.48309 2.24271 7.69274C2.06299 7.90239 1.74734 7.92666 1.53769 7.74694C1.05882 7.33644 0.673723 6.82794 0.408445 6.2558C0.143167 5.68367 0.00390342 5.06126 8.08824e-05 4.43067C-0.00374162 3.80008 0.127967 3.17603 0.386289 2.60072C0.644612 2.02542 1.02352 1.51229 1.49737 1.09602C1.97122 0.679758 2.52897 0.370063 3.13288 0.187867Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.0782 1.14525C19.6113 1.00438 19.1196 0.965376 18.6363 1.03086C18.153 1.09634 17.6894 1.26479 17.2769 1.5248C16.8644 1.7848 16.5126 2.1303 16.2453 2.53791C16.0938 2.76882 15.7839 2.83323 15.553 2.68179C15.3221 2.53034 15.2576 2.22038 15.4091 1.98947C15.755 1.46211 16.2101 1.01516 16.7437 0.678825C17.2773 0.342491 17.8769 0.124614 18.502 0.0399152C19.1271 -0.0447831 19.7632 0.00567029 20.3671 0.187867C20.971 0.370063 21.5287 0.679758 22.0026 1.09602C22.4764 1.51229 22.8553 2.02542 23.1137 2.60072C23.372 3.17603 23.5037 3.80008 23.4999 4.43067C23.496 5.06126 23.3568 5.68367 23.0915 6.2558C22.8262 6.82794 22.4411 7.33644 21.9623 7.74694C21.7526 7.92666 21.437 7.90239 21.2572 7.69274C21.0775 7.48309 21.1018 7.16743 21.3114 6.98771C21.6816 6.6704 21.9793 6.27735 22.1843 5.83516C22.3893 5.39297 22.4969 4.91194 22.4999 4.42461C22.5028 3.93727 22.4011 3.45498 22.2014 3.01034C22.0017 2.56571 21.7089 2.16908 21.3426 1.84731C20.9763 1.52553 20.5451 1.28611 20.0782 1.14525Z" fill="black"/>
 </g>
 <defs>
-<clipPath id="clip0_4680_48924">
+<clipPath id="clip0_33_1178">
 <rect width="24" height="24" fill="white"/>
 </clipPath>
 </defs>