diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
index 0be6eb712..b542fc072 100644
--- a/src/routes/Settings/Settings.js
+++ b/src/routes/Settings/Settings.js
@@ -118,7 +118,14 @@ const Settings = () => {
                     <Button className={classnames(styles['side-menu-button'], { [styles['selected']]: selectedSectionId === STREAMING_SECTION })} data-section={STREAMING_SECTION} onClick={sideMenuButtonOnClick}>
                         Streaming server
                     </Button>
-                    {process.env.version}
+                    <div className={styles['spacing']} />
+                    <div className={styles['version-info-label']}>App Version: {process.env.version}</div>
+                    {
+                        streaminServer.type === 'Ready' ?
+                            <div className={styles['version-info-label']}>Server Version: {streaminServer.settings.serverVersion}</div>
+                            :
+                            null
+                    }
                 </div>
                 <div ref={sectionsContainerRef} className={styles['sections-container']} onScroll={sectionsContainerOnScorll}>
                     <div ref={generalSectionRef} className={styles['section-container']}>
@@ -170,15 +177,6 @@ const Settings = () => {
                                 <div className={styles['label']}>Addons</div>
                             </Button>
                         </div>
-                        <div className={styles['option-container']}>
-                            <div className={styles['option-name-container']}>
-                                <div className={styles['label']}>Interface language</div>
-                            </div>
-                            <Multiselect
-                                className={classnames(styles['option-input-container'], styles['multiselect-container'])}
-                                {...interfaceLanguageSelect}
-                            />
-                        </div>
                         <div className={styles['option-container']}>
                             <div className={styles['option-name-container']}>
                                 <div className={styles['label']}>Trakt Scrobbling</div>
@@ -206,6 +204,15 @@ const Settings = () => {
                                 <div className={styles['label']}>Subscribe</div>
                             </Button>
                         </div>
+                        <div className={styles['option-container']}>
+                            <div className={styles['option-name-container']}>
+                                <div className={styles['label']}>Interface language</div>
+                            </div>
+                            <Multiselect
+                                className={classnames(styles['option-input-container'], styles['multiselect-container'])}
+                                {...interfaceLanguageSelect}
+                            />
+                        </div>
                         <div className={styles['option-container']}>
                             <Button className={classnames(styles['option-input-container'], styles['link-container'])} title={'Export user data'} onClick={exportDataOnClick}>
                                 <div className={styles['label']}>Export user data</div>
diff --git a/src/routes/Settings/styles.less b/src/routes/Settings/styles.less
index 26d5289e9..9757d578e 100644
--- a/src/routes/Settings/styles.less
+++ b/src/routes/Settings/styles.less
@@ -49,6 +49,15 @@
                     background-color: var(--color-surface20);
                 }
             }
+
+            .spacing {
+                flex: 1;
+            }
+
+            .version-info-label {
+                margin: 0.5rem 0;
+                color: var(--color-surfacelight);
+            }
         }
 
         .sections-container {