diff --git a/src/components/BMDashboard/WeeklyProjectSummary/Financials/CostVarianceTrendGraph.module.css b/src/components/BMDashboard/WeeklyProjectSummary/Financials/CostVarianceTrendGraph.module.css
index d7f4d28260..71549877bb 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/Financials/CostVarianceTrendGraph.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/Financials/CostVarianceTrendGraph.module.css
@@ -35,7 +35,7 @@
   width: 100%;
 }
 
-@media (max-width: 900px) {
+@media (width <= 900px) {
   .filtersGrid {
     grid-template-columns: 1fr; 
   }
@@ -91,9 +91,9 @@
 }
 
 .darkDateInput {
-  background-color: #253342;
-  color: #fff;
-  border-color: #2d4059;
+  background-color: #253342 !important;
+  color: #fff !important;
+  border-color: #2d4059 !important;
   color-scheme: dark;
 }
 
@@ -174,7 +174,7 @@
 }
 
 .varianceOverLight { color: #e74c3c !important; }
-.varianceOverDark { color: #ff4444 !important; }
+.varianceOverDark { color: #f44 !important; }
 
 .varianceUnderLight { color: #2ecc71 !important; }
 .varianceUnderDark { color: #4ade80 !important; }
\ No newline at end of file
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx b/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx
index 6424d238e1..e8fc468a91 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx
+++ b/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx
@@ -13,6 +13,7 @@ import Select from 'react-select';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import styles from './InjuryCategoryBarChart.module.css';
+import { buildChartSelectStyles } from '../sharedSelectStyles';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   fetchInjuryData,
@@ -48,7 +49,6 @@ function InjuryCategoryBarChart() {
   const [startDate, setStartDate] = useState(null);
   const [endDate, setEndDate] = useState(null);
 
-  // ✅ NEW: key to force Recharts remount when needed (fixes "renders only on hover")
   const [chartKey, setChartKey] = useState(0);
 
   useEffect(() => {
@@ -168,35 +168,7 @@ function InjuryCategoryBarChart() {
     endDate,
   ]);
 
-  const selectStyles = darkMode && {
-    control: base => ({
-      ...base,
-      backgroundColor: '#2b3e59',
-      color: 'white',
-    }),
-    menu: base => ({
-      ...base,
-      backgroundColor: '#2b3e59',
-      color: 'white',
-    }),
-    option: (base, state) => ({
-      ...base,
-      color: 'white',
-      backgroundColor: state.isSelected
-        ? 'rgba(255, 255, 255, 0.15)'
-        : state.isFocused
-        ? 'rgba(255, 255, 255, 0.1)'
-        : 'transparent',
-      '&:active': {
-        backgroundColor: 'rgba(255, 255, 255, 0.2)',
-      },
-    }),
-    singleValue: base => ({
-      ...base,
-      color: 'white',
-    }),
-  };
-  // : {};
+  const selectStyles = buildChartSelectStyles(darkMode);
 
   return (
     <div className={`injury-chart-container ${darkMode && 'darkMode'}`}>
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/IssuesBreakdownChart.jsx b/src/components/BMDashboard/WeeklyProjectSummary/IssuesBreakdownChart.jsx
index 336e038c03..e41514ea0d 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/IssuesBreakdownChart.jsx
+++ b/src/components/BMDashboard/WeeklyProjectSummary/IssuesBreakdownChart.jsx
@@ -572,6 +572,7 @@ export default function IssuesBreakdownChart() {
               <XAxis dataKey="projectName" tick={{ fill: textColor }} />
               <YAxis allowDecimals={false} tick={{ fill: textColor }} />
               <Tooltip
+                cursor={{ fill: darkMode ? 'rgba(255, 255, 255, 0.05)' : 'rgba(0, 0, 0, 0.05)' }}
                 contentStyle={{
                   backgroundColor: tooltipBg,
                   border: `1px solid ${tooltipBorderColor}`,
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/PaidLaborCost/PaidLaborCost.module.css b/src/components/BMDashboard/WeeklyProjectSummary/PaidLaborCost/PaidLaborCost.module.css
index 7eef6002f6..d4737f668c 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/PaidLaborCost/PaidLaborCost.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/PaidLaborCost/PaidLaborCost.module.css
@@ -156,9 +156,9 @@
 }
 
 .darkDateInput {
-  background-color: #253342;
-  color: #fff;
-  border-color: #2d4059;
+  background-color: #253342 !important;
+  color: #fff !important;
+  border-color: #2d4059 !important;
   color-scheme: dark;
 }
 
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css b/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css
index a5b12eda57..549fcda88c 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/ProjectRiskProfileOverview.module.css
@@ -304,6 +304,19 @@
   background: #2b2b2b;
 }
 
+.table tbody tr:hover {
+  background-color: #e8f0fe;
+}
+
+.darkMode .table tbody tr:hover {
+  background-color: #3a506b;
+}
+
+.darkMode .table tbody tr:hover .td,
+.darkMode .table tbody tr:hover .tdProject {
+  color: #fff !important;
+}
+
 .th {
   padding: 12px;
   text-align: left;
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.jsx b/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.jsx
index a402f0ab64..f5e87d0523 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.jsx
+++ b/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.jsx
@@ -22,6 +22,8 @@ import { Info, Repeat } from 'lucide-react';
 import { v4 as uuidv4 } from 'uuid';
 import { fetchBMProjects } from '../../../../actions/bmdashboard/projectActions';
 import styles from './QuantityOfMaterialsUsed.module.css';
+import PropTypes from 'prop-types';
+import { data } from 'jquery';
 
 ChartJS.register(
   BarElement,
@@ -793,7 +795,9 @@ function QuantityOfMaterialsUsed({ data }) {
             maxDate={new Date()}
             dateFormat="MM/dd/yy - MM/dd/yy"
             placeholderText="Select Date Range one"
-            className={`${styles.quantityOfMaterialUsedCustomDatePicker}`}
+            className={`${styles.quantityOfMaterialUsedCustomDatePicker}${
+              darkMode ? ` ${styles.quantityOfMaterialUsedCustomDatePickerDark}` : ''
+            }`}
             disabledKeyboardNavigation
             calendarStartDay={1}
             shouldCloseOnSelect={false}
@@ -838,7 +842,9 @@ function QuantityOfMaterialsUsed({ data }) {
             maxDate={new Date()}
             dateFormat="MM/dd/yy - MM/dd/yy"
             placeholderText="Select Date Range two"
-            className={`${styles.quantityOfMaterialUsedCustomDatePicker}`}
+            className={`${styles.quantityOfMaterialUsedCustomDatePicker}${
+              darkMode ? ` ${styles.quantityOfMaterialUsedCustomDatePickerDark}` : ''
+            }`}
             disabledKeyboardNavigation
             calendarStartDay={1}
             shouldCloseOnSelect={false}
@@ -1053,4 +1059,8 @@ function QuantityOfMaterialsUsed({ data }) {
   );
 }
 
+QuantityOfMaterialsUsed.propTypes = {
+  data: PropTypes.array.isRequired,
+};
+
 export default QuantityOfMaterialsUsed;
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.module.css b/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.module.css
index d21e485b10..1b54f0e97e 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/QuantityOfMaterialsUsed/QuantityOfMaterialsUsed.module.css
@@ -211,11 +211,15 @@ div.weeklyProjectSummaryCard.normalCard .dropdownItem {
   border-radius: 4px;
   text-align: center;
   padding: 2px 6px;
-  background-color: var(--card-bg);
-  color: var(--text-color);
+  background-color: var(--card-bg) !important;
+  color: var(--text-color) !important;
   transition: border-color 0.3s ease-in-out, box-shadow 0.3s ease-in-out;
 }
 
+.quantityOfMaterialUsedCustomDatePickerDark {
+  color-scheme: dark;
+}
+
 .quantityOfMaterialsUsedCard .customSelect_singleValue {
   color: var(--text-color) !important;
 }
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.jsx b/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.jsx
index 31d4bb673f..85a23c7bf1 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.jsx
+++ b/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.jsx
@@ -11,9 +11,10 @@ import {
   Label,
 } from 'recharts';
 import { useDispatch, useSelector } from 'react-redux';
-import { Input } from 'reactstrap';
+import Select from 'react-select';
 import { fetchSupplierProjects, fetchSupplierPerformance } from '../../../actions/summaryDashboard';
 import styles from './SupplierPerformanceGraph.module.css';
+import { buildChartSelectStyles } from './sharedSelectStyles';
 
 const getDateRangeOptions = () => {
   const today = new Date();
@@ -72,12 +73,13 @@ const SupplierPerformanceDashboard = function({ height = 420, onDataLoaded }) {
   const chartTheme = {
     textColor: darkMode ? '#e0e0e0' : '#333',
     axisColor: darkMode ? '#a0a0a0' : '#666',
-    // UPDATE: Set a lighter grey for dark mode so grid lines are clearly visible
     gridColor: darkMode ? '#9CA3AF' : '#E2E8F0',
     barColor: '#4CAF50',
     labelFill: darkMode ? '#ffffff' : '#333',
   };
 
+  const selectStyles = buildChartSelectStyles(darkMode);
+
   useEffect(() => {
     const loadProjects = async () => {
       try {
@@ -124,6 +126,18 @@ const SupplierPerformanceDashboard = function({ height = 420, onDataLoaded }) {
     fetchData();
   }, [dispatch, selectedDateRange, selectedProject, onDataLoaded]);
 
+  // Build react-select options
+  const dateOptions = getDateRangeOptions().map(opt => ({ value: opt.value, label: opt.label }));
+  const selectedDateOption =
+    dateOptions.find(opt => opt.value === selectedDateRange) || dateOptions[0];
+
+  const projectOptions = [
+    { value: 'all', label: 'ALL Projects' },
+    ...projects.map(p => ({ value: p._id, label: p._id })),
+  ];
+  const selectedProjectOption =
+    projectOptions.find(opt => opt.value === selectedProject) || projectOptions[0];
+
   return (
     <div
       className={`${styles['supplier-performance-card']} ${
@@ -137,38 +151,37 @@ const SupplierPerformanceDashboard = function({ height = 420, onDataLoaded }) {
       {/* Filters Row */}
       <div className={styles['supplier-performance-filters']}>
         <div className={styles['supplier-performance-filter-group']}>
-          <label htmlFor="supplier-date-select">Dates</label>
-          <Input
-            id="supplier-date-select"
-            type="select"
-            value={selectedDateRange}
-            onChange={e => setSelectedDateRange(e.target.value)}
-            className={styles['supplier-performance-select']}
-          >
-            {getDateRangeOptions().map(option => (
-              <option key={option.value} value={option.value}>
-                {option.label}
-              </option>
-            ))}
-          </Input>
+          <span className={styles['supplier-performance-label']} id="supplier-date-label">
+            Dates
+          </span>
+          <Select
+            inputId="supplier-date-select"
+            aria-labelledby="supplier-date-label"
+            options={dateOptions}
+            value={selectedDateOption}
+            onChange={opt => setSelectedDateRange(opt.value)}
+            styles={selectStyles}
+            isSearchable={false}
+            menuPortalTarget={typeof document === 'undefined' ? null : document.body}
+            menuPosition="fixed"
+          />
         </div>
 
         <div className={styles['supplier-performance-filter-group']}>
-          <label htmlFor="supplier-project-select">Project</label>
-          <Input
-            id="supplier-project-select"
-            type="select"
-            value={selectedProject}
-            onChange={e => setSelectedProject(e.target.value)}
-            className={styles['supplier-performance-select']}
-          >
-            <option value="all">ALL Projects</option>
-            {projects.map(project => (
-              <option key={project._id} value={project._id}>
-                {project._id}
-              </option>
-            ))}
-          </Input>
+          <span className={styles['supplier-performance-label']} id="supplier-project-label">
+            Project
+          </span>
+          <Select
+            inputId="supplier-project-select"
+            aria-labelledby="supplier-project-label"
+            options={projectOptions}
+            value={selectedProjectOption}
+            onChange={opt => setSelectedProject(opt.value)}
+            styles={selectStyles}
+            isSearchable={false}
+            menuPortalTarget={typeof document === 'undefined' ? null : document.body}
+            menuPosition="fixed"
+          />
         </div>
       </div>
 
@@ -178,16 +191,15 @@ const SupplierPerformanceDashboard = function({ height = 420, onDataLoaded }) {
 
         {error && <div className={styles['supplier-performance-error']}>{error}</div>}
 
-        {!loading && !error && supplierData.length === 0 && (
+        {loading === false && error === null && supplierData.length === 0 && (
           <div className={styles['supplier-performance-empty']}>
             No supplier performance data available.
           </div>
         )}
 
-        {!loading && !error && supplierData.length > 0 && (
+        {loading === false && error === null && supplierData.length > 0 && (
           <ResponsiveContainer width="100%" height={height}>
             <BarChart data={supplierData} margin={{ top: 20, right: 30, left: 20, bottom: 20 }}>
-              {/* Added grid lines: Dotted (3 3) and custom theme color */}
               <CartesianGrid strokeDasharray="3 3" stroke={chartTheme.gridColor} opacity={0.5} />
 
               <XAxis
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.module.css b/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.module.css
index 1c7dc5e66f..39fd0b49d9 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/SupplierPerformanceGraph.module.css
@@ -178,6 +178,29 @@
 .supplier-performance-error {
   color: #f44336;
 }
+/* Label span styling for react-select labels */
+.supplier-performance-label {
+  display: block;
+  font-size: 12px;
+  font-weight: 500;
+  margin-bottom: 4px;
+  color: var(--label-color, #555);
+}
+
+.supplier-performance-dark-mode .supplier-performance-label {
+  color: #e0e0e0;
+}/* Label span styling for react-select labels */
+.supplier-performance-label {
+  display: block;
+  font-size: 12px;
+  font-weight: 500;
+  margin-bottom: 4px;
+  color: var(--label-color, #555);
+}
+
+.supplier-performance-dark-mode .supplier-performance-label {
+  color: #e0e0e0;
+}
 
 @media (width <= 768px) {
   .supplier-performance-filters {
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/ToolStatusDonutChart/ToolStatusDonutChart.jsx b/src/components/BMDashboard/WeeklyProjectSummary/ToolStatusDonutChart/ToolStatusDonutChart.jsx
index 4a595f35a9..d8647dee43 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/ToolStatusDonutChart/ToolStatusDonutChart.jsx
+++ b/src/components/BMDashboard/WeeklyProjectSummary/ToolStatusDonutChart/ToolStatusDonutChart.jsx
@@ -89,8 +89,6 @@ const CustomTooltip = ({
 
   const data = payload[0];
   const percentage = total > 0 ? ((data.value / total) * 100).toFixed(1) : '0.0';
-  const textColor = darkMode ? '#e0e0e0' : '#333';
-  const subTextColor = darkMode ? '#c5d0dd' : '#666';
 
   return (
     <div style={getTooltipContainerStyle(darkMode)}>
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css b/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css
index 58eba45785..40e8166e6f 100644
--- a/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css
+++ b/src/components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary.module.css
@@ -17,7 +17,6 @@
   width: 95%;
   margin: auto;
   padding: 20px;
-  background: var(--bg-color);
   color: var(--text-color);
 }
 
diff --git a/src/components/BMDashboard/WeeklyProjectSummary/sharedSelectStyles.js b/src/components/BMDashboard/WeeklyProjectSummary/sharedSelectStyles.js
new file mode 100644
index 0000000000..9c2076298b
--- /dev/null
+++ b/src/components/BMDashboard/WeeklyProjectSummary/sharedSelectStyles.js
@@ -0,0 +1,78 @@
+/**
+ * Shared react-select styles for BMDashboard charts.
+ * Single source of truth for dropdown theming so dark mode stays consistent
+ * across ExpenseBarChart, FinancialStatButtons, SupplierPerformanceGraph,
+ * InjuryCategoryBarChart and others.
+ */
+
+function getOptionBackground(state, darkMode) {
+  if (state.isSelected || state.isFocused) return '#0d55b3';
+  return darkMode ? '#22272e' : '#fff';
+}
+
+function getOptionTextColor(state, darkMode) {
+  if (state.isSelected || state.isFocused) return '#fff';
+  return darkMode ? '#fff' : '#232323';
+}
+
+export function buildChartSelectStyles(darkMode) {
+  return {
+    control: base => ({
+      ...base,
+      backgroundColor: darkMode ? '#22272e' : '#fff',
+      borderColor: darkMode ? '#375071' : '#ccc',
+      color: darkMode ? '#fff' : '#232323',
+      minHeight: 38,
+      fontSize: 12,
+      boxShadow: 'none',
+    }),
+    menu: base => ({
+      ...base,
+      backgroundColor: darkMode ? '#22272e' : '#fff',
+      fontSize: 12,
+      zIndex: 10001,
+      color: darkMode ? '#fff' : '#232323',
+    }),
+    menuList: base => ({
+      ...base,
+      backgroundColor: darkMode ? '#22272e' : '#fff',
+      color: darkMode ? '#fff' : '#232323',
+      padding: 0,
+    }),
+    option: (base, state) => ({
+      ...base,
+      backgroundColor: getOptionBackground(state, darkMode),
+      color: getOptionTextColor(state, darkMode),
+      fontSize: 12,
+      cursor: 'pointer',
+    }),
+    singleValue: base => ({
+      ...base,
+      color: darkMode ? '#fff' : '#232323',
+    }),
+    multiValue: base => ({
+      ...base,
+      backgroundColor: darkMode ? '#375071' : '#e2e7ee',
+      borderRadius: 4,
+    }),
+    multiValueLabel: base => ({
+      ...base,
+      color: darkMode ? '#fff' : '#333',
+      fontSize: 12,
+      padding: '2px 6px',
+    }),
+    multiValueRemove: base => ({
+      ...base,
+      color: darkMode ? '#fff' : '#333',
+      ':hover': { backgroundColor: '#0d55b3', color: '#fff' },
+    }),
+    placeholder: base => ({
+      ...base,
+      color: darkMode ? '#aaa' : '#5f6b7a',
+    }),
+    input: base => ({
+      ...base,
+      color: darkMode ? '#fff' : '#232323',
+    }),
+  };
+}
diff --git a/src/components/Badge/Badge.css b/src/components/Badge/Badge.css
deleted file mode 100644
index 5a49605cb6..0000000000
--- a/src/components/Badge/Badge.css
+++ /dev/null
@@ -1,168 +0,0 @@
-.btn--dark-sea-green {
-  background-color: #c9d6c6 !important;
-  border-color: #285739 !important;
-  color: #285739 !important;
-}
-
-.badge_image_sm > img {
-  border-radius: 50%;
-  height: 50px;
-  width: 50px;
-  margin: 5px;
-  overflow: inherit;
-}
-
-#rank-filter {
-  width: 200px;
-}
-
-.badge_image_md > img {
-  border-radius: 50%;
-  height: 100px;
-  width: 100px;
-  overflow: inherit;
-}
-
-.badge_image_lg > img {
-  border-radius: 50%;
-  height: 200px;
-  width: 200px;
-  overflow: inherit;
-}
-
-.badge_image_mini > img {
-  border-radius: 50%;
-  height: 25px;
-  width: 25px;
-  overflow: inherit;
-}
-
-.badge_count {
-  padding-top: 4px;
-  border-radius: 50%;
-  width: 22px;
-  height: 22px;
-  background: #007bff;
-  color: #fff;
-  text-align: center;
-  font: 12px Arial, sans-serif;
-  position: absolute;
-  right: 2px;
-  bottom: 2px;
-  z-index: 10;
-}
-.bagde-box-shadow {
-  box-shadow: 2px 2px 4px 1px lightgray;
-}
-.badge-box-shadow-dark {
-  box-shadow: 2px 2px 4px 1px black;
-}
-/* This is just only for displaying 'Personal Max hours' badge hours position */
-.badge_count_personalmax {
-  padding-top: 4px;
-  border-radius: 45%;
-  width: 20px;
-  height: 22px;
-  background: #800080;
-  color: #fff;
-  text-align: center;
-  font: 11px Arial, sans-serif;
-  position: absolute;
-  right: 20px;
-  bottom: 1px;
-  z-index: 10;
-}
-
-.badge_count_3_digit {
-  border-radius: 50%;
-  padding: 1px 3px;
-  background: #007bff;
-  color: #fff;
-  text-align: center;
-  font-size: 9px;
-  position: absolute;
-  right: 5px;
-  bottom: 5px;
-  z-index: 10;
-}
-
-.new_badges {
-  display: flex;
-  flex-wrap: wrap;
-  overflow-y: auto;
-  height: 70px;
-}
-
-.old_badges {
-  height: 220px;
-  overflow-y: auto;
-}
-
-.badge_history_container {
-  display: flex;
-  flex-wrap: wrap;
-  overflow-y: auto;
-}
-
-.badge_image_container {
-  position: relative;
-  height: 60px;
-}
-
-.badgemanagement-actions-cell {
-  display: table-cell;
-  padding-left: 10px;
-}
-
-.assign-badge-margin-top {
-  margin-top: 15px;
-}
-
-.badge-message-background-success {
-  background-color: #d4edda;
-}
-
-.badge-message-background-danger {
-  background-color: #f8d7da;
-}
-
-.badge-message-text-success {
-  color: #092b00;
-}
-
-.badge-message-text-danger {
-  color: #a8071a;
-}
-
-.assign_badge_search_box {
-  margin-bottom: 15px;
-}
-
-.badge_info_icon_text {
-  text-align: left;
-}
-
-.widett {
-  width: 500px;
-}
-
-#badgeEdit .form-group i {
-  margin-left: 5px;
-}
-
-.badgeTooltip .tooltip-inner {
-  background-color: #666;
-}
-
-.popover img {
-  width: 100%;
-  height: 100%;
-  max-width: 120px;
-  margin: 0 auto;
-}
-
-@media screen and (max-width: 544px) {
-  .responsive-font-size {
-    font-size: 0.75rem !important;
-  }
-}
\ No newline at end of file
diff --git a/src/components/StudentBadgeGallery/StudentBadgeGallery.jsx b/src/components/StudentBadgeGallery/StudentBadgeGallery.jsx
index 6fa03559ad..3197bd2cf5 100644
--- a/src/components/StudentBadgeGallery/StudentBadgeGallery.jsx
+++ b/src/components/StudentBadgeGallery/StudentBadgeGallery.jsx
@@ -2,7 +2,6 @@ import { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { Row, Col, Card, CardHeader, CardBody, Spinner } from 'reactstrap';
 import StudentBadgeImage from './StudentBadgeImage';
-import '../Badge/Badge.css'; // Reuse shared badge styling
 import badgeIcon from '../SummaryBar/badges_icon.png';
 import reportIcon from '../SummaryBar/report_icon.png';
 import taskIcon from '../SummaryBar/task_icon.png';
@@ -159,7 +158,7 @@ function StudentBadgeGallery({ darkMode }) {
   return (
     <div className={styles.galleryContainer}>
       <Row
-        className={darkMode ? 'badge-box-shadow-dark' : 'bagde-box-shadow'}
+        className={darkMode ? styles.badgeBoxShadowDark : styles.badgeBoxShadow}
         style={{
           margin: '0 2px',
           backgroundColor: darkMode ? '#1c2541' : '#ffffff',
diff --git a/src/components/StudentBadgeGallery/StudentBadgeGallery.module.css b/src/components/StudentBadgeGallery/StudentBadgeGallery.module.css
index 18e9604b6d..33199f3ea6 100644
--- a/src/components/StudentBadgeGallery/StudentBadgeGallery.module.css
+++ b/src/components/StudentBadgeGallery/StudentBadgeGallery.module.css
@@ -8,6 +8,14 @@
   align-items: center;
 }
 
+.badgeBoxShadow {
+  box-shadow: 2px 2px 4px 1px lightgray;
+}
+
+.badgeBoxShadowDark {
+  box-shadow: 2px 2px 4px 1px black;
+}
+
 .title {
   font-size: 1.5rem;
   font-weight: 600;
diff --git a/src/styles.js b/src/styles.js
index 480c948a04..18d3b0a1e4 100644
--- a/src/styles.js
+++ b/src/styles.js
@@ -7,5 +7,5 @@ export const boxStyleDark = {
   boxShadow: '0.5px 0.5px 5px black',
 };
 
-export const getFontColor = (darkMode) => darkMode ? 'text-light' : '';
-export const getBoxStyling = (darkMode) => darkMode ? boxStyleDark : boxStyle;
\ No newline at end of file
+export const getFontColor = darkMode => (darkMode ? 'text-light' : '');
+export const getBoxStyling = darkMode => (darkMode ? boxStyleDark : boxStyle);