Merge branch 'collections' of github.com:metabase/metabase into collections [ci e2e]

frontend/src/metabase/components/TitleAndDescription.jsx

@@ -9,7 +9,7 @@ const TitleAndDescription = ({ title, description }) =>
         <h2 className="mr1">{title}</h2>
         { description &&
             <Tooltip tooltip={description} maxWidth={'22em'}>
-                <Icon name='info'/>
+                <Icon name='info' style={{ marginTop: 3 }}/>
             </Tooltip>
         }
     </div>;

frontend/src/metabase/questions/components/ArchivedItem.jsx

@@ -15,7 +15,7 @@ const ArchivedItem = ({ name, type, icon, color = '#DEEAF1', isAdmin = false, on
         />
         { name }
         { isAdmin &&
-            <Tooltip tooltip={`Unarchive this ${type}`}>
+            <Tooltip tooltip={`Unarchive this ${type === "card" ? "question" : type}`}>
                 <Icon
                     onClick={onUnarchive}
                     className="ml-auto cursor-pointer text-brand-hover hover-child"