diff --git a/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx b/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx
index 890cc8ece4..5abacd0409 100644
--- a/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx
+++ b/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx
@@ -47,7 +47,7 @@ const themeCollection = [
   shapeColor: '#343a40',fillColor: '#fbe7f8' },
   { themeName: 'Violet', backgroundColor: '#f1eef6', textColor: '#3b445e',
   shapeColor: '#343a40',fillColor: '#f8fafe' },
-  { themeName: 'Pride', backgroundColor: '#f1eef6', textColor: '#343a40',
+  { themeName: 'Unicorn', backgroundColor: '#f1eef6', textColor: '#343a40',
   shapeColor: '#343a40',fillColor: '#f8fafe' },
 ]
 
diff --git a/apps/remix-ide/src/app/tabs/theme-module.js b/apps/remix-ide/src/app/tabs/theme-module.js
index 418c34ab28..f6e77705ba 100644
--- a/apps/remix-ide/src/app/tabs/theme-module.js
+++ b/apps/remix-ide/src/app/tabs/theme-module.js
@@ -9,7 +9,7 @@ const themes = [
   { name: 'Dark', quality: 'dark', url: 'assets/css/themes/remix-dark_tvx1s2.css' },
   { name: 'Light', quality: 'light', url: 'assets/css/themes/remix-light_powaqg.css' },
   { name: 'Violet', quality: 'light', url: 'assets/css/themes/remix-violet.css' },
-  { name: 'Pride', quality: 'light', url: 'assets/css/themes/remix-pride.css' },
+  { name: 'Unicorn', quality: 'light', url: 'assets/css/themes/remix-unicorn.css' },
   { name: 'Midcentury', quality: 'light', url: 'assets/css/themes/remix-midcentury_hrzph3.css' },
   { name: 'Black', quality: 'dark', url: 'assets/css/themes/remix-black_undtds.css' },
   { name: 'Candy', quality: 'light', url: 'assets/css/themes/remix-candy_ikhg4m.css' },
diff --git a/apps/remix-ide/src/assets/css/themes/remix-pride.css b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css
similarity index 99%
rename from apps/remix-ide/src/assets/css/themes/remix-pride.css
rename to apps/remix-ide/src/assets/css/themes/remix-unicorn.css
index ef71a5edfe..a36cd61cf2 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-pride.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css
@@ -171,7 +171,7 @@ sup {
 }
 
 a {
-  color: #747b90 !important;
+  color: #2557eb !important;
   text-decoration: underline;
   background-color: transparent;
 }
@@ -2355,13 +2355,13 @@ fieldset:disabled a.btn {
 
 .btn-primary {
   color: #fff;
-  background-color: #b58aff;
+  background-color: #c8a8ff;
   border-color: #762ff2;
 }
 .btn-primary:hover {
   color: #fff;
-  background-color: #005e80;
-  border-color: #0480ad;
+  background-color: #ab6dcf;
+  border-color: #a275d6;
 }
 .btn-primary:focus,
 .btn-primary.focus {
@@ -2378,7 +2378,7 @@ fieldset:disabled a.btn {
 .show > .btn-primary.dropdown-toggle {
   color: #fff;
   background-color: #dac5ff;
-  border-color: #004b66;
+  border-color: #40a2c5;
 }
 .btn-primary:not(:disabled):not(.disabled):active:focus,
 .btn-primary:not(:disabled):not(.disabled).active:focus,
@@ -2454,7 +2454,7 @@ fieldset:disabled a.btn {
 
 .btn-info {
   color: #fff;
-  background-color: #2F6DF2;
+  background-color: rgb(159 225 255);
   border-color: #2F6DF2;
 }
 .alert-info .btn-info {
@@ -2465,8 +2465,8 @@ fieldset:disabled a.btn {
 
 .btn-info:hover {
   color: #fff;
-  background-color: #005e80;
-  border-color: #005573;
+  background-color: #54b5d8;
+  border-color: #2F6DF2;
 }
 .btn-info:focus,
 .btn-info.focus {
@@ -2482,7 +2482,7 @@ fieldset:disabled a.btn {
 .btn-info:not(:disabled):not(.disabled).active,
 .show > .btn-info.dropdown-toggle {
   color: #fff;
-  background-color: #005573;
+  background-color: #3597bb;
   border-color: #004b66;
 }
 .btn-info:not(:disabled):not(.disabled):active:focus,
@@ -2876,11 +2876,11 @@ fieldset:disabled a.btn {
 
 .btn-link {
   font-weight: 400;
-  color: #747b90;
+  color: #8644d1;
   text-decoration: underline;
 }
 .btn-link:hover {
-  color: #515766;
+  color: #738fd6;
   text-decoration: none;
 }
 .btn-link:focus,
@@ -4722,7 +4722,7 @@ a.badge:focus {
 a.badge-primary:hover,
 a.badge-primary:focus {
   color: #fff;
-  background-color: #005573;
+  background-color: #3597bb;
 }
 a.badge-primary:focus,
 a.badge-primary.focus {
@@ -4767,7 +4767,7 @@ a.badge-success.focus {
 a.badge-info:hover,
 a.badge-info:focus {
   color: #fff;
-  background-color: #005573;
+  background-color: #3597bb;
 }
 a.badge-info:focus,
 a.badge-info.focus {
@@ -6135,7 +6135,7 @@ a.bg-primary:hover,
 a.bg-primary:focus,
 button.bg-primary:hover,
 button.bg-primary:focus {
-  background-color: #005573 !important;
+  background-color: #3597bb !important;
 }
 
 .bg-secondary {
@@ -6168,7 +6168,7 @@ a.bg-info:hover,
 a.bg-info:focus,
 button.bg-info:hover,
 button.bg-info:focus {
-  background-color: #005573 !important;
+  background-color: #3597bb !important;
 }
 
 .bg-warning {
@@ -9506,6 +9506,7 @@ a.text-dark:focus {
   border: 5px solid transparent;
   border-image: linear-gradient(to bottom right, #b827fc 0%, #2c90fc 25%, #b8fd33 50%, #fec837 75%, #fd1892 100%);
   border-image-slice: 1;
+  border-image-outset: 2px;
 }
 .custom_home_bg {
   background: linear-gradient(45deg, #ff00004d, #fca80f3b, #ffff004a, #00800033, #0000ff29, #4b00822e, #ee82ee4a, #ff000057);
diff --git a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css
index 75f8f771d5..628182ece1 100644
--- a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css
+++ b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css
@@ -19,7 +19,7 @@
 
 .stepButton:hover {
     color: #fff;
-    background-color: #005573;
+    background-color: var(--primary);
     border-color: #005573;
 }
 .jumpButtons {
@@ -33,7 +33,7 @@
 }
 
 .jumpButtonDisabled {
-    background-color: #005573;
+    background-color: var(--grey);
     border-color: #005573;
 }
 
diff --git a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx
index 7316449a95..a63f98bb36 100644
--- a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx
@@ -53,13 +53,12 @@ export const ButtonNavigation = ({ stepOverBack, stepIntoBack, stepIntoForward,
 
   const stepBtnStyle = 'd-flex align-items-center justify-content-center btn btn-primary btn-sm stepButton h-75 m-0 p-1'
   const disableStepBtnStyle = 'stepButtonDisabled'
-  const jumpBtnStyle = 'd-flex align-items-center justify-content-center btn btn-primary btn-sm jumpButton h-75 m-0 p-1'
   const disableJumpBtnStyle = 'jumpButtonDisabled'
   const stepMarkupStructure = {
     stepOverBackJSX : {
       markup: (<div className={state.overBackDisabled ? `${stepBtnStyle} ${disableStepBtnStyle}`: `${stepBtnStyle}`} onClick={() => { stepOverBack && stepOverBack() }}>
         <button id='overback' className='btn btn-link btn-sm stepButton m-0 p-0' onClick={() => { stepOverBack && stepOverBack() }} disabled={state.overBackDisabled} style={{ pointerEvents: 'none', color: 'white' }}>
-            <span className="fas fa-reply"></span>
+          <span className="fas fa-reply"></span>
         </button>
       </div>),
       placement: 'top-start',
diff --git a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
index 0be03ba45b..d651e8e16c 100644
--- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
@@ -370,13 +370,18 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
 
   const customJSX = (
     <span className="p-0 m-0">
-              <input className="custom-control-input" id="debugGeneratedSourcesInput" onChange={({ target: { checked } }) => {
-              setState(prevState => {
-                return { ...prevState, opt: { ...prevState.opt, debugWithGeneratedSources: checked } }
-              })
-            }} type="checkbox" />
-            <label data-id="debugGeneratedSourcesLabel" className="form-check-label custom-control-label" htmlFor="debugGeneratedSourcesInput"><FormattedMessage id='debugger.useGeneratedSources' /> (Solidity {'>='} v0.7.2)</label>
-            </span>
+      <input className="custom-control-input" id="debugGeneratedSourcesInput" onChange={({ target: { checked } }) => {
+        setState(prevState => {
+          return { ...prevState, opt: { ...prevState.opt, debugWithGeneratedSources: checked } }
+        })
+      }} type="checkbox" />
+      <label
+        data-id="debugGeneratedSourcesLabel"
+        className="form-check-label custom-control-label"
+        htmlFor="debugGeneratedSourcesInput">
+          <FormattedMessage id='debugger.useGeneratedSources' />(Solidity {'>='} v0.7.2)
+      </label>
+    </span>
   )
   return (
     <div>
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index 33facb38f6..c8ec0e7a6c 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -288,7 +288,7 @@ export function ContractGUI (props: ContractGUIProps) {
             data-title={buttonOptions.title}
             disabled={(toggleUpgradeImp && !proxyAddress) || props.disabled}
           >
-            <div>{title}</div>
+            <div className='text-nowrap overflow-hidden text-truncate'>{title}</div>
           </button>
         </CustomTooltip>
         <input
diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
index d9bfd151b0..7b99f54a6b 100644
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@@ -749,10 +749,10 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
         <div className="d-flex p-2">
           <CustomTooltip
             placement={'top'}
-              tooltipClasses="text-nowrap"
-              tooltipId="info-recorder"
-              tooltipText={runButtonTitle}
-              >
+            tooltipClasses="text-nowrap"
+            tooltipId="info-recorder"
+            tooltipText={runButtonTitle}
+            >
             <button id="runTestsTabRunAction"data-id="testTabRunTestsTabRunAction" className="w-50 btn btn-primary" disabled={disableRunButton} onClick={runTests}>
               <span className="fas fa-play ml-2"></span>
               <label className="labelOnBtn btn btn-primary p-1 ml-2 m-0"><FormattedMessage id='solidityUnitTesting.run' /></label>