diff --git a/src/screens/OrgList/OrgList.module.css b/src/screens/OrgList/OrgList.module.css
deleted file mode 100644
index 6aa245983e..0000000000
--- a/src/screens/OrgList/OrgList.module.css
+++ /dev/null
@@ -1,324 +0,0 @@
-.btnsContainer {
-  display: flex;
-  margin: 2.5rem 0 2.5rem 0;
-}
-
-.btnsContainer .btnsBlock {
-  display: flex;
-}
-
-.orgCreationBtn {
-  width: 100%;
-  border: None;
-}
-
-.enableEverythingBtn {
-  width: 100%;
-  border: None;
-}
-
-.pluginStoreBtn {
-  width: 100%;
-  background-color: white;
-  color: #555555;
-  border: 0.5px solid #555555;
-}
-
-.pluginStoreBtn:hover,
-.pluginStoreBtn:focus {
-  background-color: #dfe1e2 !important;
-  color: #555555 !important;
-  border-color: #555555 !important;
-}
-
-.line::before {
-  content: '';
-  display: inline-block;
-  width: 100px;
-  border-top: 1px solid #000;
-  margin: 0 10px;
-}
-
-.line::before {
-  left: 0;
-}
-
-.line::after {
-  right: 0;
-}
-
-.flexContainer {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-}
-
-.orText {
-  display: block;
-  position: absolute;
-  top: calc(-0.7rem + 0.5rem);
-  left: calc(50% - 2.6rem);
-  margin: 0 auto;
-  padding: 0.5rem 2rem;
-  z-index: 100;
-  background: var(--bs-white);
-  color: var(--bs-secondary);
-}
-
-.sampleOrgSection {
-  display: grid;
-  grid-template-columns: repeat(1, 1fr);
-  row-gap: 1em;
-}
-
-.sampleOrgCreationBtn {
-  width: 100%;
-  background-color: transparent;
-  color: #707070;
-  border-color: #707070;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.sampleHover:hover {
-  border-color: grey;
-  color: grey;
-}
-
-.sampleOrgSection {
-  font-family: Arial, Helvetica, sans-serif;
-  width: 100%;
-  display: grid;
-  grid-auto-columns: repeat(1, 1fr);
-  justify-content: center;
-  flex-direction: column;
-  align-items: center;
-}
-
-.sampleModalTitle {
-  background-color: green;
-}
-
-.btnsContainer .btnsBlock button {
-  margin-left: 1rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.btnsContainer .input {
-  flex: 1;
-  position: relative;
-}
-
-.btnsContainer input {
-  outline: 1px solid var(--bs-gray-400);
-}
-
-.btnsContainer .input button {
-  width: 52px;
-}
-
-.listBox {
-  display: flex;
-  flex-wrap: wrap;
-  overflow: unset !important;
-}
-
-.listBox .itemCard {
-  width: 50%;
-}
-
-.notFound {
-  flex: 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-}
-
-@media (max-width: 1440px) {
-  .contract {
-    padding-left: calc(250px + 2rem + 1.5rem);
-  }
-
-  .listBox .itemCard {
-    width: 100%;
-  }
-}
-
-@media (max-width: 1020px) {
-  .btnsContainer {
-    flex-direction: column;
-    margin: 1.5rem 0;
-  }
-
-  .btnsContainer .btnsBlock {
-    margin: 1.5rem 0 0 0;
-    justify-content: space-between;
-  }
-
-  .btnsContainer .btnsBlock button {
-    margin: 0;
-  }
-
-  .btnsContainer .btnsBlock div button {
-    margin-right: 1.5rem;
-  }
-}
-
-/* For mobile devices  */
-
-@media (max-width: 520px) {
-  .btnsContainer {
-    margin-bottom: 0;
-  }
-
-  .btnsContainer .btnsBlock {
-    display: block;
-    margin-top: 1rem;
-    margin-right: 0;
-  }
-
-  .btnsContainer .btnsBlock div {
-    flex: 1;
-  }
-
-  .btnsContainer .btnsBlock div[title='Sort organizations'] {
-    margin-right: 0.5rem;
-  }
-
-  .btnsContainer .btnsBlock button {
-    margin-bottom: 1rem;
-    margin-right: 0;
-    width: 100%;
-  }
-}
-
-/* Loading OrgList CSS */
-.itemCard .loadingWrapper {
-  background-color: var(--bs-white);
-  margin: 0.5rem;
-  height: calc(120px + 2rem);
-  padding: 1rem;
-  border-radius: 8px;
-  outline: 1px solid var(--bs-gray-200);
-  position: relative;
-}
-
-.itemCard .loadingWrapper .innerContainer {
-  display: flex;
-}
-
-.itemCard .loadingWrapper .innerContainer .orgImgContainer {
-  width: 120px;
-  height: 120px;
-  border-radius: 4px;
-}
-
-.itemCard .loadingWrapper .innerContainer .content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  margin-left: 1rem;
-}
-
-.titlemodaldialog {
-  color: #707070;
-  font-size: 20px;
-  margin-bottom: 20px;
-  padding-bottom: 5px;
-}
-
-form label {
-  font-weight: bold;
-  padding-bottom: 1px;
-  font-size: 14px;
-  color: #707070;
-}
-
-form > input {
-  display: block;
-  margin-bottom: 20px;
-  border: 1px solid #e8e5e5;
-  box-shadow: 2px 1px #e8e5e5;
-  padding: 10px 20px;
-  border-radius: 5px;
-  background: none;
-  width: 100%;
-  transition: all 0.3s ease-in-out;
-  -webkit-transition: all 0.3s ease-in-out;
-  -moz-transition: all 0.3s ease-in-out;
-  -ms-transition: all 0.3s ease-in-out;
-  -o-transition: all 0.3s ease-in-out;
-}
-
-.itemCard .loadingWrapper .innerContainer .content h5 {
-  height: 24px;
-  width: 60%;
-  margin-bottom: 0.8rem;
-}
-
-.modalbody {
-  width: 50px;
-}
-
-.pluginStoreBtnContainer {
-  display: flex;
-  gap: 1rem;
-}
-
-.itemCard .loadingWrapper .innerContainer .content h6[title='Location'] {
-  display: block;
-  width: 45%;
-  height: 18px;
-}
-
-.itemCard .loadingWrapper .innerContainer .content h6 {
-  display: block;
-  width: 30%;
-  height: 16px;
-  margin-bottom: 0.8rem;
-}
-
-.itemCard .loadingWrapper .button {
-  position: absolute;
-  height: 48px;
-  width: 92px;
-  bottom: 1rem;
-  right: 1rem;
-  z-index: 1;
-}
-
-@media (max-width: 450px) {
-  .itemCard .loadingWrapper {
-    height: unset;
-    margin: 0.5rem 0;
-    padding: 1.25rem 1.5rem;
-  }
-
-  .itemCard .loadingWrapper .innerContainer {
-    flex-direction: column;
-  }
-
-  .itemCard .loadingWrapper .innerContainer .orgImgContainer {
-    height: 200px;
-    width: 100%;
-    margin-bottom: 0.8rem;
-  }
-
-  .itemCard .loadingWrapper .innerContainer .content {
-    margin-left: 0;
-  }
-
-  .itemCard .loadingWrapper .button {
-    bottom: 0;
-    right: 0;
-    border-radius: 0.5rem;
-    position: relative;
-    margin-left: auto;
-    display: block;
-  }
-}
diff --git a/src/screens/OrgList/OrgList.tsx b/src/screens/OrgList/OrgList.tsx
index baafb17ffd..37a4276982 100644
--- a/src/screens/OrgList/OrgList.tsx
+++ b/src/screens/OrgList/OrgList.tsx
@@ -27,6 +27,7 @@ import type {
   InterfaceUserType,
 } from 'utils/interfaces';
 import useLocalStorage from 'utils/useLocalstorage';
+// import styles from '../../style/app.module.css';
 import styles from '../../style/app.module.css';
 import OrganizationModal from './OrganizationModal';
 
@@ -38,7 +39,6 @@ function orgList(): JSX.Element {
 
   function openDialogModal(redirectOrgId: string): void {
     setDialogRedirectOrgId(redirectOrgId);
-    // console.log(redirectOrgId, dialogRedirectOrgId);
     setdialogModalIsOpen(true);
   }
 
@@ -330,7 +330,7 @@ function orgList(): JSX.Element {
   return (
     <>
       {/* Buttons Container */}
-      <div className={styles.btnsContainer}>
+      <div className={styles.btnsContainerOrgList}>
         <div className={styles.input}>
           <Form.Control
             type="name"
@@ -344,14 +344,15 @@ function orgList(): JSX.Element {
           />
           <Button
             tabIndex={-1}
-            className={styles.search}
+            // className={`position-absolute z-10 bottom-0 end-0 h-100 d-flex justify-content-center align-items-center`}
+            className={styles.searchButtonOrgList}
             onClick={handleSearchByBtnClick}
             data-testid="searchBtn"
           >
             <Search />
           </Button>
         </div>
-        <div className={styles.btnsBlock}>
+        <div className={styles.btnsBlockOrgList}>
           <div className="d-flex">
             <Dropdown
               aria-expanded="false"
@@ -359,7 +360,7 @@ function orgList(): JSX.Element {
               data-testid="sort"
             >
               <Dropdown.Toggle
-                className={styles.dropdown}
+                // className={styles.dropdown}
                 variant={
                   sortingState.option === '' ? 'outline-success' : 'success'
                 }
@@ -422,7 +423,7 @@ function orgList(): JSX.Element {
             loader={
               <>
                 {[...Array(perPageResult)].map((_, index) => (
-                  <div key={index} className={styles.itemCard}>
+                  <div key={index} className={styles.itemCardOrgList}>
                     <div className={styles.loadingWrapper}>
                       <div className={styles.innerContainer}>
                         <div
@@ -442,7 +443,7 @@ function orgList(): JSX.Element {
               </>
             }
             hasMore={hasMore}
-            className={styles.listBox}
+            className={styles.listBoxOrgList}
             data-testid="organizations-list"
             endMessage={
               <div className={'w-100 text-center my-4'}>
@@ -454,7 +455,7 @@ function orgList(): JSX.Element {
               ? orgsData?.organizationsConnection.map(
                   (item: InterfaceOrgConnectionInfoType) => {
                     return (
-                      <div key={item._id} className={styles.itemCard}>
+                      <div key={item._id} className={styles.itemCardOrgList}>
                         <OrgListCard data={item} />
                       </div>
                     );
@@ -466,7 +467,7 @@ function orgList(): JSX.Element {
                   (item: InterfaceOrgConnectionInfoType) => {
                     if (isAdminForCurrentOrg(item)) {
                       return (
-                        <div key={item._id} className={styles.itemCard}>
+                        <div key={item._id} className={styles.itemCardOrgList}>
                           <OrgListCard data={item} />
                         </div>
                       );
@@ -477,7 +478,7 @@ function orgList(): JSX.Element {
           {isLoading && (
             <>
               {[...Array(perPageResult)].map((_, index) => (
-                <div key={index} className={styles.itemCard}>
+                <div key={index} className={styles.itemCardOrgList}>
                   <div className={styles.loadingWrapper}>
                     <div className={styles.innerContainer}>
                       <div
@@ -526,7 +527,7 @@ function orgList(): JSX.Element {
       {/* Plugin Notification Modal after Org is Created */}
       <Modal show={dialogModalisOpen} onHide={toggleDialogModal}>
         <Modal.Header
-          className={styles.createButton}
+          className={`bg-primary`}
           closeButton
           data-testid="pluginNotificationHeader"
         >
@@ -543,7 +544,7 @@ function orgList(): JSX.Element {
 
               <div className={styles.pluginStoreBtnContainer}>
                 <Link
-                  className={`btn  ${styles.pluginStoreBtn}`}
+                  className={`btn  btn-primary ${styles.pluginStoreBtn}`}
                   data-testid="goToStore"
                   to={`orgstore/id=${dialogRedirectOrgId}`}
                 >
diff --git a/src/screens/OrgList/OrganizationModal.tsx b/src/screens/OrgList/OrganizationModal.tsx
index 8a44d2b851..fb3589d1e5 100644
--- a/src/screens/OrgList/OrganizationModal.tsx
+++ b/src/screens/OrgList/OrganizationModal.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Modal, Form, Row, Col, Button } from 'react-bootstrap';
 import convertToBase64 from 'utils/convertToBase64';
 import type { ChangeEvent } from 'react';
-import styles from './OrgList.module.css';
+import styles from '../../style/app.module.css';
 import type { InterfaceAddress } from 'utils/interfaces';
 import { countryOptions } from 'utils/formEnumFields';
 import useLocalStorage from 'utils/useLocalstorage';
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 1903c7b323..4acd2c72be 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -1279,3 +1279,316 @@ input[type='radio']:checked + label {
   max-height: 220px;
   overflow-y: auto;
 }
+
+/* * Refortoring css for OrgList */
+
+.btnsContainerOrgList {
+  display: flex;
+  margin: 2.5rem 0 2.5rem 0;
+}
+
+.btnsContainerOrgList .btnsBlockOrgList {
+  display: flex;
+}
+
+.orgCreationBtn {
+  width: 100%;
+  border: None;
+}
+
+.enableEverythingBtn {
+  width: 100%;
+  border: None;
+}
+
+.pluginStoreBtn {
+  width: 100%;
+  background-color: white;
+  color: var(--brown-color);
+  border: 0.5px solid var(--brown-color);
+}
+.searchButtonOrgList {
+  position: absolute;
+  z-index: 10;
+  bottom: 0;
+  inset-inline-end: 0px;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.pluginStoreBtn:hover,
+.pluginStoreBtn:focus {
+  background-color: var(--dropdown-hover-color) !important;
+  color: var(--brown-color) !important;
+  border-color: var(--brown-color) !important;
+}
+
+.flexContainer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+}
+
+.orText {
+  display: block;
+  position: absolute;
+  top: -0.2rem;
+  left: calc(50% - 2.6rem);
+  margin: 0 auto;
+  padding: 0.5rem 2rem;
+  z-index: 100;
+  background: var(--bs-white);
+  color: var(--bs-secondary);
+}
+
+.sampleOrgSection {
+  display: grid;
+  grid-template-columns: repeat(1, 1fr);
+  row-gap: 1em;
+  width: 100%;
+}
+
+.sampleOrgCreationBtn {
+  width: 100%;
+  background-color: transparent;
+  color: #707070;
+  border-color: #707070;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.sampleHover:hover {
+  border-color: grey;
+  color: grey;
+}
+
+.sampleModalTitle {
+  background-color: var(--bs-primary);
+}
+
+.btnsContainerOrgList .btnsBlockOrgList button {
+  margin-left: 1rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.btnsContainerOrgList .inputOrgList {
+  flex: 1;
+  position: relative;
+}
+
+.btnsContainerOrgList input {
+  outline: 1px solid var(--bs-gray-400);
+}
+
+.btnsContainerOrgList .inputOrgList button {
+  width: 52px;
+}
+
+.listBoxOrgList {
+  display: flex;
+  flex-wrap: wrap;
+  overflow: unset !important;
+}
+
+.listBoxOrgList .itemCardOrgList {
+  width: 50%;
+}
+
+.notFound {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+
+@media (max-width: 1440px) {
+  .contractOrgList {
+    padding-left: calc(250px + 2rem + 1.5rem);
+  }
+
+  .listBoxOrgList .itemCardOrgList {
+    width: 100%;
+  }
+}
+
+@media (max-width: 1020px) {
+  .btnsContainerOrgList {
+    flex-direction: column;
+    margin: 1.5rem 0;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList {
+    margin: 1.5rem 0 0 0;
+    justify-content: space-between;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList button {
+    margin: 0;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList div button {
+    margin-right: 1.5rem;
+  }
+}
+
+/* For mobile devices  */
+
+@media (max-width: 520px) {
+  .btnsContainerOrgList {
+    margin-bottom: 0;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList {
+    display: block;
+    margin-top: 1rem;
+    margin-right: 0;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList div {
+    flex: 1;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList div[title='Sort organizations'] {
+    margin-right: 0.5rem;
+  }
+
+  .btnsContainerOrgList .btnsBlockOrgList button {
+    margin-bottom: 1rem;
+    margin-right: 0;
+    width: 100%;
+  }
+}
+
+/* Loading OrgList CSS */
+
+.itemCardOrgList .loadingWrapper {
+  background-color: var(--bs-white);
+  margin: 0.5rem;
+  height: calc(120px + 2rem);
+  padding: 1rem;
+  border-radius: 8px;
+  outline: 1px solid var(--bs-gray-200);
+  position: relative;
+}
+
+.itemCardOrgList .loadingWrapper .innerContainer {
+  display: flex;
+}
+
+.itemCardOrgList .loadingWrapper .innerContainer .orgImgContainer {
+  width: 120px;
+  height: 120px;
+  border-radius: 4px;
+}
+
+.itemCardOrgList .loadingWrapper .innerContainer .content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  margin-left: 1rem;
+}
+
+.titlemodaldialog {
+  color: #707070;
+  font-size: 20px;
+  margin-bottom: 20px;
+  padding-bottom: 5px;
+}
+
+form label {
+  font-weight: bold;
+  padding-bottom: 1px;
+  font-size: 14px;
+  color: #707070;
+}
+
+form > input {
+  display: block;
+  margin-bottom: 20px;
+  border: 1px solid #e8e5e5;
+  box-shadow: 2px 1px #e8e5e5;
+  padding: 10px 20px;
+  border-radius: 5px;
+  background: none;
+  width: 100%;
+  transition: all 0.3s ease-in-out;
+  -webkit-transition: all 0.3s ease-in-out;
+  -moz-transition: all 0.3s ease-in-out;
+  -ms-transition: all 0.3s ease-in-out;
+  -o-transition: all 0.3s ease-in-out;
+}
+
+.itemCardOrgList .loadingWrapper .innerContainer .content h5 {
+  height: 24px;
+  width: 60%;
+  margin-bottom: 0.8rem;
+}
+
+.modalbody {
+  width: 50px;
+}
+
+.pluginStoreBtnContainer {
+  display: flex;
+  gap: 1rem;
+}
+
+.itemCardOrgList .loadingWrapper .innerContainer .content h6[title='Location'] {
+  display: block;
+  width: 45%;
+  height: 18px;
+}
+
+.itemCardOrgList .loadingWrapper .innerContainer .content h6 {
+  display: block;
+  width: 30%;
+  height: 16px;
+  margin-bottom: 0.8rem;
+}
+
+.itemCardOrgList .loadingWrapper .button {
+  position: absolute;
+  height: 48px;
+  width: 92px;
+  bottom: 1rem;
+  right: 1rem;
+  z-index: 1;
+}
+
+@media (max-width: 450px) {
+  .itemCardOrgList .loadingWrapper {
+    height: unset;
+    margin: 0.5rem 0;
+    padding: 1.25rem 1.5rem;
+  }
+
+  .itemCardOrgList .loadingWrapper .innerContainer {
+    flex-direction: column;
+  }
+
+  .itemCardOrgList .loadingWrapper .innerContainer .orgImgContainer {
+    height: 200px;
+    width: 100%;
+    margin-bottom: 0.8rem;
+  }
+
+  .itemCardOrgList .loadingWrapper .innerContainer .content {
+    margin-left: 0;
+  }
+
+  .itemCardOrgList .loadingWrapper .button {
+    bottom: 0;
+    right: 0;
+    border-radius: 0.5rem;
+    position: relative;
+    margin-left: auto;
+    display: block;
+  }
+}