diff --git a/resources/js/components/SupportButton.vue b/resources/js/components/SupportButton.vue
index 967d87d..95eb14c 100644
--- a/resources/js/components/SupportButton.vue
+++ b/resources/js/components/SupportButton.vue
@@ -4,7 +4,7 @@
         target="_blank"
         class="fixed bottom-4 right-6 text-white bg-light-surface-brand text-lg font-medium py-2 px-5 rounded-full flex items-center z-30"
     >
-        <QuestionMarkCircleIcon class="mr-1 w-5 h-5 cursor-pointer" stroke-width="36" />
+        <QuestionMarkCircleIcon class="mr-1 w-5 h-5 cursor-pointer text-light-content dark:text-dark-content" stroke-width="36" />
         <span>Support</span>
     </a>
 </template>
diff --git a/resources/js/components/beam/BeamsList.vue b/resources/js/components/beam/BeamsList.vue
index 83e6964..5c5f193 100644
--- a/resources/js/components/beam/BeamsList.vue
+++ b/resources/js/components/beam/BeamsList.vue
@@ -58,10 +58,18 @@
                             v-if="selectedBeams.length > 0"
                             class="absolute left-14 top-0 flex h-12 items-center space-x-3 bg-light-surface-primary dark:bg-dark-surface-primary sm:left-12"
                         >
-                            <Btn dusk="expireAllBtn" class="!px-2 !py-1 text-sm animate-fade-in" @click="expireSelectedBeams"
+                            <Btn
+                                dusk="expireAllBtn"
+                                class="!px-2 !py-1 text-sm animate-fade-in"
+                                @click="expireSelectedBeams"
                                 >{{ `Expire ${selectedBeams.length > 1 ? 'All' : ''} ` }}
                             </Btn>
-                            <Btn dusk="exportBtn" class="!px-2 !py-1 text-sm animate-fade-in" @click="exportSelectedBeams">Export</Btn>
+                            <Btn
+                                dusk="exportBtn"
+                                class="!px-2 !py-1 text-sm animate-fade-in"
+                                @click="exportSelectedBeams"
+                                >Export</Btn
+                            >
                         </div>
                         <table
                             id="beamsTable"
diff --git a/resources/js/components/pages/create/CreateCollection.vue b/resources/js/components/pages/create/CreateCollection.vue
index 6ab1665..d68f203 100644
--- a/resources/js/components/pages/create/CreateCollection.vue
+++ b/resources/js/components/pages/create/CreateCollection.vue
@@ -74,7 +74,7 @@
                                 text="This section determines the rules pertaining to token supply and amount of tokens
                                 available to be minted on future interactions with this collection."
                             >
-                                <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer" />
+                                <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer text-light-content dark:text-dark-content" />
                             </Tooltip>
                         </div>
                         <FormInput
diff --git a/resources/js/components/pages/create/CreateFuelTank.vue b/resources/js/components/pages/create/CreateFuelTank.vue
index 44adf40..9340631 100644
--- a/resources/js/components/pages/create/CreateFuelTank.vue
+++ b/resources/js/components/pages/create/CreateFuelTank.vue
@@ -83,7 +83,7 @@
                 <CollapseCard title="Account Rules" :actions="false" dusk="accountRulesCard">
                     <template #icon>
                         <Tooltip text="The fuel tank account rules.">
-                            <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer" />
+                            <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer text-light-content dark:text-dark-content" />
                         </Tooltip>
                     </template>
                     <div class="space-y-6 p-6">
diff --git a/resources/js/components/pages/create/CreateToken.vue b/resources/js/components/pages/create/CreateToken.vue
index c483a88..01ae541 100644
--- a/resources/js/components/pages/create/CreateToken.vue
+++ b/resources/js/components/pages/create/CreateToken.vue
@@ -26,7 +26,7 @@
                                     text="Creates a new token in a collection owned by you, the new token will be automatically
                                 minted to the specified recipient account/wallet"
                                 >
-                                    <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer" />
+                                    <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer text-light-content dark:text-dark-content" />
                                 </Tooltip>
                             </div>
                             <a
diff --git a/resources/js/components/slideovers/beam/ClaimBeamSlideover.vue b/resources/js/components/slideovers/beam/ClaimBeamSlideover.vue
index b92cf2a..8ce7063 100644
--- a/resources/js/components/slideovers/beam/ClaimBeamSlideover.vue
+++ b/resources/js/components/slideovers/beam/ClaimBeamSlideover.vue
@@ -13,7 +13,7 @@
                         <div class="space-y-2 pb-3">
                             <dt class="text-base font-medium text-light-content dark:text-dark-content">Code</dt>
                             <dd
-                                class="mt-1 text-sm text-light-content-strong dark:text-dark-content-strong break-words"
+                                class="mt-1 flex items-center text-sm text-light-content-strong dark:text-dark-content-strong break-words"
                             >
                                 {{ item.code }}
                                 <CopyTextIcon :text="item.code" />
diff --git a/resources/js/components/slideovers/beam/DetailsBeamSlideover.vue b/resources/js/components/slideovers/beam/DetailsBeamSlideover.vue
index cd01b03..7506a69 100644
--- a/resources/js/components/slideovers/beam/DetailsBeamSlideover.vue
+++ b/resources/js/components/slideovers/beam/DetailsBeamSlideover.vue
@@ -70,11 +70,11 @@
                         </dd>
                     </div>
 
-                    <div class="space-y-2 pt-4 pb-3" v-if="item.flags.length">
+                    <div class="space-y-2 pt-4 pb-3" v-if="item.flags?.length">
                         <dt class="text-base font-medium text-light-content dark:text-dark-content">Flags</dt>
                         <Chip v-for="flag in item.flags" :key="flag" :text="flag" :closable="false" class="mr-2" />
                     </div>
-                    <div class="space-y-2 pt-4 pb-3" v-if="item.claimConditions.length">
+                    <div class="space-y-2 pt-4 pb-3" v-if="item.claimConditions?.length">
                         <dt class="text-base font-medium text-gray-500">Conditions</dt>
                         <Chip
                             v-for="condition in item.claimConditions"
diff --git a/resources/js/components/slideovers/marketplace/DetailsListingSlideover.vue b/resources/js/components/slideovers/marketplace/DetailsListingSlideover.vue
index 8e120c3..701d3d5 100644
--- a/resources/js/components/slideovers/marketplace/DetailsListingSlideover.vue
+++ b/resources/js/components/slideovers/marketplace/DetailsListingSlideover.vue
@@ -20,7 +20,9 @@
                         <dt class="text-base font-medium text-light-content dark:text-dark-content">
                             Make Asset ID
                             <Tooltip text="The collection and token ID of the asset being sold.">
-                                <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer" />
+                                <QuestionMarkCircleIcon
+                                    class="ml-1 w-4 h-4 cursor-pointer text-light-content dark:text-dark-content"
+                                />
                             </Tooltip>
                         </dt>
                         <dd class="mt-1 text-sm text-light-content-strong dark:text-dark-content-strong">
@@ -35,7 +37,9 @@
                         <dt class="text-base font-medium text-light-content dark:text-dark-content">
                             Take Asset ID
                             <Tooltip text="The collection and token ID of the asset being requested.">
-                                <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer" />
+                                <QuestionMarkCircleIcon
+                                    class="ml-1 w-4 h-4 cursor-pointer text-light-content dark:text-dark-content"
+                                />
                             </Tooltip>
                         </dt>
                         <dd class="mt-1 text-sm text-light-content-strong dark:text-dark-content-strong">
@@ -69,7 +73,9 @@
                         <dt class="text-base font-medium text-light-content dark:text-dark-content">
                             Minimum take value
                             <Tooltip text="The minimum value of the take asset received for the sale to be a success.">
-                                <QuestionMarkCircleIcon class="ml-1 w-4 h-4 cursor-pointer" />
+                                <QuestionMarkCircleIcon
+                                    class="ml-1 w-4 h-4 cursor-pointer text-light-content dark:text-dark-content"
+                                />
                             </Tooltip>
                         </dt>
                         <dd class="mt-1 text-sm text-light-content-strong dark:text-dark-content-strong">
diff --git a/resources/js/graphql/query/GetCollectionIds.ts b/resources/js/graphql/query/GetCollectionIds.ts
index 51115a0..1bcc883 100644
--- a/resources/js/graphql/query/GetCollectionIds.ts
+++ b/resources/js/graphql/query/GetCollectionIds.ts
@@ -1,4 +1,4 @@
-export default `query GetCollections($after: String, $first: Int) {
+export default `query GetCollectionsIds($after: String, $first: Int) {
     GetCollections(after: $after, first: $first) {
         edges {
             node {