diff --git a/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx b/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx
index 0bfa3006cd..283e70fb52 100644
--- a/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx
+++ b/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx
@@ -59,7 +59,9 @@ export default function EmojiAndColorPicker(props: EmojiAndColorPickerType) {
   const pickerStyle: any = {
     backgroundColor: isDark ? Color.Neutral[800] : Color.Neutral[50],
     border: `1px solid ${isDark ? theme.palette.border.dark : theme.palette.border.main}`,
-    boxShadow: `0px 6px 19px ${alpha(Color.Neutral[800], 0.28)}, 0px 27px 65px ${alpha(Color.Neutral[500], 0.39)}`,
+    boxShadow: isDark
+      ? 'none'
+      : `0px 6px 19px ${alpha(Color.Neutral[800], 0.28)}, 0px 27px 65px ${alpha(Color.Neutral[500], 0.39)}`,
     borderRadius: '8px',
     padding: '0px',
     position: 'absolute',
diff --git a/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx b/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx
index 7c9add1658..0e2c79bb19 100644
--- a/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx
+++ b/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx
@@ -18,7 +18,6 @@ import OfferBuilderExpirationCountdown from './OfferBuilderExpirationCountdown';
 
 export type OfferExpirationSectionProps = {
   isViewing: boolean;
-  canCounter: boolean;
   currentTime: number;
   expirationTime: number;
   onSubmit: (values: SetExpirationData) => Promise<void>;
@@ -51,18 +50,11 @@ function ViewTitle({ expirationValues, willExpirationBeEnabled }: any) {
   );
 }
 
-export default function OfferBuilderExpirationSection(props: OfferExpirationProps) {
+export default function OfferBuilderExpirationSection(props: OfferExpirationSectionProps) {
   const theme = useTheme();
   const navigate = useNavigate();
-  const {
-    isViewing,
-    canCounter,
-    currentTime,
-    expirationTime,
-    onSubmit,
-    isGetHeightInfoLoading,
-    isGetTimestampForHeightLoading,
-  } = props;
+  const { isViewing, currentTime, expirationTime, onSubmit, isGetHeightInfoLoading, isGetTimestampForHeightLoading } =
+    props;
   const { offerExpirationDefaultTime, isOfferExpirationDefaultTimeEnabled } = useOfferExpirationDefaultTime();
   const isWalletSynced = useIsWalletSynced();
 
@@ -244,7 +236,6 @@ export default function OfferBuilderExpirationSection(props: OfferExpirationProp
   return (
     <Flex flexDirection="column" gap={3}>
       {isViewing && viewSection()}
-      {isViewing && canCounter && editSection()}
       {!isViewing && editSection()}
     </Flex>
   );
diff --git a/packages/gui/src/components/offers2/OfferBuilderViewer.tsx b/packages/gui/src/components/offers2/OfferBuilderViewer.tsx
index 8c72d37eb7..7ad6887da0 100644
--- a/packages/gui/src/components/offers2/OfferBuilderViewer.tsx
+++ b/packages/gui/src/components/offers2/OfferBuilderViewer.tsx
@@ -182,10 +182,6 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) {
 
   const isLoading = isLoadingWallets || (!computedOfferBuilderData && !prepopulatedOfferBuilderData) || isOffersLoading;
 
-  const handleExpirationSubmit = (_data) => {
-    setExpirationTimeMax(data);
-  };
-
   async function handleSubmit(values: OfferBuilderData) {
     const { offered } = values;
     const { fee: offeredFee } = offered;
@@ -305,10 +301,9 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) {
             {hasExpiration && (
               <OfferBuilderExpirationSection
                 isViewing
-                canCounter={canCounterOffer}
                 currentTime={currentTime}
                 expirationTime={expirationTime}
-                onSubmit={handleExpirationSubmit}
+                onSubmit={() => {}}
                 isGetHeightInfoLoading={isGetHeightInfoLoading}
                 isGetTimestampForHeightLoading={isGetTimestampForHeightLoading}
               />
diff --git a/packages/gui/src/components/settings/SettingsExpiringOffers.tsx b/packages/gui/src/components/settings/SettingsExpiringOffers.tsx
index 2352008263..1c419d4387 100644
--- a/packages/gui/src/components/settings/SettingsExpiringOffers.tsx
+++ b/packages/gui/src/components/settings/SettingsExpiringOffers.tsx
@@ -10,12 +10,6 @@ import useOfferExpirationDefaultTime, {
   offerExpirationDefaultTimeDefaults,
 } from '../../hooks/useOfferExpirationDefaultTime';
 
-const fields = [
-  { name: 'days', label: t`Days`, max: 365 },
-  { name: 'hours', label: t`Hours`, max: 24 },
-  { name: 'minutes', label: t`Minutes`, max: 60 },
-];
-
 export default function SettingsExpiringOffers(props) {
   const { offerExpirationDefaultTime, setOfferExpirationDefaultTime, isOfferExpirationDefaultTimeEnabled } =
     useOfferExpirationDefaultTime();
@@ -24,6 +18,12 @@ export default function SettingsExpiringOffers(props) {
     defaultValues: offerExpirationDefaultTime,
   });
 
+  const fields = [
+    { name: 'days', label: t`Days`, max: 365 },
+    { name: 'hours', label: t`Hours`, max: 24 },
+    { name: 'minutes', label: t`Minutes`, max: 60 },
+  ];
+
   async function handleSubmit(valuesLocal: OfferExpirationDefaultTimeInput) {
     const newValues = { ...valuesLocal, enabled: true };
     setOfferExpirationDefaultTime(newValues);