diff --git a/components/editor/shared/EntityTreeToolbar.tsx b/components/editor/shared/EntityTreeToolbar.tsx
index 234dec7c..165b2dc8 100644
--- a/components/editor/shared/EntityTreeToolbar.tsx
+++ b/components/editor/shared/EntityTreeToolbar.tsx
@@ -130,21 +130,21 @@ export function EntityTreeToolbar({
         {showCollapseGroup && (
           <div className="flex rounded-md border border-slate-200 dark:border-slate-600">
             <button
-              onClick={onCollapseAll}
+              onClick={onCollapseOneLevel}
               disabled={collapseDisabled}
               className={cn(btnBase, "rounded-l-md border-r border-slate-200 dark:border-slate-600", collapseDisabled ? btnDisabled : btnEnabled)}
-              aria-label="Collapse all"
+              aria-label="Collapse one level"
             >
-              <ChevronsRight className="h-3.5 w-3.5" />
+              <ChevronRight className="h-3.5 w-3.5" />
               <span className="hidden sm:inline">Collapse</span>
             </button>
             <button
-              onClick={onCollapseOneLevel}
+              onClick={onCollapseAll}
               disabled={collapseDisabled}
               className={cn(btnBase, "rounded-r-md px-1", collapseDisabled ? btnDisabled : btnEnabled)}
-              aria-label="Collapse one level"
+              aria-label="Collapse all"
             >
-              <ChevronRight className="h-3.5 w-3.5" />
+              <ChevronsRight className="h-3.5 w-3.5" />
             </button>
           </div>
         )}
diff --git a/components/pr/PRCreateModal.tsx b/components/pr/PRCreateModal.tsx
index 81af1088..da70fbb3 100644
--- a/components/pr/PRCreateModal.tsx
+++ b/components/pr/PRCreateModal.tsx
@@ -115,10 +115,10 @@ export function PRCreateModal({
                 <select
                   value={sourceBranch}
                   onChange={(e) => setSourceBranch(e.target.value)}
-                  className="flex-1 rounded-sm border-0 bg-transparent py-1 text-sm focus:outline-hidden focus:ring-0"
+                  className="flex-1 rounded-sm border-0 bg-transparent py-1 text-sm text-slate-900 focus:outline-hidden focus:ring-0 dark:text-white"
                 >
                   {branches.map((branch) => (
-                    <option key={branch.name} value={branch.name}>
+                    <option key={branch.name} value={branch.name} className="bg-white text-slate-900 dark:bg-slate-700 dark:text-white">
                       {branch.name}
                     </option>
                   ))}
@@ -137,10 +137,10 @@ export function PRCreateModal({
                 <select
                   value={targetBranch}
                   onChange={(e) => setTargetBranch(e.target.value)}
-                  className="flex-1 rounded-sm border-0 bg-transparent py-1 text-sm focus:outline-hidden focus:ring-0"
+                  className="flex-1 rounded-sm border-0 bg-transparent py-1 text-sm text-slate-900 focus:outline-hidden focus:ring-0 dark:text-white"
                 >
                   {branches.map((branch) => (
-                    <option key={branch.name} value={branch.name}>
+                    <option key={branch.name} value={branch.name} className="bg-white text-slate-900 dark:bg-slate-700 dark:text-white">
                       {branch.name}
                     </option>
                   ))}