diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b7653f1a..1eed1bd1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
         <activity
             android:name=".activity.started.StartedActivity"
             android:noHistory="true"
-            android:theme="@style/NoActionBar">
+            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -25,11 +26,11 @@
         <activity
             android:name=".activity.main.MainActivity"
             android:label="@string/login_title"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize"/>
         <activity
             android:name=".activity.dashboard.DashboardActivity"
             android:label="@string/title_activity_dashboard"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/activity/main/MainActivity.java b/app/src/main/java/io/github/wulkanowy/activity/main/MainActivity.java
index f63c0840..bb1f165d 100644
--- a/app/src/main/java/io/github/wulkanowy/activity/main/MainActivity.java
+++ b/app/src/main/java/io/github/wulkanowy/activity/main/MainActivity.java
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.activity.main;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
@@ -14,7 +14,7 @@ import java.util.LinkedHashMap;
 
 import io.github.wulkanowy.R;
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java b/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java
index 241d832b..2c4c931a 100644
--- a/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java
+++ b/app/src/main/java/io/github/wulkanowy/activity/started/StartedActivity.java
@@ -1,11 +1,11 @@
 package io.github.wulkanowy.activity.started;
 
-import android.app.Activity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 
 import io.github.wulkanowy.R;
 
-public class StartedActivity extends Activity {
+public class StartedActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {