diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 0815b4649..bfb35e6d4 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
-
-    <issue
-        id="StopShip"
-        message="`TODO` call found; points to code which must be fixed prior to release"
-        errorLine1="        is Err -> TODO()"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/app/passwordstore/util/viewmodel/PGPKeyListViewModel.kt"
-            line="38"
-            column="19"/>
-    </issue>
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
     <issue
         id="InvalidPackage"
@@ -40,7 +29,7 @@
         errorLine2="                              ~~~~~~~~~~~">
         <location
             file="src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt"
-            line="67"
+            line="69"
             column="31"/>
     </issue>
 
@@ -51,21 +40,10 @@
         errorLine2="                              ~~~~~~~~~~~">
         <location
             file="src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt"
-            line="67"
+            line="69"
             column="31"/>
     </issue>
 
-    <issue
-        id="MissingQuantity"
-        message="For locale &quot;es&quot; (Spanish) the following quantity should also be defined: `many`"
-        errorLine1="  &lt;plurals name=&quot;delete_title&quot;>"
-        errorLine2="  ^">
-        <location
-            file="src/main/res/values-es-rES/strings.xml"
-            line="7"
-            column="3"/>
-    </issue>
-
     <issue
         id="MissingQuantity"
         message="For locale &quot;it&quot; (Italian) the following quantity should also be defined: `many`"
@@ -88,17 +66,6 @@
             column="3"/>
     </issue>
 
-    <issue
-        id="MissingQuantity"
-        message="For locale &quot;es&quot; (Spanish) the following quantity should also be defined: `many`"
-        errorLine1="  &lt;plurals name=&quot;delete_dialog_text&quot;>"
-        errorLine2="  ^">
-        <location
-            file="src/main/res/values-es-rES/strings.xml"
-            line="21"
-            column="3"/>
-    </issue>
-
     <issue
         id="MissingQuantity"
         message="For locale &quot;it&quot; (Italian) the following quantity should also be defined: `many`"
@@ -121,17 +88,6 @@
             column="3"/>
     </issue>
 
-    <issue
-        id="Typos"
-        message="&quot;incluído&quot; is a common misspelling; did you mean &quot;incluido&quot;?"
-        errorLine1="  &lt;string name=&quot;pwgen_no_chars_error&quot;>No se han incluído caracteres&lt;/string>"
-        errorLine2="                                                ^">
-        <location
-            file="src/main/res/values-es-rES/strings.xml"
-            line="132"
-            column="49"/>
-    </issue>
-
     <issue
         id="ConvertToWebp"
         message="One or more images in this project can be converted to the WebP format which typically results in smaller file sizes, even for lossless conversion">
@@ -223,4 +179,26 @@
             column="4"/>
     </issue>
 
+    <issue
+        id="SetTextI18n"
+        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
+        errorLine1="        childCount.text = &quot;$count&quot;"
+        errorLine2="                          ~~~~~~~~">
+        <location
+            file="src/main/java/app/passwordstore/ui/adapters/PasswordItemRecyclerAdapter.kt"
+            line="77"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="SetTextI18n"
+        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
+        errorLine1="        ?.let { proxyPort.setText(&quot;$it&quot;) }"
+        errorLine2="                                  ~~~~~">
+        <location
+            file="src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt"
+            line="49"
+            column="35"/>
+    </issue>
+
 </issues>
diff --git a/autofill-parser/lint-baseline.xml b/autofill-parser/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/autofill-parser/lint-baseline.xml
+++ b/autofill-parser/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/coroutine-utils/lint-baseline.xml b/coroutine-utils/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/coroutine-utils/lint-baseline.xml
+++ b/coroutine-utils/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/crypto/common/lint-baseline.xml b/crypto/common/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/crypto/common/lint-baseline.xml
+++ b/crypto/common/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/crypto/pgpainless/lint-baseline.xml b/crypto/pgpainless/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/crypto/pgpainless/lint-baseline.xml
+++ b/crypto/pgpainless/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/format/common/lint-baseline.xml b/format/common/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/format/common/lint-baseline.xml
+++ b/format/common/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 40d3c380b..118933a0e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.4.2"
+agp = "8.5.0"
 androidxActivity = "1.9.0"
 bouncycastle = "1.78.1"
 coroutines = "1.8.1"
diff --git a/passgen/diceware/lint-baseline.xml b/passgen/diceware/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/passgen/diceware/lint-baseline.xml
+++ b/passgen/diceware/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/passgen/random/lint-baseline.xml b/passgen/random/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/passgen/random/lint-baseline.xml
+++ b/passgen/random/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/sentry-stub/lint-baseline.xml b/sentry-stub/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/sentry-stub/lint-baseline.xml
+++ b/sentry-stub/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>
diff --git a/ui/compose/lint-baseline.xml b/ui/compose/lint-baseline.xml
index ddc2d3f41..b68482a5e 100644
--- a/ui/compose/lint-baseline.xml
+++ b/ui/compose/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
 
 </issues>