diff --git a/src/common/components/organisms/FidgetTray.tsx b/src/common/components/organisms/FidgetTray.tsx
index 1ca9f772..c2c97527 100644
--- a/src/common/components/organisms/FidgetTray.tsx
+++ b/src/common/components/organisms/FidgetTray.tsx
@@ -4,7 +4,13 @@ import { FidgetInstanceData } from "@/common/fidgets";
 import { CompleteFidgets } from "@/fidgets";
 import { Button } from "@/common/components/atoms/button";
 import { FaPlus } from "react-icons/fa6";
-
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+  TooltipProvider,
+} from "@/common/components/atoms/tooltip";
+import { FaInfoCircle } from "react-icons/fa";
 export interface FidgetTrayProps {
   setExternalDraggedItem: Dispatch<
     SetStateAction<{ i: string; w: number; h: number } | undefined>
@@ -23,7 +29,25 @@ export const FidgetTray: React.FC<FidgetTrayProps> = ({
   openFidgetPicker,
 }) => {
   return (
-    <div className="w-full h-screen flex flex-col justify-start items-center gap-2 bg-sky-50 py-8 px-6 overflow-auto">
+    <div className="w-full h-screen flex flex-col justify-start items-center gap-2 bg-sky-50 py-7 px-6 overflow-auto">
+      <TooltipProvider>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <center>
+              <FaInfoCircle color="#D1D5DB" />
+            </center>
+          </TooltipTrigger>
+          <TooltipContent side="left">
+            <div className="flex flex-col gap-1">
+              <div>
+                Click the + to browse Fidgets.
+                <br />
+                Then, drag them to your Space
+              </div>
+            </div>
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
       <h5 className="text-xs font-medium text-center -mx-3 mb-3">
         Fidget Tray
       </h5>
diff --git a/src/common/lib/theme/ThemeSettingsEditor.tsx b/src/common/lib/theme/ThemeSettingsEditor.tsx
index 7bec9875..7c6e9491 100644
--- a/src/common/lib/theme/ThemeSettingsEditor.tsx
+++ b/src/common/lib/theme/ThemeSettingsEditor.tsx
@@ -44,7 +44,6 @@ export function ThemeSettingsEditor({
   cancelExitEditMode,
 }: ThemeSettingsEditorArgs) {
   const [showConfirmCancel, setShowConfirmCancel] = useState(false);
-  const [displayToolTips, setDisplayToolTips] = useState(false);
 
   function themePropSetter<T extends string>(
     property: string,
@@ -83,26 +82,13 @@ export function ThemeSettingsEditor({
     cancelExitEditMode();
   }
 
-  function toggleToolTips() {
-    setDisplayToolTips(!displayToolTips);
-  }
-
   return (
     <>
       <div className="flex flex-col h-full gap-6">
         {/* Back */}
-        <TooltipProvider>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <div className="flex items-center gap-1">
-                <div>Customize</div>
-                <FaInfoCircle onClick={toggleToolTips} color="grey" />
-              </div>
-            </TooltipTrigger>
-            <TooltipContent>Little Help?</TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-
+        <div className="flex items-center gap-1">
+          <div>Customize</div>
+        </div>
         {/* Content */}
         <div className="h-full overflow-auto flex flex-col gap-4">
           <div className="flex flex-col gap-2">
@@ -123,7 +109,26 @@ export function ThemeSettingsEditor({
             </TabsList>
             <TabsContent value="fonts" className={tabContentClasses}>
               <div className="flex flex-col gap-1">
-                <h4 className="text-sm">Headings</h4>
+                <div className="flex flex-row gap-1">
+                  <h4 className="text-sm">Headings</h4>
+                  <TooltipProvider>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <div className="flex items-center gap-1 pl-1">
+                          <FaInfoCircle color="#D1D5DB" />
+                        </div>
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        <div className="flex flex-col gap-1">
+                          <div>
+                            The primary, or header font that Fidgets can
+                            inherit.
+                          </div>
+                        </div>
+                      </TooltipContent>
+                    </Tooltip>
+                  </TooltipProvider>
+                </div>
                 <div className="flex items-center gap-1">
                   <ColorSelector
                     className="rounded-full overflow-hidden w-6 h-6 shrink-0"
@@ -140,7 +145,26 @@ export function ThemeSettingsEditor({
                 </div>
               </div>
               <div className="flex flex-col gap-1">
-                <h4 className="text-sm">Body</h4>
+                <div className="flex flex-row gap-1">
+                  <h4 className="text-sm">Body</h4>
+                  <TooltipProvider>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <div className="flex items-center gap-1 pl-1">
+                          <FaInfoCircle color="#D1D5DB" />
+                        </div>
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        <div className="flex flex-col gap-1">
+                          <div>
+                            The secondary, or body font that Fidgets can
+                            inherit.
+                          </div>
+                        </div>
+                      </TooltipContent>
+                    </Tooltip>
+                  </TooltipProvider>
+                </div>
                 <div className="flex items-center gap-1">
                   <ColorSelector
                     className="rounded-full overflow-hidden w-6 h-6 shrink-0"
@@ -165,8 +189,8 @@ export function ThemeSettingsEditor({
                   <TooltipProvider>
                     <Tooltip>
                       <TooltipTrigger asChild>
-                        <div className="flex items-center gap-1">
-                          {displayToolTips && <FaInfoCircle color="grey" />}
+                        <div className="flex items-center gap-1 pl-1">
+                          <FaInfoCircle color="#D1D5DB" />
                         </div>
                       </TooltipTrigger>
                       <TooltipContent>
@@ -201,8 +225,8 @@ export function ThemeSettingsEditor({
                       <TooltipProvider>
                         <Tooltip>
                           <TooltipTrigger asChild>
-                            <div className="flex items-center gap-1">
-                              {displayToolTips && <FaInfoCircle color="grey" />}
+                            <div className="flex items-center gap-1 pl-1">
+                              <FaInfoCircle color="#D1D5DB" />
                             </div>
                           </TooltipTrigger>
                           <TooltipContent>
@@ -229,8 +253,8 @@ export function ThemeSettingsEditor({
                       <TooltipProvider>
                         <Tooltip>
                           <TooltipTrigger asChild>
-                            <div className="flex items-center gap-1">
-                              {displayToolTips && <FaInfoCircle color="grey" />}
+                            <div className="flex items-center gap-1 pl-1">
+                              <FaInfoCircle color="#D1D5DB" />
                             </div>
                           </TooltipTrigger>
                           <TooltipContent>
@@ -266,8 +290,8 @@ export function ThemeSettingsEditor({
                       <TooltipProvider>
                         <Tooltip>
                           <TooltipTrigger asChild>
-                            <div className="flex items-center gap-1">
-                              {displayToolTips && <FaInfoCircle color="grey" />}
+                            <div className="flex items-center gap-1 pl-1">
+                              <FaInfoCircle color="#D1D5DB" />
                             </div>
                           </TooltipTrigger>
                           <TooltipContent>
@@ -298,8 +322,8 @@ export function ThemeSettingsEditor({
                   <TooltipProvider>
                     <Tooltip>
                       <TooltipTrigger asChild>
-                        <div className="flex items-center gap-1">
-                          {displayToolTips && <FaInfoCircle color="grey" />}
+                        <div className="flex items-center gap-1 pl-1">
+                          <FaInfoCircle color="#D1D5DB" />
                         </div>
                       </TooltipTrigger>
                       <TooltipContent>
@@ -333,8 +357,8 @@ export function ThemeSettingsEditor({
               <TooltipProvider>
                 <Tooltip>
                   <TooltipTrigger asChild>
-                    <div className="flex items-center gap-1">
-                      {displayToolTips && <FaInfoCircle color="grey" />}
+                    <div className="flex items-center gap-1 pl-1">
+                      <FaInfoCircle color="#D1D5DB" />
                     </div>
                   </TooltipTrigger>
                   <TooltipContent>