diff --git a/build.gradle b/build.gradle
index 338c367..be728c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     compile project(':nrzandroidlib')
     compile 'com.android.support:support-v13:23.+'
     compile 'com.android.support:appcompat-v7:23.+'
+    compile 'com.android.support:design:23.+'
     compile 'in.srain.cube:ultra-ptr:1.0.11'
     compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
 }
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
index 8a64d64..efddf0b 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
@@ -22,7 +22,6 @@ import android.accounts.AccountManager;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
@@ -30,6 +29,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
@@ -53,7 +53,7 @@ import fr.unix_experience.owncloud_sms.enums.LoginReturnCode;
  * A login screen that offers login via email/password.
  */
 @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-public class LoginActivity extends Activity {
+public class LoginActivity extends AppCompatActivity {
 	/**
 	 * Keep track of the login task to ensure we can cancel it if requested.
 	 */
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
index 41afe01..3fb03c4 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
@@ -25,7 +25,6 @@ package fr.unix_experience.owncloud_sms.activities;
  * SUCH DAMAGE.
  */
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.Context;
@@ -36,6 +35,7 @@ import android.provider.Settings;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -53,7 +53,7 @@ import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor;
 import fr.unix_experience.owncloud_sms.engine.SmsFetcher;
 import fr.unix_experience.owncloud_sms.notifications.OCSMSNotificationManager;
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
 
 	/**
 	 * The {@link android.support.v4.view.PagerAdapter} that will provide
diff --git a/src/main/res/layout/activity_login.xml b/src/main/res/layout/activity_login.xml
index b39db10..b353afe 100644
--- a/src/main/res/layout/activity_login.xml
+++ b/src/main/res/layout/activity_login.xml
@@ -26,7 +26,6 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:gravity="center_horizontal"
@@ -76,38 +75,50 @@
 				    android:layout_height="wrap_content"
 				    android:entries="@array/protocol_array">
 	            </Spinner>
-	            
-	            <EditText
-	                android:id="@+id/oc_server"
-	                android:layout_width="fill_parent"
-	                android:layout_height="wrap_content"
-	                android:hint="@string/prompt_serverURI"
-	                android:inputType="textUri" >
-					<requestFocus />
-	            </EditText>
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <EditText
+                        android:id="@+id/oc_server"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_serverURI"
+                        android:inputType="textUri" >
+                        <requestFocus />
+                    </EditText>
+                </android.support.design.widget.TextInputLayout>
             
             </LinearLayout>
 
-            <AutoCompleteTextView
-                android:id="@+id/oc_login"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/prompt_login"
-                android:inputType="textEmailAddress"
-                android:maxLines="1"
-                android:singleLine="true" />
+           <android.support.design.widget.TextInputLayout
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content">
+                <AutoCompleteTextView
+                    android:id="@+id/oc_login"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/prompt_login"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+           </android.support.design.widget.TextInputLayout>
 
-            <EditText
-                android:id="@+id/oc_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/prompt_password"
-                android:imeActionId="@+id/oc_login"
-                android:imeActionLabel="@string/action_sign_in_short"
-                android:imeOptions="actionUnspecified"
-                android:inputType="textPassword"
-                android:maxLines="1"
-                android:singleLine="true" />
+           <android.support.design.widget.TextInputLayout
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content">
+                <EditText
+                    android:id="@+id/oc_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/prompt_password"
+                    android:imeActionId="@+id/oc_login"
+                    android:imeActionLabel="@string/action_sign_in_short"
+                    android:imeOptions="actionUnspecified"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+           </android.support.design.widget.TextInputLayout>
 
            <com.dd.processbutton.iml.ActionProcessButton
                 android:id="@+id/oc_signin_button"
diff --git a/src/main/res/values-v14/styles.xml b/src/main/res/values-v14/styles.xml
index 82b32dc..2c6c6ee 100644
--- a/src/main/res/values-v14/styles.xml
+++ b/src/main/res/values-v14/styles.xml
@@ -27,7 +27,7 @@
 
 <resources>
 
-    <style name="OcSmsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+    <style name="OcSmsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/OcSmsActionBar</item>
 	</style>
 	
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index dde6942..c7d3e0c 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
 -->
 
 <resources>
-    <style name="AppBaseTheme" parent="@android:style/Theme.Holo.Light">
+    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
     </style>
 
     <!-- Application theme. -->