diff --git a/src/Tooltip.js b/src/Tooltip.js
index 16b4cd08..6313db36 100644
--- a/src/Tooltip.js
+++ b/src/Tooltip.js
@@ -11,7 +11,6 @@ const Tooltip = ({ content, ...props }) => (
     <Tippy 
         content = { <span> {content} </span> }
         interactive={true}
-        delay={300}
         theme='studio'
 
         sx={{
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index d8720114..16823462 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -135,5 +135,8 @@
   "warning-recorder-safari-hint": "Falls Sie Safari nutzen, können Sie die experimentelle Funktion 'MediaRecorder' in den Einstellungen aktivieren. Wir empfehlen allerdings, auf macOS Firefox oder Chrome zu nutzen.",
   "warning-missing-connection-settings": "Die Verbindung zum Opencast Server wurde noch nicht vollständig hergestellt. Bitte konfigurieren Sie die Verbindung in <1>den Einstellungen</1> (die Aufnahme geht nicht verloren).",
 
-  "settings-back-to-recording": "Zurück zur Aufnahme"
+  "settings-back-to-recording": "Zurück zur Aufnahme",
+  
+  "video-settings-open": "Videoeinstellungen öffnen",
+  "video-settings-close": "Videoeinstellungen schließen"
 }
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index cb66a13e..78b11577 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -136,6 +136,7 @@
   "warning-recorder-not-supported": "Your browser does not support recording media streams.",
   "warning-recorder-safari-hint": "If you are using Safari, you can enable the experimental feature 'MediaRecorder' in settings. However, on macOS, we recommend switching to Chrome or Firefox.",
   "warning-missing-connection-settings": "Connection to Opencast is not fully established: uploading is disabled. Please configure the connection in <1>the settings</1> (you won't lose your recording).",
+
   "settings-back-to-recording": "Back to recording",
 
   "video-settings-open": "Open video settings",
diff --git a/src/ui/studio/save-creation/index.js b/src/ui/studio/save-creation/index.js
index 1cd501fb..42ac22a1 100644
--- a/src/ui/studio/save-creation/index.js
+++ b/src/ui/studio/save-creation/index.js
@@ -444,7 +444,6 @@ const UploadForm = ({ uploadState, handleUpload }) => {
         /> }
 
         <Button
-          title={t('save-creation-button-upload')}
           disabled={recordings.length === 0}
           onClick={handleSubmit(handleUpload)}
         >
diff --git a/src/ui/studio/video-setup/prefs.js b/src/ui/studio/video-setup/prefs.js
index 3cbb4c9f..20b1f45d 100644
--- a/src/ui/studio/video-setup/prefs.js
+++ b/src/ui/studio/video-setup/prefs.js
@@ -187,7 +187,7 @@ export const StreamSettings = ({ isDesktop, stream }) => {
       justifyContent: 'flex-end',
     }}>    
       <div sx={{ textAlign: 'right' }}>
-        <Tooltip content={isExpanded ? t('video-settings-close') : t('video-settings-open') }>
+        <Tooltip offset={[0, 25]} content={isExpanded ? t('video-settings-close') : t('video-settings-open') }>
           <button
             onClick={() => setIsExpanded(old => !old)}
             sx={{