diff --git a/libs/market-list/src/lib/components/select-market-columns.tsx b/libs/market-list/src/lib/components/select-market-columns.tsx
index e06eabbfd..3d03d2383 100644
--- a/libs/market-list/src/lib/components/select-market-columns.tsx
+++ b/libs/market-list/src/lib/components/select-market-columns.tsx
@@ -152,7 +152,7 @@ export const columnHeaders: Column[] = [
     value: (
       <Tooltip
         description={
-          <span className="text-ui-small">
+          <span>
             {t(
               'Fees are paid by market takers on aggressive orders only. The fee displayed is made up of:'
             )}
diff --git a/libs/market-list/src/lib/components/select-market-table.tsx b/libs/market-list/src/lib/components/select-market-table.tsx
index 3c974d8d4..a947e51a9 100644
--- a/libs/market-list/src/lib/components/select-market-table.tsx
+++ b/libs/market-list/src/lib/components/select-market-table.tsx
@@ -6,7 +6,7 @@ export const SelectMarketTableHeader = ({
   headers = columnHeaders,
 }) => {
   return (
-    <tr>
+    <tr className="sticky top-[-0.5rem] z-10 dark:bg-black bg-white">
       {headers.map(
         ({ value, className, onlyOnDetailed }, i) =>
           (!onlyOnDetailed || detailed === onlyOnDetailed) && (
diff --git a/libs/market-list/src/lib/components/select-market.tsx b/libs/market-list/src/lib/components/select-market.tsx
index 68036caad..776bfede6 100644
--- a/libs/market-list/src/lib/components/select-market.tsx
+++ b/libs/market-list/src/lib/components/select-market.tsx
@@ -77,7 +77,7 @@ export const SelectAllMarketsTableBody = ({
 
   return marketList ? (
     <>
-      <thead className="sticky top-0 z-10 dark:bg-black bg-white">
+      <thead>
         <tr
           className={`text-h5 font-bold text-black-95 dark:text-white-95 mb-6`}
           data-testid="dialog-title"
@@ -88,14 +88,13 @@ export const SelectAllMarketsTableBody = ({
       </thead>
 
       <tbody>
-        {data &&
-          marketList?.map((market, i) => (
-            <SelectMarketTableRow
-              key={i}
-              detailed={true}
-              columns={tableColumns(market)}
-            />
-          ))}
+        {marketList?.map((market, i) => (
+          <SelectMarketTableRow
+            key={i}
+            detailed={true}
+            columns={tableColumns(market)}
+          />
+        ))}
       </tbody>
     </>
   ) : (
diff --git a/libs/orders/src/lib/components/order-feedback/order-feedback.tsx b/libs/orders/src/lib/components/order-feedback/order-feedback.tsx
index c6a8fe15d..64b302f33 100644
--- a/libs/orders/src/lib/components/order-feedback/order-feedback.tsx
+++ b/libs/orders/src/lib/components/order-feedback/order-feedback.tsx
@@ -15,7 +15,7 @@ export interface OrderFeedbackProps {
 
 export const OrderFeedback = ({ transaction, order }: OrderFeedbackProps) => {
   const { VEGA_EXPLORER_URL } = useEnvironment();
-  const labelClass = 'font-bold';
+  const labelClass = 'font-bold text-black dark:text-white';
   if (!order) return null;
 
   // Order on network but was rejected
diff --git a/libs/ui-toolkit/src/components/tooltip/tooltip.tsx b/libs/ui-toolkit/src/components/tooltip/tooltip.tsx
index ce368b300..7f3765f84 100644
--- a/libs/ui-toolkit/src/components/tooltip/tooltip.tsx
+++ b/libs/ui-toolkit/src/components/tooltip/tooltip.tsx
@@ -22,7 +22,7 @@ export const Tooltip = ({ children, description, open, align }: TooltipProps) =>
       <Root open={open}>
         <Trigger asChild>{children}</Trigger>
         <Content align={align} alignOffset={8}>
-          <div className="relative z-0 p-8 bg-black-50 border border-black-60 text-white rounded-sm max-w-sm">
+          <div className="relative z-0 p-8 bg-black-50 border border-black-60 text-white rounded-sm max-w-sm text-ui">
             {description}
           </div>
           <Arrow