diff --git a/src/components/helpers/sharemodal/ShareModal.jsx b/src/components/helpers/sharemodal/ShareModal.jsx
index a1afc295..c5ccf9d4 100644
--- a/src/components/helpers/sharemodal/ShareModal.jsx
+++ b/src/components/helpers/sharemodal/ShareModal.jsx
@@ -25,7 +25,7 @@ export default function ShareModal({ modalClose, data }) {
     <div className="smallModal">
       <div className="shareHeader">
         <span className="title">{getMessage('widgets.quote.share')}</span>
-        <Tooltip title="Close">
+        <Tooltip title={getMessage('modals.welcome.buttons.close')}>
           <div className="close" onClick={modalClose}>
             <MdClose />
           </div>
diff --git a/src/components/helpers/tooltip/infoTooltip.jsx b/src/components/helpers/tooltip/infoTooltip.jsx
index b04abba9..bb7a3b37 100644
--- a/src/components/helpers/tooltip/infoTooltip.jsx
+++ b/src/components/helpers/tooltip/infoTooltip.jsx
@@ -30,7 +30,7 @@ export default function InfoTooltip({ title, style, placement, subtitle }) {
         >
           <div className="tooltipHeader">
             <span className="title">{title}</span>
-            <Tooltip title="Close">
+            <Tooltip title={getMessage('modals.welcome.buttons.close')}>
               <div className="close" onClick={() => setShowTooltip(false)}>
                 <MdClose />
               </div>
diff --git a/src/components/modals/main/Main.jsx b/src/components/modals/main/Main.jsx
index cd93a603..01f47f16 100644
--- a/src/components/modals/main/Main.jsx
+++ b/src/components/modals/main/Main.jsx
@@ -13,15 +13,17 @@ const Settings = lazy(() => import('./tabs/Settings'));
 const Addons = lazy(() => import('./tabs/Addons'));
 const Marketplace = lazy(() => import('./tabs/Marketplace'));
 
+const getMessage = (text) => variables.language.getMessage(variables.languagecode, text);
+
 const renderLoader = (current) => (
   <Tabs current={current}>
-    <div label={variables.language.getMessage(variables.languagecode, 'modals.main.loading')}>
+    <div label={getMessage('modals.main.loading')}>
       <div className="emptyItems">
         <div className="emptyMessage">
           <div className="loaderHolder">
             <div id="loader"></div>
             <span className="subtitle">
-              {variables.language.getMessage(variables.languagecode, 'modals.main.loading')}
+              {getMessage('modals.main.loading')}
             </span>
           </div>
         </div>
@@ -59,7 +61,7 @@ export default function MainModal({ modalClose }) {
     <div className="frame">
       <Tooltip
         style={{ position: 'absolute', top: '3rem', right: '3rem' }}
-        title="close"
+        title={getMessage('modals.welcome.buttons.close')}
         key="closeTooltip"
       >
         <span className="closeModal" onClick={modalClose}>
diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx
index 4ff8223a..ce1b8820 100644
--- a/src/components/modals/main/marketplace/Item.jsx
+++ b/src/components/modals/main/marketplace/Item.jsx
@@ -109,7 +109,7 @@ export default class Item extends PureComponent {
         </Modal>
         <div className="flexTopMarketplace">
           <div className="returnButton">
-            <Tooltip title="back" key="backArrow">
+            <Tooltip title={getMessage('modals.main.navbar.marketplace.product.buttons.back')} key="backArrow">
               <MdArrowBack className="backArrow" onClick={this.props.toggleFunction} />
             </Tooltip>
           </div>
@@ -194,7 +194,7 @@ export default class Item extends PureComponent {
                 <div className="infoItem">
                   <MdTranslate />
                   <div className="text">
-                    <span className="header">{getMessage('modals.main.settings.sections.language')}</span>
+                    <span className="header">{getMessage('modals.main.settings.sections.language.title')}</span>
                     <span>{this.props.data.data.language}</span>
                   </div>
                 </div>
diff --git a/src/components/modals/main/marketplace/Items.jsx b/src/components/modals/main/marketplace/Items.jsx
index 20b40d6a..3fe6819c 100644
--- a/src/components/modals/main/marketplace/Items.jsx
+++ b/src/components/modals/main/marketplace/Items.jsx
@@ -15,8 +15,8 @@ export default function Items({
     <>
       {type === 'all' && !onCollection ? (
         <>
-          {collections.map((collection) => (
-            <div className="collection">
+          {collections.map((collection, index) => (
+            <div className="collection" key={index}>
               <div className="content">
                 <span className="title">{collection.display_name}</span>
                 <span className="subtitle">{collection.description}</span>
diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx
index d3073953..a8a2f8c0 100644
--- a/src/components/modals/main/marketplace/sections/Marketplace.jsx
+++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx
@@ -300,7 +300,7 @@ export default class Marketplace extends PureComponent {
           <>
             <div className="flexTopMarketplace">
               <div className="returnButton">
-                <Tooltip title="back" key="backArrow">
+                <Tooltip title={this.getMessage('modals.main.navbar.marketplace.product.buttons.back')} key="backArrow">
                   <MdArrowBack className="backArrow" onClick={() => this.returnToMain()} />
                 </Tooltip>
               </div>
diff --git a/src/components/modals/main/settings/Header.jsx b/src/components/modals/main/settings/Header.jsx
index fbf16aae..428e58b0 100644
--- a/src/components/modals/main/settings/Header.jsx
+++ b/src/components/modals/main/settings/Header.jsx
@@ -19,7 +19,7 @@ export default class Header extends PureComponent {
         <div className="flexTopMarketplace">
           {this.props.backButton ? (
             <div className="returnButton" onClick={this.props.clickEffect}>
-              <Tooltip title="back" key="backArrow">
+              <Tooltip title={getMessage('modals.main.navbar.marketplace.product.buttons.back')} key="backArrow">
                 <MdArrowBack className="backArrow" />
               </Tooltip>
             </div>
diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx
index 2a51f8b2..18297427 100644
--- a/src/components/modals/main/settings/sections/Changelog.jsx
+++ b/src/components/modals/main/settings/sections/Changelog.jsx
@@ -109,7 +109,7 @@ export default class Changelog extends PureComponent {
       return errorMessage(
         <div className="loaderHolder">
           <div id="loader"></div>
-          <span className="subtitle">Loading</span>
+          <span className="subtitle">{getMessage('modals.main.loading')}</span>
         </div>,
       );
     }
diff --git a/src/components/modals/main/settings/sections/Time.jsx b/src/components/modals/main/settings/sections/Time.jsx
index a0dbc0f6..8992438c 100644
--- a/src/components/modals/main/settings/sections/Time.jsx
+++ b/src/components/modals/main/settings/sections/Time.jsx
@@ -29,6 +29,7 @@ export default class TimeSettings extends PureComponent {
       <SettingsItem
         title={getMessage('modals.main.settings.sections.time.digital.title')}
         subtitle={getMessage('modals.main.settings.sections.time.digital.subtitle')}
+        final={true}
       >
         <Radio
           name="timeformat"
@@ -62,6 +63,7 @@ export default class TimeSettings extends PureComponent {
       <SettingsItem
         title={getMessage('modals.main.settings.sections.time.analogue.title')}
         subtitle={getMessage('modals.main.settings.sections.time.analogue.subtitle')}
+        final={true}
       >
         <Checkbox
           name="secondHand"
@@ -110,6 +112,7 @@ export default class TimeSettings extends PureComponent {
         <SettingsItem
           title={getMessage('modals.main.settings.sections.time.type')}
           subtitle={getMessage('modals.main.settings.sections.time.type_subtitle')}
+          final={this.state.timeType === 'percentageComplete'}
         >
           <Dropdown
             name="timeType"