diff --git a/src/rovo-dev/ui/RovoDev.css b/src/rovo-dev/ui/RovoDev.css
index e0a461a3a..017b52f61 100644
--- a/src/rovo-dev/ui/RovoDev.css
+++ b/src/rovo-dev/ui/RovoDev.css
@@ -849,6 +849,7 @@ body {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
+    justify-content: space-between;
     gap: 8px;
     background-color: var(--vscode-sideBar-background);
     border-radius: 8px;
@@ -857,6 +858,9 @@ body {
 
 .prompt-settings-action {
     --ds-icon-inverse: var(--vscode-sideBar-background);
+    margin-left: auto;
+    flex-shrink: 0;
+    align-self: flex-start;
 }
 
 .prompt-settings-logo {
diff --git a/src/rovo-dev/ui/prompt-box/prompt-settings-popup/PromptSettingsPopup.tsx b/src/rovo-dev/ui/prompt-box/prompt-settings-popup/PromptSettingsPopup.tsx
index 6e1466607..f71ab6f92 100644
--- a/src/rovo-dev/ui/prompt-box/prompt-settings-popup/PromptSettingsPopup.tsx
+++ b/src/rovo-dev/ui/prompt-box/prompt-settings-popup/PromptSettingsPopup.tsx
@@ -135,17 +135,19 @@ const PromptSettingsItem: React.FC<{
 }> = ({ icon, label, description, action, actionType, toggled, isInternalOnly }) => {
     return (
         <div className="prompt-settings-item">
-            <div className="prompt-settings-logo">{icon}</div>
-            <div id="prompt-settings-context">
-                <p style={{ fontWeight: 'bold' }}>
-                    {label}
-                    {isInternalOnly && (
-                        <span style={{ backgroundColor: 'var(--vscode-badge-background)', marginLeft: '8px' }}>
-                            Internal only
-                        </span>
-                    )}
-                </p>
-                <p style={{ fontSize: '11px' }}>{description}</p>
+            <div style={{ display: 'flex', alignItems: 'flex-start', gap: '8px', flex: '1' }}>
+                <div className="prompt-settings-logo">{icon}</div>
+                <div id="prompt-settings-context" style={{ flex: '1' }}>
+                    <p style={{ fontWeight: 'bold' }}>
+                        {label}
+                        {isInternalOnly && (
+                            <span style={{ backgroundColor: 'var(--vscode-badge-background)', marginLeft: '8px' }}>
+                                Internal only
+                            </span>
+                        )}
+                    </p>
+                    <p style={{ fontSize: '11px' }}>{description}</p>
+                </div>
             </div>
             {action && (
                 <div className="prompt-settings-action">