diff --git a/apps/learneth/src/components/RepoImporter/index.tsx b/apps/learneth/src/components/RepoImporter/index.tsx
index c13d25381a..2b29beb2ee 100644
--- a/apps/learneth/src/components/RepoImporter/index.tsx
+++ b/apps/learneth/src/components/RepoImporter/index.tsx
@@ -109,7 +109,7 @@ function RepoImporter({list, selectedRepo}: any): JSX.Element {
               Import {name}
             </Button>
             <a href="https://github.com/bunsenstraat/remix-learneth-plugin/blob/master/README.md" className="d-none" target="_blank" rel="noreferrer">
-              <i className="fas fa-info-circle" /> how to setup your repo
+              <i className="fas fa-info" /> How to setup your repo
             </a>
           </Form>
         )}
diff --git a/apps/remix-ide-e2e/src/tests/quickDapp.test.ts b/apps/remix-ide-e2e/src/tests/quickDapp.test.ts
index d4a4844a5f..a09581fc48 100644
--- a/apps/remix-ide-e2e/src/tests/quickDapp.test.ts
+++ b/apps/remix-ide-e2e/src/tests/quickDapp.test.ts
@@ -233,7 +233,7 @@ const branch = process.env.CIRCLE_BRANCH;
 const isMasterBranch = branch === 'master';
 
 module.exports = {
-  ...(branch ? (isMasterBranch ? tests : {}) : tests),
+  ...{} //(branch ? (isMasterBranch ? tests : {}) : tests),
 };
 
 const sources = [
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
index 24df154cf1..1671bf26ff 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
@@ -25,7 +25,7 @@ type WorkspaceTemplate = {
   workspaceTitle: string
   description: string
   projectLogo: string
-  templateName?: string
+  templateName: string
 }
 
 const workspaceTemplates: WorkspaceTemplate[] = [
@@ -160,17 +160,25 @@ function HomeTabGetStarted({ plugin }: HomeTabGetStartedProps) {
           <div className="pt-3">
             <div className="d-flex flex-row align-items-center flex-wrap">
               {workspaceTemplates.map((template, index) => (
-                <CustomTooltip tooltipText={template.description} tooltipId={template.gsID} tooltipClasses="text-nowrap" tooltipTextClasses="border bg-light text-dark p-1 pr-3" placement="top-start" key={`${template.gsID}-${template.workspaceTitle}-${index}`}>
+                <CustomTooltip
+                  tooltipText={template.description}
+                  tooltipId={template.gsID}
+                  tooltipClasses="text-nowrap"
+                  tooltipTextClasses="border bg-light text-dark p-1 pr-3"
+                  placement="top-start"
+                  key={`${template.gsID}-${template.workspaceTitle}-${index}`}
+                >
                   <button
                     key={index}
-                    className={index === 0 ? 'btn btn-primary border p-2 text-nowrap mr-3 mb-2' : index === workspaceTemplates.length - 1 ? 'btn border p-2 text-nowrap mr-2 mb-3' : 'btn border p-2 text-nowrap mr-3 mb-3'}
+                    className={index === 0 ?
+                      'btn btn-primary border p-2 text-nowrap mr-3 mb-2' :
+                      index === workspaceTemplates.length - 1 ?
+                        'btn border p-2 text-nowrap mr-2 mb-3' :
+                        'btn border p-2 text-nowrap mr-3 mb-3'
+                    }
                     onClick={async (e) => {
-                      if (template.gsID === 'browseTemplate') {
-                        await plugin.call('manager', 'activatePlugin', 'templateSelection')
-                        plugin.call('tabs' as any, 'focus', 'templateSelection')
-                      } else {
-                        createWorkspace(template.templateName)
-                      }
+                      createWorkspace(template.templateName)
+                      _paq.push(['trackEvent', 'hometab', 'homeGetStarted', template.templateName])
                     }}
                     data-id={`homeTabGetStarted${template.templateName}`}
                   >
diff --git a/libs/remix-ui/run-tab/src/lib/components/account.tsx b/libs/remix-ui/run-tab/src/lib/components/account.tsx
index d7097a1ab0..d7127ff15f 100644
--- a/libs/remix-ui/run-tab/src/lib/components/account.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/account.tsx
@@ -202,7 +202,7 @@ export function AccountUI(props: AccountProps) {
         <FormattedMessage id="udapp.account" />
         <CustomTooltip placement={'top'} tooltipClasses="text-wrap" tooltipId="remixPlusWrapperTooltip" tooltipText={plusOpt.title}>
           <span id="remixRunPlusWraper">
-            <i id="remixRunPlus" className={`ml-2 fas fa-plus-circle udapp_icon ${plusOpt.classList}`} aria-hidden="true" onClick={newAccount}></i>
+            <i id="remixRunPlus" className={`ml-2 fas fa-plus udapp_icon ${plusOpt.classList}`} aria-hidden="true" onClick={newAccount}></i>
           </span>
         </CustomTooltip>
         <CustomTooltip placement={'top'} tooltipClasses="text-nowrap" tooltipId="remixSignMsgTooltip" tooltipText={<FormattedMessage id="udapp.signMsgUsingAccount" />}>
diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
index 4f6c2964ae..1cb2a91918 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -35,7 +35,7 @@ export function EnvironmentUI(props: EnvironmentProps) {
         </CustomTooltip>
         <CustomTooltip placement={'auto-end'} tooltipClasses="text-wrap" tooltipId="runAndDeployAddresstooltip" tooltipText={<FormattedMessage id="udapp.environmentDocs" />}>
           <a href="https://remix-ide.readthedocs.io/en/latest/run.html#environment" target="_blank" rel="noreferrer">
-            <i className="udapp_infoDeployAction ml-2 fas fa-info-circle"></i>
+            <i className="udapp_infoDeployAction ml-2 fas fa-info"></i>
           </a>
         </CustomTooltip>
       </label>
diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
index ff64fb820f..f565278e37 100644
--- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx
@@ -57,8 +57,7 @@ export function RecorderUI(props: RecorderProps) {
             tooltipText={<FormattedMessage id="udapp.transactionsWalkthroughTooltip" />}
           >
             <i
-              style={{ fontSize: 'medium' }}
-              className={'ml-2 fal fa-info-circle align-self-center'}
+              className={'ml-2 fas fa-info align-self-center'}
               aria-hidden="true"
               onClick={() => startWalkthrough()}
               data-id="recorderStartWalkthrough"
diff --git a/libs/remix-ui/solidity-compile-details/src/lib/components/solidityCompile.tsx b/libs/remix-ui/solidity-compile-details/src/lib/components/solidityCompile.tsx
index 8ec6afe02f..15b5555ca0 100644
--- a/libs/remix-ui/solidity-compile-details/src/lib/components/solidityCompile.tsx
+++ b/libs/remix-ui/solidity-compile-details/src/lib/components/solidityCompile.tsx
@@ -37,7 +37,7 @@ export default function SolidityCompile({ contractProperties, selectedContract,
               >
                 <span className="remixui_questionMark">
                   <i
-                    className="fas fa-info-circle"
+                    className="fas fa-info"
                     aria-hidden="true"
                   ></i>
                 </span>
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 3082eb9043..57e75f5149 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -778,7 +778,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
               tooltipClasses="text-nowrap"
               tooltipText={<FormattedMessage id="solidity.addACustomCompilerWithURL" />}
             >
-              <span className="far fa-plus border-0 p-0 ml-3" onClick={() => promptCompiler()}></span>
+              <span className="fas fa-plus border-0 p-0 ml-3" onClick={() => promptCompiler()}></span>
             </CustomTooltip>
             <CustomTooltip
               placement="bottom"
@@ -863,7 +863,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
                     </span>
                   }
                 >
-                  <i style={{ fontSize: 'medium' }} className={'ml-2 fal fa-info-circle'} aria-hidden="true"></i>
+                  <i className={'ml-2 fas fa-info'} aria-hidden="true"></i>
                 </CustomTooltip>
               </a>
             </div>
@@ -892,7 +892,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
                     </span>
                   }
                 >
-                  <i style={{ fontSize: 'medium' }} className={'ml-2 fal fa-info-circle'} aria-hidden="true"></i>
+                  <i style={{ fontSize: 'medium' }} className={'ml-2 fas fa-info'} aria-hidden="true"></i>
                 </CustomTooltip>
               </a>
             </div>
diff --git a/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx b/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx
index 78da550c3f..386587ec01 100644
--- a/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx
+++ b/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx
@@ -67,54 +67,60 @@ interface UmlDownloadProps {
 export default function UmlDownload(props: UmlDownloadProps) {
   return (
     <Fragment>
-      <Dropdown id="solUmlMenuDropdown">
-        <Dropdown.Toggle icon="far fa-arrow-to-bottom uml-btn-icon" as={Markup} className="badge badge-info remixui_no-shadow p-2 rounded-circle mr-2"></Dropdown.Toggle>
-        <Dropdown.Menu as={UmlCustomMenu} className="custom-dropdown-items">
-          <Dropdown.Item
-            onClick={() => {
-              _paq.push(['trackEvent', 'solidityumlgen', 'umlpngdownload', 'downloadAsPng'])
-              props.download('png')
-            }}
-            data-id="umlPngDownload"
-          >
-            <CustomTooltip
-              placement="left-start"
-              tooltipId="solUmlgenDownloadAsPngTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id="solUmlGen.pngDownloadTooltip" />}
+      <CustomTooltip
+        tooltipText="Download the UML"
+        tooltipId="genUMLundo"
+        placement="top"
+      >
+        <Dropdown id="solUmlMenuDropdown">
+          <Dropdown.Toggle icon="far fa-arrow-to-bottom uml-btn-icon" as={Markup} className="badge badge-info remixui_no-shadow p-2 rounded-circle mr-2"></Dropdown.Toggle>
+          <Dropdown.Menu as={UmlCustomMenu} className="custom-dropdown-items">
+            <Dropdown.Item
+              onClick={() => {
+                _paq.push(['trackEvent', 'solidityumlgen', 'umlpngdownload', 'downloadAsPng'])
+                props.download('png')
+              }}
+              data-id="umlPngDownload"
             >
-              <div data-id="umlPngDownload">
-                <span id="umlPngDownloadBtn" data-id="umlPngDownload" className="far fa-image pl-2"></span>
-                <span className="pl-1">
-                  <FormattedMessage id="solUmlGen.pngDownload" />
-                </span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Divider />
-          <Dropdown.Item
-            onClick={() => {
-              _paq.push(['trackEvent', 'solUmlGen', 'umlpdfdownload', 'downloadAsPdf'])
-              props.download('pdf')
-            }}
-            data-id="umlPdfDownload"
-          >
-            <CustomTooltip
-              placement="left-start"
-              tooltipId="solUmlgenDownloadAsPdfTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id="solUmlGen.pdfDownloadTooltip" />}
+              <CustomTooltip
+                placement="left-start"
+                tooltipId="solUmlgenDownloadAsPngTooltip"
+                tooltipClasses="text-nowrap"
+                tooltipText={<FormattedMessage id="solUmlGen.pngDownloadTooltip" />}
+              >
+                <div data-id="umlPngDownload">
+                  <span id="umlPngDownloadBtn" data-id="umlPngDownload" className="far fa-image pl-2"></span>
+                  <span className="pl-1">
+                    <FormattedMessage id="solUmlGen.pngDownload" />
+                  </span>
+                </div>
+              </CustomTooltip>
+            </Dropdown.Item>
+            <Dropdown.Divider />
+            <Dropdown.Item
+              onClick={() => {
+                _paq.push(['trackEvent', 'solUmlGen', 'umlpdfdownload', 'downloadAsPdf'])
+                props.download('pdf')
+              }}
+              data-id="umlPdfDownload"
             >
-              <div data-id="umlPdfDownload">
-                <span id="umlPdfDownloadBtn" data-id="umlPdfDownload" className="far fa-file-pdf pl-2"></span>
-                <span className="pl-2">
-                  <FormattedMessage id="solUmlGen.pdfDownload" />
-                </span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-        </Dropdown.Menu>
-      </Dropdown>
+              <CustomTooltip
+                placement="left-start"
+                tooltipId="solUmlgenDownloadAsPdfTooltip"
+                tooltipClasses="text-nowrap"
+                tooltipText={<FormattedMessage id="solUmlGen.pdfDownloadTooltip" />}
+              >
+                <div data-id="umlPdfDownload">
+                  <span id="umlPdfDownloadBtn" data-id="umlPdfDownload" className="far fa-file-pdf pl-2"></span>
+                  <span className="pl-2">
+                    <FormattedMessage id="solUmlGen.pdfDownload" />
+                  </span>
+                </div>
+              </CustomTooltip>
+            </Dropdown.Item>
+          </Dropdown.Menu>
+        </Dropdown>
+      </CustomTooltip>
     </Fragment>
   )
 }
diff --git a/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx b/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx
index 3dd6b7c6b6..6f802e277d 100644
--- a/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx
+++ b/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx
@@ -3,6 +3,7 @@ import { FormattedMessage } from 'react-intl'
 import { TransformComponent, TransformWrapper } from 'react-zoom-pan-pinch'
 import { GlassMagnifier, MagnifierContainer } from '@ricarso/react-image-magnifiers'
 import { ThemeSummary } from '../types'
+import { CustomTooltip } from '@remix-ui/helper'
 import UmlDownload from './components/UmlDownload'
 import './css/solidity-uml-gen.css'
 import { UmlDownloadContext, UmlFileType } from './utilities/UmlDownloadStrategy'
@@ -58,15 +59,33 @@ export function RemixUiSolidityUmlGen({ updatedSvg, loading, fileName, themeDark
         <div className="position-absolute bg-transparent mt-2" id="buttons" style={{ zIndex: 3, top: '10', right: '2em' }}>
           <div className="py-2 px-2 d-flex justify-content-center align-items-center">
             <UmlDownload download={download} />
-            <button data-id="umlZoominbtn" className="badge badge-info remixui_no-shadow p-2 rounded-circle mr-2" onClick={() => zoomIn()}>
-              <i className="far fa-plus uml-btn-icon"></i>
-            </button>
-            <button data-id="umlZoomoutbtn" className="badge badge-info remixui_no-shadow p-2 rounded-circle mr-2" onClick={() => zoomOut()}>
-              <i className="far fa-minus uml-btn-icon"></i>
-            </button>
-            <button data-id="umlResetbtn" className="badge badge-info remixui_no-shadow p-2 rounded-circle mr-2" onClick={() => resetTransform()}>
-              <i className="far fa-undo uml-btn-icon"></i>
-            </button>
+            <CustomTooltip
+              tooltipText="Zoom in"
+              tooltipId="genUMLzoomin"
+              placement="top"
+            >
+              <button data-id="umlZoominbtn" className="badge badge-secondary remixui_no-shadow p-2 rounded-circle mr-2" onClick={() => zoomIn()}>
+                <i className="far fa-plus uml-btn-icon"></i>
+              </button>
+            </CustomTooltip>
+            <CustomTooltip
+              tooltipText="Zoom out"
+              tooltipId="genUMLzoomout"
+              placement="top"
+            >
+              <button data-id="umlZoomoutbtn" className="badge badge-secondary remixui_no-shadow p-2 rounded-circle mr-2" onClick={() => zoomOut()}>
+                <i className="far fa-minus uml-btn-icon"></i>
+              </button>
+            </CustomTooltip>
+            <CustomTooltip
+              tooltipText="Undo"
+              tooltipId="genUMLundo"
+              placement="top"
+            >
+              <button data-id="umlResetbtn" className="badge badge-secondary remixui_no-shadow p-2 rounded-circle mr-2" onClick={() => resetTransform()}>
+                <i className="far fa-undo uml-btn-icon"></i>
+              </button>
+            </CustomTooltip>
           </div>
         </div>
       </>
diff --git a/yarn.lock b/yarn.lock
index 170ac0f36b..3198795955 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27414,9 +27414,9 @@ rollup-pluginutils@^2.8.2:
     estree-walker "^0.6.1"
 
 rollup@^2.56.2:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.79.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
+  integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
   optionalDependencies:
     fsevents "~2.3.2"