diff --git a/app/src/main/res/drawable/lockscreen_clock_58_bg1.xml b/app/src/main/res/drawable/lockscreen_clock_58_bg1.xml
new file mode 100644
index 000000000..d2e6179d9
--- /dev/null
+++ b/app/src/main/res/drawable/lockscreen_clock_58_bg1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <size android:width="252sp"
+      android:height="252sp"/>
+
+    <corners android:radius="999sp"/>
+
+    <solid android:color="@color/colorPrimaryDark"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/lockscreen_clock_58_bg3.xml b/app/src/main/res/drawable/lockscreen_clock_58_bg3.xml
new file mode 100644
index 000000000..ea76c52ab
--- /dev/null
+++ b/app/src/main/res/drawable/lockscreen_clock_58_bg3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="108dp"
+        android:width="108dp"/>
+
+    <corners android:radius="999sp"/>
+
+    <solid android:color="@color/colorSecondaryContainerDark"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/lockscreen_clock_58_stroke.xml b/app/src/main/res/drawable/lockscreen_clock_58_stroke.xml
new file mode 100644
index 000000000..a9ef92d0a
--- /dev/null
+++ b/app/src/main/res/drawable/lockscreen_clock_58_stroke.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="250sp"
+        android:height="250sp"/>
+
+    <corners android:radius="999sp"/>
+
+    <stroke android:color="@color/colorPrimaryDark"
+        android:width="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/font/general_sans.ttf b/app/src/main/res/font/general_sans.ttf
new file mode 100644
index 000000000..65b0dabc1
Binary files /dev/null and b/app/src/main/res/font/general_sans.ttf differ
diff --git a/app/src/main/res/layout/preview_lockscreen_clock_58.xml b/app/src/main/res/layout/preview_lockscreen_clock_58.xml
new file mode 100644
index 000000000..f819645b3
--- /dev/null
+++ b/app/src/main/res/layout/preview_lockscreen_clock_58.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tag="accent1"
+            android:src="@drawable/lockscreen_clock_58_stroke"
+            android:layout_marginTop="60dp"
+            android:layout_marginStart="50dp"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tag="accent1"
+            android:background="@drawable/lockscreen_clock_58_bg1"
+            android:gravity="center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/general_sans"
+                android:format12Hour="hh"
+                android:tag="text1|nolineheight"
+                android:textColor="@color/colorOnPrimaryContainerLight"
+                android:format24Hour="HH"
+                android:textSize="111sp"
+                android:textStyle="bold" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="mm"
+                android:format24Hour="MM"
+                android:fontFamily="@font/general_sans"
+                android:textSize="47sp"
+                android:tag="text1|nolineheight"
+                android:textColor="@color/colorOnTertiaryDark"
+                android:textStyle="bold"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="23dp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="140dp"
+            android:layout_marginTop="270dp"
+            android:gravity="center"
+            android:background="@drawable/lockscreen_clock_58_bg3"
+            android:tag="accent2">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/general_sans"
+                android:format12Hour="dd MMM"
+                android:gravity="center"
+                android:tag="text1|nolineheight"
+                android:textAllCaps="true"
+                android:textColor="@color/colorOnSecondaryContainerDark"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginStart="270dp"
+            android:layout_marginTop="121dp"
+            android:background="@drawable/lockscreen_clock_58_bg3"
+            android:gravity="center"
+            android:tag="accent2">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/general_sans"
+                android:format12Hour="ss"
+                android:gravity="center"
+                android:tag="text1|nolineheight"
+                android:textAllCaps="true"
+                android:textColor="@color/colorOnSecondaryContainerDark"
+                android:textSize="20sp" />
+
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
\ No newline at end of file