diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9751b31..50bc110 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,6 +21,10 @@
         android:label="@string/app_name"
         android:logo="@drawable/icsee_logo"
         android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+        <activity
+            android:name=".ICSeeSettingsActivity"
+            android:exported="false"
+            android:label="@string/title_activity_icsee_settings" />
         <activity
             android:name=".SettingsActivity"
             android:exported="false"
@@ -61,7 +65,7 @@
         <activity
             android:name=".camera.ImageView"
             android:label="@string/title_activity_image_edit"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 166d786..da94ba0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
@@ -14,6 +14,9 @@ apply plugin: 'com.android.application'
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
     implementation 'com.quickbirdstudios:opencv:3.4.15'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.6.1'
 }
 
 android {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..d015431
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/res/layout/settings_activity.xml b/res/layout/settings_activity.xml
new file mode 100644
index 0000000..de6591a
--- /dev/null
+++ b/res/layout/settings_activity.xml
@@ -0,0 +1,9 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..6cf9ed4
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,12 @@
+<resources>
+    <!-- Reply Preference -->
+    <string-array name="reply_entries">
+        <item>Reply</item>
+        <item>Reply to all</item>
+    </string-array>
+
+    <string-array name="reply_values">
+        <item>reply</item>
+        <item>reply_all</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93ba1ad..3795f7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,4 +14,19 @@
     <string name="application_logo">Application logo</string>
     <string name="filter_view_http_icsee">icsee_filter</string>
     <string name="settings_about_btn">Settings / About</string>
+    <string name="title_activity_icsee_settings">ICSeeSettingsActivity</string>
+
+    <!-- Preference Titles -->
+    <string name="messages_header">Messages</string>
+    <string name="sync_header">Sync</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Your signature</string>
+    <string name="reply_title">Default reply action</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">Sync email periodically</string>
+    <string name="attachment_title">Download incoming attachments</string>
+    <string name="attachment_summary_on">Automatically download attachments for incoming emails</string>
+    <string name="attachment_summary_off">Only download attachments when manually requested</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/root_preferences.xml b/res/xml/root_preferences.xml
new file mode 100644
index 0000000..67158db
--- /dev/null
+++ b/res/xml/root_preferences.xml
@@ -0,0 +1,35 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory app:title="@string/messages_header">
+
+        <EditTextPreference
+            app:key="signature"
+            app:title="@string/signature_title"
+            app:useSimpleSummaryProvider="true" />
+
+        <ListPreference
+            app:defaultValue="reply"
+            app:entries="@array/reply_entries"
+            app:entryValues="@array/reply_values"
+            app:key="reply"
+            app:title="@string/reply_title"
+            app:useSimpleSummaryProvider="true" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/sync_header">
+
+        <SwitchPreferenceCompat
+            app:key="sync"
+            app:title="@string/sync_title" />
+
+        <SwitchPreferenceCompat
+            app:dependency="sync"
+            app:key="attachment"
+            app:summaryOff="@string/attachment_summary_off"
+            app:summaryOn="@string/attachment_summary_on"
+            app:title="@string/attachment_title" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 97e3e8e..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-// include ':opencv_modules:opencv-android-3.3.1:opencv'
diff --git a/src/gr/scify/icsee/ICSeeSettingsActivity.java b/src/gr/scify/icsee/ICSeeSettingsActivity.java
new file mode 100644
index 0000000..0573577
--- /dev/null
+++ b/src/gr/scify/icsee/ICSeeSettingsActivity.java
@@ -0,0 +1,32 @@
+package gr.scify.icsee;
+
+import android.os.Bundle;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceFragmentCompat;
+
+public class ICSeeSettingsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);
+        if (savedInstanceState == null) {
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .replace(R.id.settings, new SettingsFragment())
+                    .commit();
+        }
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat {
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            setPreferencesFromResource(R.xml.root_preferences, rootKey);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/gr/scify/icsee/ICSeeStartActivity.java b/src/gr/scify/icsee/ICSeeStartActivity.java
index 696dd3a..d202877 100644
--- a/src/gr/scify/icsee/ICSeeStartActivity.java
+++ b/src/gr/scify/icsee/ICSeeStartActivity.java
@@ -11,19 +11,17 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import gr.scify.icsee.camera.ModifiedLoaderCallback;
-import gr.scify.icsee.sounds.SoundPlayer;
+
 import org.opencv.android.LoaderCallbackInterface;
 import org.opencv.android.OpenCVLoader;
 
-import java.util.Locale;
+import gr.scify.icsee.camera.ModifiedLoaderCallback;
+import gr.scify.icsee.sounds.SoundPlayer;
 
 public class ICSeeStartActivity extends Activity {
     protected Context mContext;