diff --git a/godtools/App/Features/AppLanguage/Data-DomainInterface/GetDownloadedLanguagesListRepository.swift b/godtools/App/Features/AppLanguage/Data-DomainInterface/GetDownloadedLanguagesListRepository.swift
index e333a481ae..cdf079bcf1 100644
--- a/godtools/App/Features/AppLanguage/Data-DomainInterface/GetDownloadedLanguagesListRepository.swift
+++ b/godtools/App/Features/AppLanguage/Data-DomainInterface/GetDownloadedLanguagesListRepository.swift
@@ -50,7 +50,7 @@ class GetDownloadedLanguagesListRepository: GetDownloadedLanguagesListRepository
                 return DownloadedLanguageListItemDomainModel(
                     languageId: language.id,
                     languageCode: language.code,
-                    languageNameInOwnLanguage: languageNameInAppLanguage,
+                    languageNameInOwnLanguage: languageNameInOwnLanguage,
                     languageNameInAppLanguage: languageNameInAppLanguage
                 )
             }
diff --git a/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/Subviews/ToolLanguageAvailableOfflineLanguageView.swift b/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/Subviews/ToolLanguageAvailableOfflineLanguageView.swift
index ad45c4ac93..c1b6335403 100644
--- a/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/Subviews/ToolLanguageAvailableOfflineLanguageView.swift
+++ b/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/Subviews/ToolLanguageAvailableOfflineLanguageView.swift
@@ -20,25 +20,15 @@ struct ToolLanguageAvailableOfflineLanguageView: View {
         
         VStack(alignment: .leading, spacing: 0) {
             
-            HStack(alignment: .center, spacing: 0) {
+            HStack(alignment: .center, spacing: 11) {
             
-                HStack(alignment: .center, spacing: 11) {
-                    
-                    Text(downloadedLanguage.languageNameInOwnLanguage)
-                        .font(FontLibrary.sfProTextRegular.font(size: 17))
-                        .foregroundColor(ColorPalette.gtGrey.color)
-                        .multilineTextAlignment(.leading)
-                    
-                    Text(downloadedLanguage.languageNameInAppLanguage)
-                        .font(FontLibrary.sfProTextRegular.font(size: 17))
-                        .foregroundColor(Color.getColorWithRGB(red: 151, green: 151, blue: 151, opacity: 1))
-                        .multilineTextAlignment(.leading)
-                }
-                
-                Spacer()
+                Text(downloadedLanguage.languageNameInOwnLanguage)
+                    .font(FontLibrary.sfProTextRegular.font(size: 17))
+                    .foregroundColor(ColorPalette.gtGrey.color)
+                    .multilineTextAlignment(.leading)
                 
-                Text("108.3 MB")
-                    .font(FontLibrary.sfProTextRegular.font(size: 14))
+                Text(downloadedLanguage.languageNameInAppLanguage)
+                    .font(FontLibrary.sfProTextRegular.font(size: 17))
                     .foregroundColor(Color.getColorWithRGB(red: 151, green: 151, blue: 151, opacity: 1))
                     .multilineTextAlignment(.leading)
             }
diff --git a/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/ToolLanguagesAvailableOfflineView.swift b/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/ToolLanguagesAvailableOfflineView.swift
index c4c6de0366..f25e2ba84d 100644
--- a/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/ToolLanguagesAvailableOfflineView.swift
+++ b/godtools/App/Features/AppLanguage/Presentation/LanguageSettings/Subviews/ToolLanguagesAvailableOffline/ToolLanguagesAvailableOfflineView.swift
@@ -40,28 +40,40 @@ struct ToolLanguagesAvailableOfflineView: View {
             SeparatorView()
                 .padding([.top], 11)
             
-            ScrollView(.vertical, showsIndicators: true) {
+            GeometryReader { scrollViewGeometry in
                 
-                VStack(alignment: .leading, spacing: 0) {
+                let buttonHeight: CGFloat = 50
+                let spaceBelowScrollView: CGFloat = 25
+                let scrollViewMaxHeight: CGFloat = scrollViewGeometry.size.height - buttonHeight - spaceBelowScrollView
+                
+                VStack(alignment: .leading, spacing: spaceBelowScrollView) {
                     
-                    ForEach(viewModel.downloadedLanguages) { downloadedLanguage in
+                    ScrollView(.vertical, showsIndicators: true) {
                         
-                        ToolLanguageAvailableOfflineLanguageView(downloadedLanguage: downloadedLanguage)
+                        VStack(alignment: .leading, spacing: 0) {
+                            
+                            ForEach(viewModel.downloadedLanguages) { downloadedLanguage in
+                                
+                                ToolLanguageAvailableOfflineLanguageView(downloadedLanguage: downloadedLanguage)
+                            }
+                        }
                     }
+                    .frame(maxHeight: scrollViewMaxHeight)
+                    .fixedSize(horizontal: false, vertical: true)
+                    
+                    GTBlueButton(
+                        title: viewModel.editDownloadedLanguagesButtonTitle,
+                        font: FontLibrary.sfProTextRegular.font(size: 14),
+                        width: geometry.size.width - (contentHorizontalInsets * 2),
+                        height: buttonHeight,
+                        action: {
+                            
+                            viewModel.editDownloadedLanguagesTapped()
+                        }
+                    )
                 }
             }
             
-            GTBlueButton(
-                title: viewModel.editDownloadedLanguagesButtonTitle,
-                font: FontLibrary.sfProTextRegular.font(size: 14),
-                width: geometry.size.width - (contentHorizontalInsets * 2),
-                height: 50,
-                action: {
-                    
-                    viewModel.editDownloadedLanguagesTapped()
-                }
-            )
-            .padding([.top], 25)
         }
         .padding([.leading, .trailing], contentHorizontalInsets)
     }