diff --git a/css/_side_toolbar_container.scss b/css/_side_toolbar_container.scss
index c174a4c71..caa36a476 100644
--- a/css/_side_toolbar_container.scss
+++ b/css/_side_toolbar_container.scss
@@ -23,7 +23,7 @@
      * Form elements and blocks.
      */
     input, select, a,
-    .sideToolbarBlock, .input-control, .button-control {
+    .sideToolbarBlock, .form-control, .button-control {
         display: block;
         margin-top: 15px;
         margin-left: 10%;
diff --git a/css/input-control/_input-control.scss b/css/input-control/_input-control.scss
index 05ea6c28f..54486687e 100644
--- a/css/input-control/_input-control.scss
+++ b/css/input-control/_input-control.scss
@@ -1,4 +1,4 @@
-.input-control {
+.form-control {
     padding: 16px 0;
 
     &:first-child {
diff --git a/css/modals/_dialog.scss b/css/modals/_dialog.scss
index 6de6b9316..c25b15615 100644
--- a/css/modals/_dialog.scss
+++ b/css/modals/_dialog.scss
@@ -72,7 +72,7 @@
         }
     }
 
-    .input-control:not(:last-child) {
+    .form-control:not(:last-child) {
         border-bottom: 1px solid $auiBorderColor;
     }
 }
diff --git a/css/modals/feedback/_feedback.scss b/css/modals/feedback/_feedback.scss
index 881afb9cc..5086377ba 100644
--- a/css/modals/feedback/_feedback.scss
+++ b/css/modals/feedback/_feedback.scss
@@ -62,7 +62,7 @@
             text-align: center;
             padding: 10px 40px 20px 40px;
 
-            .input-control{
+            .form-control{
                 &__input {
                     background-color: $feedbackInputBg;
                     color: $feedbackInputTextColor;
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index fd6cbe549..b3735aeca 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -80,11 +80,11 @@ JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.NO_DATA_FROM_SOURCE]
 function promptDisplayName() {
     let labelKey = 'dialog.enterDisplayName';
     let message = (
-        `<div class="input-control">
-            <label data-i18n="${labelKey}" class="input-control__label"></label>
+        `<div class="form-control">
+            <label data-i18n="${labelKey}" class="form-control__label"></label>
             <input name="displayName" type="text"
                data-i18n="[placeholder]defaultNickname"
-               class="input-control__input"
+               class="form-control__input"
                autofocus>
          </div>`
     );
diff --git a/modules/UI/authentication/LoginDialog.js b/modules/UI/authentication/LoginDialog.js
index 8eb01d22f..8915fde69 100644
--- a/modules/UI/authentication/LoginDialog.js
+++ b/modules/UI/authentication/LoginDialog.js
@@ -11,10 +11,10 @@ function getPasswordInputHtml() {
 
     return `
         <input name="username" type="text" 
-               class="input-control__input"
+               class="form-control__input"
                placeholder=${placeholder} autofocus>
         <input name="password" type="password"
-               class="input-control__input"
+               class="form-control__input"
                data-i18n="[placeholder]dialog.userPassword">`;
 }
 
diff --git a/modules/UI/feedback/FeedbackWindow.js b/modules/UI/feedback/FeedbackWindow.js
index 1bab72a0b..1354336b3 100644
--- a/modules/UI/feedback/FeedbackWindow.js
+++ b/modules/UI/feedback/FeedbackWindow.js
@@ -66,7 +66,7 @@ function createRateFeedbackHTML() {
                 </div>
             </div>
             <div class="details">
-                <textarea id="feedbackTextArea" class="input-control__input" 
+                <textarea id="feedbackTextArea" class="form-control__input" 
                     data-i18n="[placeholder]dialog.feedbackHelp"></textarea>
             </div>
         </form>`;
diff --git a/modules/UI/invite/InviteDialogView.js b/modules/UI/invite/InviteDialogView.js
index 2919ee22f..40acaccad 100644
--- a/modules/UI/invite/InviteDialogView.js
+++ b/modules/UI/invite/InviteDialogView.js
@@ -120,20 +120,20 @@ export default class InviteDialogView {
     getShareLinkBlock() {
         let classes = 'button-control button-control_light copyInviteLink';
         return (
-            `<div class="input-control">
-                <label class="input-control__label" for="inviteLinkRef"
+            `<div class="form-control">
+                <label class="form-control__label" for="inviteLinkRef"
                     data-i18n="${this.dialog.titleKey}"></label>
-                <div class="input-control__container">
-                    <input class="input-control__input inviteLink"
+                <div class="form-control__container">
+                    <input class="form-control__input inviteLink"
                            id="inviteLinkRef" type="text"
                            ${this.inviteAttributes} readonly>
                     <button data-i18n="dialog.copy" class="${classes}"></button>
                 </div>
-                <p class="input-control__hint ${this.lockHint}">
+                <p class="form-control__hint ${this.lockHint}">
                    <span class="icon-security-locked"></span>
                    <span data-i18n="dialog.roomLocked"></span>
                 </p>
-                <p class="input-control__hint ${this.unlockHint}">
+                <p class="form-control__hint ${this.unlockHint}">
                    <span class="icon-security"></span>
                    <span data-i18n="roomUnlocked"></span>
                 </p>
@@ -150,12 +150,12 @@ export default class InviteDialogView {
 
         if (this.model.isModerator) {
             html = (`
-            <div class="input-control">
-                <label class="input-control__label"
+            <div class="form-control">
+                <label class="form-control__label"
                        for="newPasswordInput" data-i18n="dialog.addPassword">
                </label>
-                <div class="input-control__container">
-                    <input class="input-control__input" id="newPasswordInput"
+                <div class="form-control__container">
+                    <input class="form-control__input" id="newPasswordInput"
                            type="text" 
                            data-i18n="[placeholder]dialog.createPassword">
                     <button id="addPasswordBtn" id="inviteDialogAddPassword"
@@ -182,19 +182,19 @@ export default class InviteDialogView {
 
         if (isModerator) {
             return (`
-                <div class="input-control">
-                    <label class="input-control__label"
+                <div class="form-control">
+                    <label class="form-control__label"
                            data-i18n="dialog.passwordLabel"></label>
-                    <div class="input-control__container">
+                    <div class="form-control__container">
                         <p>
-                            <span class="input-control__text"
+                            <span class="form-control__text"
                                   data-i18n="dialog.currentPassword"></span>
                             <span id="inviteDialogPassword"
-                                  class="input-control__em">
+                                  class="form-control__em">
                                 ${password}
                             </span>
                         </p>
-                        <a class="link input-control__right"
+                        <a class="link form-control__right"
                            id="inviteDialogRemovePassword"
                            data-i18n="dialog.removePassword"></a>
                     </div>
@@ -202,7 +202,7 @@ export default class InviteDialogView {
             `);
         } else {
             return (`
-                <div class="input-control">
+                <div class="form-control">
                     <p>A participant protected this call with a password.</p>
                 </div>
             `);
diff --git a/modules/UI/side_pannels/contactlist/ContactListView.js b/modules/UI/side_pannels/contactlist/ContactListView.js
index 94a6dd2b9..aace25747 100644
--- a/modules/UI/side_pannels/contactlist/ContactListView.js
+++ b/modules/UI/side_pannels/contactlist/ContactListView.js
@@ -136,7 +136,7 @@ var ContactListView = {
      * Adds layout for lock description
      */
     getLockDescriptionLayout(key) {
-        let classes = "input-control__hint input-control_full-width";
+        let classes = "form-control__hint form-control_full-width";
         let padlockSuffix = '';
         if (key === this.lockKey) {
             padlockSuffix = '-locked';