diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index f0bad64077a8..5f3b02612dcb 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -96,15 +96,29 @@ <h2 style="flex: 1 1; white-space: nowrap;">{{_ "My Profile"}}</h2>
 						<div class="rc-form-group rc-grid">
 							{{#with canChange=allowEmailChange}}
 							<div class="rc-input rc-w50 padded {{#if emailInvalid}}rc-input--error{{/if}}">
-									<label class="rc-input__label">
-										<div class="rc-input__title">{{_ "Email"}}</div>
-										<div class="rc-input__wrapper">
-											<input name="email" type="text" class="rc-input__element" placeholder="Type email" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
-										</div>
-									</label>
-									{{# unless canChange}}
-										<div class="rc-input__description">{{_ 'Email_Change_Disabled'}}</div>
-									{{/unless}}
+								<label class="rc-input__label">
+									<div class="rc-input__title">{{_ "Email"}}</div>
+									<div class="rc-input__wrapper">
+										<input name="email" type="text" class="rc-input__element" placeholder="Type email" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
+										{{#unless emailVerified}}
+											<div class="rc-input__icon rc-input__icon--right">
+												{{> icon block="rc-input__icon-svg" icon="cross-circled"}}
+											</div>
+										{{else}}
+											<div class="rc-input__icon rc-input__icon--right">
+												{{> icon block="rc-input__icon-svg" icon="checkmark-circled"}}
+											</div>
+										{{/unless}}
+									</div>
+								</label>
+								{{#unless canChange}}
+									<div class="rc-input__description">{{_ 'Email_Change_Disabled'}}</div>
+								{{/unless}}
+								{{#unless emailVerified}}
+									<div class="rc-input__error">
+										<button class="rc-button rc-button--small" id="resend-verification-email">{{_ "Resend_verification_mail"}}</button>
+									</div>
+								{{/unless}}
 							</div>
 							{{/with}}
 							<div class="rc-input rc-w50 padded">
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index 79f12ea73285..75b6096155ea 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -56,4 +56,6 @@
     <symbol viewBox="0 0 20 20" id="icon-video"><g stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M3 8h10v8H3zm10 2.376l4.048-1.314c.526-.171.952.137.952.69v4.494c0 .552-.426.862-.952.69L13 13.624v-3.247z" /><path d="M5.5 5h5" stroke-linecap="square" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-volume"><path d="M3 6.345h1.967S6.027 4 9 4v12c-2.874 0-4.033-2.345-4.033-2.345H3v-7.31zm10.106 7.081A6.968 6.968 0 0 0 14 10a6.968 6.968 0 0 0-.894-3.426m2.489 8.809A10.95 10.95 0 0 0 17 10c0-1.956-.51-3.792-1.405-5.383" stroke="currentColor" stroke-width="1.5" fill="none" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-warning"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M10 3l8 14H2z" /><path d="M10 9v5" stroke-linecap="square" /></g></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-checkmark-circled"><path d="M486.4 1024c-129.922 0-252.067-50.594-343.936-142.464s-142.464-214.014-142.464-343.936c0-129.923 50.595-252.067 142.464-343.936s214.013-142.464 343.936-142.464c129.922 0 252.067 50.595 343.936 142.464s142.464 214.014 142.464 343.936-50.594 252.067-142.464 343.936c-91.869 91.87-214.014 142.464-343.936 142.464zM486.4 102.4c-239.97 0-435.2 195.23-435.2 435.2s195.23 435.2 435.2 435.2 435.2-195.23 435.2-435.2-195.23-435.2-435.2-435.2z"></path><path d="M384 742.4c-6.552 0-13.102-2.499-18.102-7.499l-153.6-153.6c-9.997-9.997-9.997-26.206 0-36.203 9.998-9.997 26.206-9.997 36.205 0l135.498 135.498 340.299-340.298c9.997-9.997 26.206-9.997 36.203 0 9.998 9.998 9.998 26.206 0 36.205l-358.4 358.4c-5 4.998-11.55 7.498-18.102 7.498z"></path></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-cross-circled"><path d="M733.808 723.266l-208.874-185.666 208.874-185.667c10.566-9.394 11.518-25.574 2.126-36.141-9.394-10.566-25.574-11.522-36.142-2.126l-213.392 189.682-213.392-189.68c-10.568-9.392-26.749-8.44-36.141 2.126-9.394 10.566-8.442 26.749 2.126 36.141l208.874 185.666-208.875 185.666c-10.566 9.394-11.518 25.574-2.126 36.142 5.059 5.691 12.085 8.592 19.142 8.592 6.048 0 12.122-2.131 16.998-6.466l213.394-189.683 213.392 189.683c4.878 4.334 10.949 6.466 16.998 6.466 7.058 0 14.086-2.902 19.144-8.592 9.392-10.568 8.44-26.749-2.126-36.142z"></path><path d="M486.4 1024c-129.922 0-252.067-50.594-343.936-142.464s-142.464-214.014-142.464-343.936c0-129.923 50.595-252.067 142.464-343.936s214.013-142.464 343.936-142.464c129.922 0 252.067 50.595 343.936 142.464s142.464 214.014 142.464 343.936-50.594 252.067-142.464 343.936c-91.869 91.87-214.014 142.464-343.936 142.464zM486.4 102.4c-239.97 0-435.2 195.23-435.2 435.2s195.23 435.2 435.2 435.2 435.2-195.23 435.2-435.2-195.23-435.2-435.2-435.2z"></path></symbol>
 </svg>