diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt
index fbd0e64..cf814d6 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt
@@ -96,6 +96,7 @@ class ClockTabFragment : Fragment() {
     ) {
         binding.isClockVisible = Preferences.showClock
         binding.is24Format = DateFormat.is24HourFormat(requireContext())
+        binding.isDarkModeEnabled = activity?.isDarkTheme() == true
 
         viewModel.showBigClockWarning.observe(viewLifecycleOwner, Observer {
             large_clock_warning?.isVisible = it
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt
index 09b4026..b99d2b6 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt
@@ -65,6 +65,7 @@ class GeneralTabFragment : Fragment() {
 
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
+        binding.isDarkModeEnabled = activity?.isDarkTheme() == true
 
         return binding.root
     }
diff --git a/app/src/main/res/drawable-hdpi/outline_info_white.png b/app/src/main/res/drawable-hdpi/outline_info_white.png
new file mode 100644
index 0000000..192c704
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_white_18.png b/app/src/main/res/drawable-hdpi/outline_info_white_18.png
new file mode 100644
index 0000000..a154eec
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_white_36.png b/app/src/main/res/drawable-hdpi/outline_info_white_36.png
new file mode 100644
index 0000000..bdfef8f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/outline_info_white_48.png b/app/src/main/res/drawable-hdpi/outline_info_white_48.png
new file mode 100644
index 0000000..b9f48c7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/outline_info_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_white.png b/app/src/main/res/drawable-mdpi/outline_info_white.png
new file mode 100644
index 0000000..b4128d1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_white_18.png b/app/src/main/res/drawable-mdpi/outline_info_white_18.png
new file mode 100644
index 0000000..f0e0344
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_white_36.png b/app/src/main/res/drawable-mdpi/outline_info_white_36.png
new file mode 100644
index 0000000..192c704
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/outline_info_white_48.png b/app/src/main/res/drawable-mdpi/outline_info_white_48.png
new file mode 100644
index 0000000..b5df33e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/outline_info_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_white.png b/app/src/main/res/drawable-xhdpi/outline_info_white.png
new file mode 100644
index 0000000..b5df33e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_white_18.png b/app/src/main/res/drawable-xhdpi/outline_info_white_18.png
new file mode 100644
index 0000000..192c704
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_white_36.png b/app/src/main/res/drawable-xhdpi/outline_info_white_36.png
new file mode 100644
index 0000000..b9f48c7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/outline_info_white_48.png b/app/src/main/res/drawable-xhdpi/outline_info_white_48.png
new file mode 100644
index 0000000..16cbced
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/outline_info_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_white.png b/app/src/main/res/drawable-xxhdpi/outline_info_white.png
new file mode 100644
index 0000000..b9f48c7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_white_18.png b/app/src/main/res/drawable-xxhdpi/outline_info_white_18.png
new file mode 100644
index 0000000..bdfef8f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_white_36.png b/app/src/main/res/drawable-xxhdpi/outline_info_white_36.png
new file mode 100644
index 0000000..ab4cf9e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/outline_info_white_48.png b/app/src/main/res/drawable-xxhdpi/outline_info_white_48.png
new file mode 100644
index 0000000..a460db5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/outline_info_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_white.png b/app/src/main/res/drawable-xxxhdpi/outline_info_white.png
new file mode 100644
index 0000000..16cbced
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_white_18.png b/app/src/main/res/drawable-xxxhdpi/outline_info_white_18.png
new file mode 100644
index 0000000..b9f48c7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_white_36.png b/app/src/main/res/drawable-xxxhdpi/outline_info_white_36.png
new file mode 100644
index 0000000..a460db5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/outline_info_white_48.png b/app/src/main/res/drawable-xxxhdpi/outline_info_white_48.png
new file mode 100644
index 0000000..eb6d3fc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/outline_info_white_48.png differ
diff --git a/app/src/main/res/drawable/outline_info_24.xml b/app/src/main/res/drawable/outline_info_24.xml
new file mode 100644
index 0000000..35f7f5f
--- /dev/null
+++ b/app/src/main/res/drawable/outline_info_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_clock_settings.xml b/app/src/main/res/layout/fragment_clock_settings.xml
index 9e1f1ae..d3d4afb 100644
--- a/app/src/main/res/layout/fragment_clock_settings.xml
+++ b/app/src/main/res/layout/fragment_clock_settings.xml
@@ -11,6 +11,9 @@
             name="is24Format"
             type="Boolean" />
         <import type="android.view.View" />
+        <variable
+            name="isDarkModeEnabled"
+            type="Boolean" />
     </data>
     <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -184,7 +187,8 @@
                         android:src="@drawable/round_palette"
                         app:tint="@color/colorPrimaryText"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
@@ -200,6 +204,27 @@
                             android:id="@+id/clock_text_color_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:cardCornerRadius="4dp"
+                        android:visibility="@{isDarkModeEnabled ? View.VISIBLE : View.GONE}"
+                        android:layout_gravity="center_vertical"
+                        app:cardBackgroundColor="@color/colorPrimary"
+                        android:layout_marginEnd="8dp"
+                        app:cardElevation="0dp">
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/colorPrimaryText"
+                            android:textSize="12sp"
+                            android:paddingTop="4dp"
+                            android:paddingBottom="4dp"
+                            android:paddingStart="8dp"
+                            android:paddingEnd="8dp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                            android:text="@string/settings_subtitle_dark_theme_dark"/>
+                    </androidx.cardview.widget.CardView>
                 </LinearLayout>
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
@@ -349,18 +374,24 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/small_clock_warning"
-                    android:orientation="vertical">
+                    android:padding="10dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="24dp"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:padding="10dp"
+                        android:src="@drawable/outline_info_24"
+                        app:tint="@color/colorSecondaryText"/>
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingTop="16dp"
-                        android:paddingLeft="24dp"
-                        android:paddingRight="24dp"
-                        android:paddingBottom="32dp"
                         android:duplicateParentState="true"
                         android:textSize="14sp"
+                        android:layout_marginTop="8dp"
                         android:text="@string/clock_warning"
-                        android:textColor="@color/colorPrimaryText"
+                        android:textColor="@color/colorSecondaryText"
                         android:letterSpacing="0"
                         android:fontFamily="@font/product_sans"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
index bda407f..97e135d 100644
--- a/app/src/main/res/layout/fragment_general_settings.xml
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -5,6 +5,10 @@
         <variable
             name="viewModel"
             type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
+        <variable
+            name="isDarkModeEnabled"
+            type="Boolean" />
+        <import type="android.view.View" />
     </data>
     <com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
         android:layout_width="match_parent"
@@ -111,6 +115,7 @@
                     android:layout_gravity="center_vertical"
                     app:cardBackgroundColor="@color/colorPrimary"
                     android:layout_marginEnd="8dp"
+                    android:visibility="@{isDarkModeEnabled ? View.VISIBLE : View.GONE}"
                     app:cardElevation="0dp">
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
@@ -254,6 +259,7 @@
                     app:cardCornerRadius="4dp"
                     android:layout_gravity="center_vertical"
                     app:cardBackgroundColor="@color/colorPrimary"
+                    android:visibility="@{isDarkModeEnabled ? View.VISIBLE : View.GONE}"
                     android:layout_marginEnd="8dp"
                     app:cardElevation="0dp">
                     <androidx.appcompat.widget.AppCompatTextView
@@ -360,6 +366,7 @@
                     android:layout_height="wrap_content"
                     app:cardCornerRadius="4dp"
                     android:layout_gravity="center_vertical"
+                    android:visibility="@{isDarkModeEnabled ? View.VISIBLE : View.GONE}"
                     app:cardBackgroundColor="@color/colorPrimary"
                     android:layout_marginEnd="8dp"
                     app:cardElevation="0dp">
@@ -514,6 +521,7 @@
                     app:cardCornerRadius="4dp"
                     android:layout_gravity="center_vertical"
                     app:cardBackgroundColor="@color/colorPrimary"
+                    android:visibility="@{isDarkModeEnabled ? View.VISIBLE : View.GONE}"
                     android:layout_marginEnd="8dp"
                     app:cardElevation="0dp">
                     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/fragment_glance_settings.xml b/app/src/main/res/layout/fragment_glance_settings.xml
index 2e43270..0023b3a 100644
--- a/app/src/main/res/layout/fragment_glance_settings.xml
+++ b/app/src/main/res/layout/fragment_glance_settings.xml
@@ -362,18 +362,24 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/small_clock_warning"
-                    android:orientation="vertical">
+                    android:padding="10dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="24dp"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:padding="10dp"
+                        android:src="@drawable/outline_info_24"
+                        app:tint="@color/colorSecondaryText"/>
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingTop="16dp"
-                        android:paddingLeft="24dp"
-                        android:paddingRight="24dp"
-                        android:paddingBottom="32dp"
                         android:duplicateParentState="true"
                         android:textSize="14sp"
+                        android:layout_marginTop="8dp"
                         android:text="@string/glance_info"
-                        android:textColor="@color/colorPrimaryText"
+                        android:textColor="@color/colorSecondaryText"
                         android:letterSpacing="0"
                         android:fontFamily="@font/product_sans"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"