diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json
index c7daa7ff73..ed4bb887ed 100644
--- a/android/assets/jsons/Translations/Buildings.json
+++ b/android/assets/jsons/Translations/Buildings.json
@@ -298,7 +298,7 @@
 		German:"Kostenloser Solzialgrundsatz"
 		Dutch:"Gratis sociaalbeleid"
 		Spanish:"Política social gratis"
-		Simplified_Chinese:"获得1次免费推行社会政策的机会"
+		Simplified_Chinese:"可免费推行1项社会政策"
 		Portuguese:"Politica social gratis"
 		Polish:"Darmowy ustrój społeczny"
 	}
diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
index 1d33407bf3..d792b3cb28 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
@@ -125,9 +125,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
                 civTech.isResearched(techName) && techName!="Future Tech" -> techButton.color = researchedTechColor
                 tempTechsToResearch.isNotEmpty() && tempTechsToResearch.first() == techName -> techButton.color = currentTechColor
                 tempTechsToResearch.contains(techName) -> techButton.color = queuedTechColor
-                researchableTechs.contains(techName) -> techButton.color = researchableTechColor
                 else -> techButton.color = Color.BLACK
             }
+            //the tech that can be selected to research immediately should be always researchableTechColor, it's very good when we pick a free tech.
+            if (researchableTechs.contains(techName)&&!civTech.isResearched(techName)) techButton.color = researchableTechColor
 
             var text = techName.tr()
 
@@ -161,11 +162,11 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
 
         if (isFreeTechPick) {
             selectTechnologyForFreeTech(tech)
+            setButtonsInfo()
             return
         }
 
         if (civTech.isResearched(tech.name) && tech.name != "Future Tech") {
-            rightSideButton.setText("Pick a tech".tr())
             rightSideButton.disable()
             setButtonsInfo()
             return