diff --git a/libs/remix-ui/settings/src/lib/github-settings.tsx b/libs/remix-ui/settings/src/lib/github-settings.tsx
index e7c9c3f2ce..243598d6ec 100644
--- a/libs/remix-ui/settings/src/lib/github-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/github-settings.tsx
@@ -51,7 +51,7 @@ export function GithubSettings (props: GithubSettingsProps) {
         <p className="">Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only \'create gist\' permission.</p>
         <p className="mb-1"><a className="text-primary" target="_blank" href="https://github.com/settings/tokens">https://github.com/settings/tokens</a></p>
         <div>
-          <label>TOKEN:</label>
+          <label className="mb-0 pb-0">TOKEN:</label>
           <div className="input-group text-secondary mb-0 h6">
             <input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleChangeTokenState(e)} value={ githubToken } />
             <div className="input-group-append">
@@ -60,13 +60,13 @@ export function GithubSettings (props: GithubSettingsProps) {
           </div>
         </div>
         <div>
-          <label>USERNAME:</label>
+          <label className="pt-2 mb-0 pb-0">USERNAME:</label>
           <div className="text-secondary mb-0 h6">
             <input id="githubusername" data-id="settingsTabGithubUsername" type="text" className="form-control" onChange={(e) => handleChangeUserNameState(e)} value={ githubUserName } />
           </div>
         </div>
         <div>
-          <label>EMAIL:</label>
+          <label className="pt-2 mb-0 pb-0">EMAIL:</label>
           <div className="text-secondary mb-0 h6">
             <input id="githubemail" data-id="settingsTabGithubEmail" type="text" className="form-control" onChange={(e) => handleChangeEmailState(e)} value={ githubEmail } />
             <div className="d-flex justify-content-end pt-2">
diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
index 19655dd281..912da468f3 100644
--- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
@@ -248,12 +248,12 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     <div className="border-top">
       <div className="card-body pt-3 pb-2">
         <h6 className="card-title">{ swarmSettingsTitle }</h6>
-        <div className="pt-2 mb-1"><label>PRIVATE BEE ADDRESS:</label>
+        <div className="pt-2 pt-2 mb-0 pb-0"><label>PRIVATE BEE ADDRESS:</label>
           <div className="text-secondary mb-0 h6">
             <input id="swarmprivatebeeaddress" data-id="settingsPrivateBeeAddress" className="form-control" onChange={handleSavePrivateBeeAddress} value={ privateBeeAddress } />
           </div>
         </div>
-        <div className=""><label>POSTAGE STAMP ID:</label>
+        <div className="pt-2 mb-0 pb-0"><label>POSTAGE STAMP ID:</label>
           <div className="text-secondary mb-0 h6">
             <input id="swarmpostagestamp" data-id="settingsPostageStampId" className="form-control" onChange={handleSavePostageStampId} value={ postageStampId } />
             <div className="d-flex justify-content-end pt-2">
@@ -312,27 +312,27 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     <div className="border-top">
     <div className="card-body pt-3 pb-2">
       <h6 className="card-title">{ ipfsSettingsText }</h6>
-      <div className="pt-2 mb-1"><label>IPFS HOST:</label>
+      <div className="pt-2 mb-0"><label>IPFS HOST:</label>
         <div className="text-secondary mb-0 h6">
           <input placeholder='e.g. ipfs.infura.io' id="settingsIpfsUrl" data-id="settingsIpfsUrl" className="form-control" onChange={handleSaveIpfsUrl} value={ ipfsUrl } />
         </div>
       </div>
-      <div className=""><label>IPFS PROTOCOL:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PROTOCOL:</label>
         <div className="text-secondary mb-0 h6">
           <input placeholder='e.g. https' id="settingsIpfsProtocol" data-id="settingsIpfsProtocol" className="form-control" onChange={handleSaveIpfsProtocol} value={ ipfsProtocol } />
         </div>
       </div>
-      <div className=""><label>IPFS PORT:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PORT:</label>
         <div className="text-secondary mb-0 h6">
           <input placeholder='e.g. 5001' id="settingsIpfsPort" data-id="settingsIpfsPort" className="form-control" onChange={handleSaveIpfsPort} value={ ipfsPort } />
         </div>
       </div>
-      <div className=""><label>IPFS PROJECT ID [ INFURA ]:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PROJECT ID [ INFURA ]:</label>
         <div className="text-secondary mb-0 h6">
           <input id="settingsIpfsProjectId" data-id="settingsIpfsProjectId" className="form-control" onChange={handleSaveIpfsProjectId} value={ ipfsProjectId } />
         </div>
       </div>
-      <div className=""><label>IPFS PROJECT SECRET [ INFURA ]:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PROJECT SECRET [ INFURA ]:</label>
         <div className="text-secondary mb-0 h6">
           <input id="settingsIpfsProjectSecret" data-id="settingsIpfsProjectSecret" className="form-control" type="password" onChange={handleSaveIpfsSecret} value={ ipfsProjectSecret } />
         </div>