diff --git a/lib/layouttranslations b/lib/layouttranslations
index 1fb2912115..2c9f81c990 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -401,10 +401,10 @@ End
 Translation fi
 	"Acknowledgement" "Kiitos"
 	"Algorithm" "Algoritmi"
-	"Assumption" "Assumption"
+	"Assumption" "Oletus"
 	"Axiom" "Aksiooma"
 	"Case" "Tapaus"
-	"Chart" "Chart"
+	"Chart" "Kaavio"
 	"Claim" "Väite"
 	"Conclusion" "Päätelmä"
 	"Condition" "Ehto"
@@ -415,13 +415,13 @@ Translation fi
 	"Example" "Esimerkki"
 	"Exercise" "Harjoitus"
 	"Fact" "Fakta"
-	"Graph" "Graph"
+	"Graph" "Kuvaaja"
 	"Lemma" "Lemma"
 	"List of Algorithms" "Algoritmien taulukko"
-	"List of Charts" "List of Charts"
-	"List of Graphs" "List of Graphs"
-	"List of Schemes" "List of Schemes"
-	"List of Tableaux" "List of Tableaux"
+	"List of Charts" "Kaavioiden luettelo"
+	"List of Graphs" "Kuvaajien luettelo"
+	"List of Schemes" "Kuvausten lettelo"
+	"List of Tableaux" "Taulujen luettelo"
 	"Notation" "Merkintätapa"
 	"Note" "Muistiinpano"
 	"Problem" "Ongelma"
@@ -430,10 +430,10 @@ Translation fi
 	"Proposition" "Väittämä"
 	"Question" "Kysymys"
 	"Remark" "Huomautus"
-	"Scheme" "Scheme"
+	"Scheme" "Kuvaus"
 	"Solution" "Ratkaisu"
 	"Summary" "Yhteenveto"
-	"Tableau" "Tableau"
+	"Tableau" "Taulu"
 	"Theorem" "Lause"
 End
 
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index c3444ba10b..3b3d219500 100644
--- a/lib/layouttranslations.review
+++ b/lib/layouttranslations.review
@@ -8,7 +8,6 @@ ar
 bg
 ca
 el
-fi
 gl
 ko
 ru (Acknowledgement string issue only)
@@ -21,3 +20,4 @@ zh_TW
 Before LyX 2.1.0 release these strings should be reviewed again by the translators:
 "Property"
 "Solution"
+already checked: fi
diff --git a/po/fi.po b/po/fi.po
index 5ba4b86365..72b08d2506 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6647,34 +6647,28 @@ msgid "Phone"
 msgstr "Puhelin"
 
 #: lib/layouts/achemso.layout:122 lib/layouts/achemso.layout:133
-#, fuzzy
 msgid "Scheme"
-msgstr "Kohtaus"
+msgstr "Kuvaus"
 
 #: lib/layouts/achemso.layout:127
-#, fuzzy
 msgid "List of Schemes"
-msgstr "Taulukoiden luettelo"
+msgstr "Kuvausten lettelo"
 
 #: lib/layouts/achemso.layout:144 lib/layouts/achemso.layout:155
-#, fuzzy
 msgid "Chart"
-msgstr "hat"
+msgstr "Kaavio"
 
 #: lib/layouts/achemso.layout:149
-#, fuzzy
 msgid "List of Charts"
-msgstr "Taulukoiden luettelo"
+msgstr "Kaavioiden luettelo"
 
 #: lib/layouts/achemso.layout:166 lib/layouts/achemso.layout:177
-#, fuzzy
 msgid "Graph"
-msgstr "Kuva"
+msgstr "Kuvaaja"
 
 #: lib/layouts/achemso.layout:171
-#, fuzzy
 msgid "List of Graphs"
-msgstr "Taulukoiden luettelo"
+msgstr "Kuvaajien luettelo"
 
 #: lib/layouts/achemso.layout:215
 #, fuzzy
@@ -11505,14 +11499,12 @@ msgid "meaning"
 msgstr "Aloitus"
 
 #: lib/layouts/linguistics.module:168
-#, fuzzy
 msgid "Tableau"
-msgstr "Taulukko"
+msgstr "Taulu"
 
 #: lib/layouts/linguistics.module:173
-#, fuzzy
 msgid "List of Tableaux"
-msgstr "Taulukoiden luettelo"
+msgstr "Taulujen luettelo"
 
 #: lib/layouts/logicalmkup.module:2
 #, fuzzy
@@ -11826,23 +11818,21 @@ msgstr "Päätelmä."
 #: lib/layouts/theorems-ams-extended.module:371
 #: lib/layouts/theorems-ams-extended.module:374
 msgid "Assumption"
-msgstr ""
+msgstr "Oletus"
 
 #: lib/layouts/theorems-ams-extended-bytype.module:377
-#, fuzzy
 msgid "Assumption \\theassumption."
-msgstr "Kysymys \\arabic{question}."
+msgstr "Oletus \\theassumption."
 
 #: lib/layouts/theorems-ams-extended-bytype.module:392
 #: lib/layouts/theorems-ams-extended.module:362
 msgid "Assumption*"
-msgstr ""
+msgstr "Oletus*"
 
 #: lib/layouts/theorems-ams-extended-bytype.module:395
 #: lib/layouts/theorems-ams-extended.module:365
-#, fuzzy
 msgid "Assumption."
-msgstr "Kuvateksti"
+msgstr "Oletus."
 
 #: lib/layouts/theorems-ams-extended.module:2
 msgid "Theorems (AMS-Extended)"
@@ -11908,9 +11898,8 @@ msgid "Conclusion \\thetheorem."
 msgstr "Päätelmä."
 
 #: lib/layouts/theorems-ams-extended.module:348
-#, fuzzy
 msgid "Assumption \\thetheorem."
-msgstr "Aksiooma @Section@.\\arabic{theorem}."
+msgstr "Oletus \\thetheorem."
 
 #: lib/layouts/theorems-ams-extended.module:382
 #, fuzzy