diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.module.css b/src/components/AddPeopleToTag/AddPeopleToTag.module.css
index 945f887655..c7c5c4582b 100644
--- a/src/components/AddPeopleToTag/AddPeopleToTag.module.css
+++ b/src/components/AddPeopleToTag/AddPeopleToTag.module.css
@@ -28,7 +28,7 @@
 }
 
 .scrollContainer {
-  max-height: 100px; /* Adjust as needed */
+  max-height: 100px;
   overflow-y: auto;
   margin-bottom: 1rem;
 }
@@ -38,16 +38,10 @@
   align-items: center;
   padding: 5px 10px;
   border-radius: 12px;
-  background-color: #f8f9fa; /* Light background */
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  max-width: calc(100% - 30px); /* Ensure it fits within the container */
+  box-shadow: 0 1px 3px var(--bs-gray-400);
+  max-width: calc(100% - 2rem);
 }
 
 .removeFilterIcon {
   cursor: pointer;
 }
-
-.scrollContainer {
-  max-height: 350px; /* Set your desired max height */
-  overflow-y: auto; /* Enable vertical scrolling */
-}
diff --git a/src/components/InfiniteScrollLoader/InfiniteScrollLoader.module.css b/src/components/InfiniteScrollLoader/InfiniteScrollLoader.module.css
index 33fe847a20..a5b609ae75 100644
--- a/src/components/InfiniteScrollLoader/InfiniteScrollLoader.module.css
+++ b/src/components/InfiniteScrollLoader/InfiniteScrollLoader.module.css
@@ -1,4 +1,3 @@
-/* InfiniteScrollLoader.module.css */
 .simpleLoader {
   display: flex;
   justify-content: center;
@@ -11,8 +10,8 @@
   width: 2rem;
   height: 2rem;
   margin: 1rem 0;
-  border: 4px solid transparent; /* Set all sides transparent */
-  border-top-color: var(--bs-gray-400); /* Color only the top border */
+  border: 4px solid transparent;
+  border-top-color: var(--bs-gray-400);
   border-radius: 50%;
   animation: spin 0.6s linear infinite;
 }
diff --git a/src/components/TagActions/TagActions.module.css b/src/components/TagActions/TagActions.module.css
index d291929137..62c5855981 100644
--- a/src/components/TagActions/TagActions.module.css
+++ b/src/components/TagActions/TagActions.module.css
@@ -1,83 +1,3 @@
-.btnsContainer {
-  display: flex;
-  margin: 2rem 0;
-}
-
-.btnsContainer .btnsBlock {
-  display: flex;
-  width: max-content;
-}
-
-.btnsContainer .btnsBlock button {
-  margin-left: 1rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.btnsContainer .input {
-  flex: 1;
-  position: relative;
-  max-width: 60%;
-  justify-content: space-between;
-}
-
-.btnsContainer input {
-  outline: 1px solid var(--bs-gray-400);
-}
-
-.btnsContainer .input button {
-  width: 52px;
-}
-
-@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%;
-  }
-}
-
 .errorContainer {
   min-height: 100vh;
 }
@@ -96,30 +16,8 @@
   margin-bottom: 1rem;
 }
 
-.tableHeader {
-  background-color: var(--bs-primary);
-  color: var(--bs-white);
-  font-size: 1rem;
-}
-
-.rowBackground {
-  background-color: var(--bs-white);
-  max-height: 120px;
-}
-
-.tagsBreadCrumbs {
-  color: var(--bs-gray);
-  cursor: pointer;
-}
-
-.tagsBreadCrumbs:hover {
-  color: var(--bs-blue);
-  font-weight: 600;
-  text-decoration: underline;
-}
-
 .scrollContainer {
-  max-height: 100px; /* Adjust as needed */
+  max-height: 100px;
   overflow-y: auto;
   margin-bottom: 1rem;
 }
@@ -129,22 +27,10 @@
   align-items: center;
   padding: 5px 10px;
   border-radius: 12px;
-  background-color: #f8f9fa; /* Light background */
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  max-width: calc(100% - 30px); /* Ensure it fits within the container */
+  box-shadow: 0 1px 3px var(--bs-gray-400);
+  max-width: calc(100% - 2rem);
 }
 
 .removeFilterIcon {
   cursor: pointer;
 }
-
-.scrContainer {
-  max-height: 300px;
-  overflow: scroll;
-  /* padding-right: 8px; */
-}
-
-.allTagsHeading {
-  color: rgb(77, 76, 76);
-  font-weight: 600;
-}
diff --git a/src/components/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
index ece511e6ec..008b25c5e2 100644
--- a/src/components/TagActions/TagActions.tsx
+++ b/src/components/TagActions/TagActions.tsx
@@ -328,7 +328,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
                   )}
                 </div>
 
-                <div className={`mt-4 mb-2 fs-5 ${styles.allTagsHeading}`}>
+                <div className="mt-4 mb-2 fs-5 fw-semibold text-dark-emphasis">
                   {t('allTags')}
                 </div>
 
@@ -339,7 +339,6 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
                     maxHeight: 300,
                     overflow: 'auto',
                   }}
-                  className={`${styles.scrContainer}`}
                 >
                   <InfiniteScroll
                     dataLength={userTagsList?.length ?? 0}
diff --git a/src/components/TagActions/TagNode.tsx b/src/components/TagActions/TagNode.tsx
index ce6193ae87..aafe8e7cbb 100644
--- a/src/components/TagActions/TagNode.tsx
+++ b/src/components/TagActions/TagNode.tsx
@@ -165,7 +165,6 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               maxHeight: 300,
               overflow: 'auto',
             }}
-            className={`${styles.scrContainer}`}
           >
             <InfiniteScroll
               dataLength={subTagsList?.length ?? 0}