diff --git a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeFieldView.kt b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeFieldView.kt
index b4e22542a..a46db26a3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeFieldView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeFieldView.kt
@@ -20,6 +20,9 @@
 package com.kunzisoft.keepass.view
 
 import android.content.Context
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.StrikethroughSpan
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
@@ -54,14 +57,28 @@ class DateTimeFieldView @JvmOverloads constructor(context: Context,
     }
 
     private fun assignExpiresDateText() {
+        val isExpires = mDateTime.date.before(Date())
+
+        // Show or not the warning icon
         expiresImage.isVisible = if (mActivated) {
-            mDateTime.date.before(Date())
+            isExpires
         } else {
             false
         }
 
+        // Build the datetime string
         dateTimeValueView.text = if (mActivated) {
-            mDateTime.getDateTimeString(resources)
+            val dateTimeString = mDateTime.getDateTimeString(resources)
+            if (isExpires) {
+                // Add strike
+                SpannableString(dateTimeString).apply {
+                    setSpan(StrikethroughSpan(),
+                        0, dateTimeString.length-1,
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                }
+            } else {
+                dateTimeString
+            }
         } else {
             resources.getString(R.string.never)
         }
diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_white_24dp.xml
new file mode 100644
index 000000000..4d1807fe7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning_white_24dp.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+    <path android:fillColor="#ffffff" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
diff --git a/app/src/main/res/layout/view_date_time.xml b/app/src/main/res/layout/view_date_time.xml
index 26202e5a3..28bee5807 100644
--- a/app/src/main/res/layout/view_date_time.xml
+++ b/app/src/main/res/layout/view_date_time.xml
@@ -18,9 +18,9 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_info_white_24dp"
+            android:src="@drawable/ic_warning_white_24dp"
             android:contentDescription="@string/content_description_file_information"
-            android:tint="@color/red"/>
+            android:tint="?android:attr/textColor"/>
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/date_time_value"
             android:layout_width="match_parent"