68 files changed, 175 insertions, 11 deletions
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 38fc957e..3b0908d5 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
 
     <application
         android:allowBackup="true"
-        android:theme="@android:style/Theme.DeviceDefault.Light"
+        android:theme="@style/appstyle"
         android:icon="@drawable/icon"
         android:label="@string/app"
         android:name=".core.ICSOpenVPNApplication"
diff --git a/main/src/main/res/drawable-hdpi/ic_add_circle_outline_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_add_circle_outline_white_48dp.png
new file mode 100644
index 00000000..7ae1b4a1
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_add_circle_outline_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_archive_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_archive_white_48dp.png
new file mode 100644
index 00000000..aa186ce5
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_archive_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_check_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_check_white_48dp.png
new file mode 100644
index 00000000..6e03d54c
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_check_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_clear_all_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_clear_all_white_48dp.png
new file mode 100644
index 00000000..951843cb
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_clear_all_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_close_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_close_white_48dp.png
new file mode 100644
index 00000000..0eb9d8b0
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_close_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..0e95e9b1
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..34ec7092
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_filter_list_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_filter_list_white_48dp.png
new file mode 100644
index 00000000..802b3cd5
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_filter_list_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-hdpi/ic_settings_grey600_48dp.png
new file mode 100644
index 00000000..6a70402b
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_settings_grey600_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_share_white_48dp.png b/main/src/main/res/drawable-hdpi/ic_share_white_48dp.png
new file mode 100644
index 00000000..9963c6a0
--- /dev/null
+++ b/main/src/main/res/drawable-hdpi/ic_share_white_48dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_sysbar_quicksettings.png b/main/src/main/res/drawable-hdpi/vpn_item_settings.png
index 47b4ba23..47b4ba23 100644
--- a/main/src/main/res/drawable-hdpi/ic_sysbar_quicksettings.png
+++ b/main/src/main/res/drawable-hdpi/vpn_item_settings.png
diff --git a/main/src/main/res/drawable-mdpi/ic_add_circle_outline_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_add_circle_outline_white_48dp.png
new file mode 100644
index 00000000..0399d60a
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_add_circle_outline_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_archive_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_archive_white_48dp.png
new file mode 100644
index 00000000..08228d1f
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_archive_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_check_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_check_white_48dp.png
new file mode 100644
index 00000000..e5024472
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_check_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_clear_all_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_clear_all_white_48dp.png
new file mode 100644
index 00000000..ffca75a7
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_clear_all_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_close_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_close_white_48dp.png
new file mode 100644
index 00000000..76e07f09
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_close_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..cdb230c2
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..7f0ea51b
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_filter_list_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_filter_list_white_48dp.png
new file mode 100644
index 00000000..d4ca77bf
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_filter_list_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-mdpi/ic_settings_grey600_48dp.png
new file mode 100644
index 00000000..2251d2bb
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_settings_grey600_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_share_white_48dp.png b/main/src/main/res/drawable-mdpi/ic_share_white_48dp.png
new file mode 100644
index 00000000..dd536bca
--- /dev/null
+++ b/main/src/main/res/drawable-mdpi/ic_share_white_48dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_sysbar_quicksettings.png b/main/src/main/res/drawable-mdpi/vpn_item_settings.png
index 79281042..79281042 100644
--- a/main/src/main/res/drawable-mdpi/ic_sysbar_quicksettings.png
+++ b/main/src/main/res/drawable-mdpi/vpn_item_settings.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_white_48dp.png
new file mode 100644
index 00000000..1d436703
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png
new file mode 100644
index 00000000..9d538ff4
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_check_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_check_white_48dp.png
new file mode 100644
index 00000000..87892840
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_check_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_clear_all_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_clear_all_white_48dp.png
new file mode 100644
index 00000000..215d33d9
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_clear_all_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_close_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_close_white_48dp.png
new file mode 100644
index 00000000..7b2a480a
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_close_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..ccf8c716
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..9380370f
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_filter_list_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_filter_list_white_48dp.png
new file mode 100644
index 00000000..511008ce
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_filter_list_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-xhdpi/ic_settings_grey600_48dp.png
new file mode 100644
index 00000000..5eba9e8e
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_settings_grey600_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_share_white_48dp.png b/main/src/main/res/drawable-xhdpi/ic_share_white_48dp.png
new file mode 100644
index 00000000..bb521c14
--- /dev/null
+++ b/main/src/main/res/drawable-xhdpi/ic_share_white_48dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_sysbar_quicksettings.png b/main/src/main/res/drawable-xhdpi/vpn_item_settings.png
index a057db8b..a057db8b 100644
--- a/main/src/main/res/drawable-xhdpi/ic_sysbar_quicksettings.png
+++ b/main/src/main/res/drawable-xhdpi/vpn_item_settings.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_48dp.png
new file mode 100644
index 00000000..18d90664
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png
new file mode 100644
index 00000000..5e1e2af8
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png
new file mode 100644
index 00000000..a9340e47
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_clear_all_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_clear_all_white_48dp.png
new file mode 100644
index 00000000..44a60d3a
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_clear_all_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png
new file mode 100644
index 00000000..4c243dc2
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..a8d8ca84
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..fe5bd13f
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_filter_list_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_filter_list_white_48dp.png
new file mode 100644
index 00000000..58327b69
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_filter_list_white_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_settings_grey600_48dp.png
new file mode 100644
index 00000000..8fea47f6
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_settings_grey600_48dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_share_white_48dp.png b/main/src/main/res/drawable-xxhdpi/ic_share_white_48dp.png
new file mode 100644
index 00000000..cf3072ec
--- /dev/null
+++ b/main/src/main/res/drawable-xxhdpi/ic_share_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white_48dp.png
new file mode 100644
index 00000000..cc262067
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png
new file mode 100644
index 00000000..6fb64c40
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png
new file mode 100644
index 00000000..cfd655c0
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_clear_all_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_clear_all_white_48dp.png
new file mode 100644
index 00000000..5855f4ce
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_clear_all_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png
new file mode 100644
index 00000000..60fa0867
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..47fef5aa
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..73680649
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_filter_list_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_filter_list_white_48dp.png
new file mode 100644
index 00000000..848d0671
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_filter_list_white_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_settings_grey600_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_settings_grey600_48dp.png
new file mode 100644
index 00000000..fa06cbfa
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_settings_grey600_48dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.png b/main/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.png
new file mode 100644
index 00000000..4eeff94c
--- /dev/null
+++ b/main/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.png
diff --git a/main/src/main/res/layout/about.xml b/main/src/main/res/layout/about.xml
index ef70fa4d..3a5017d8 100644
--- a/main/src/main/res/layout/about.xml
+++ b/main/src/main/res/layout/about.xml
@@ -9,6 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingLeft="@dimen/stdpadding"
+    android:scrollbarStyle="outsideOverlay"
     android:paddingRight="@dimen/stdpadding" >
 
     <LinearLayout
diff --git a/main/src/main/res/layout/faqcard.xml b/main/src/main/res/layout/faqcard.xml
index da72a33a..77e6e82d 100644
--- a/main/src/main/res/layout/faqcard.xml
+++ b/main/src/main/res/layout/faqcard.xml
@@ -9,6 +9,7 @@
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     card_view:cardCornerRadius="10dp"
+    android:elevation="10dp"
     android:layout_height="wrap_content">
     <LinearLayout
         android:orientation="vertical"
diff --git a/main/src/main/res/layout/vpn_list_item.xml b/main/src/main/res/layout/vpn_list_item.xml
index ae9350fa..c385166c 100644
--- a/main/src/main/res/layout/vpn_list_item.xml
+++ b/main/src/main/res/layout/vpn_list_item.xml
@@ -68,7 +68,7 @@
         android:contentDescription="@string/configure_the_vpn"
         android:paddingLeft="15dip"
         android:paddingRight="?android:attr/scrollbarSize"
-        android:src="@drawable/ic_sysbar_quicksettings"
+        android:src="@drawable/vpn_item_edit"
         android:focusable="true"/>
 
 </LinearLayout>
 \ No newline at end of file
diff --git a/main/src/main/res/layout/vpn_remote.xml b/main/src/main/res/layout/vpn_remote.xml
new file mode 100644
index 00000000..a02a1c50
--- /dev/null
+++ b/main/src/main/res/layout/vpn_remote.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        style="@style/item"
+        android:text="@string/address"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/address"
+        style="@style/item"
+        android:inputType="textUri"
+        android:text="@string/defaultserver" >
+
+        <!-- <requestFocus /> -->
+    </EditText>
+
+    <TextView
+        style="@style/item"
+        android:text="@string/port"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <RelativeLayout
+        android:id="@+id/relativeLayout1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dip"
+        android:layout_marginRight="8dip" >
+
+        <EditText
+            android:id="@+id/port"
+            style="@style/item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:inputType="number"
+            android:text="@string/defaultport" />
+
+        <ToggleButton
+            android:id="@+id/tcpudp"
+            style="@style/accountSetupButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:textOff="TCP"
+            android:textOn="UDP" />
+    </RelativeLayout>
+
+    <CheckBox
+        android:id="@+id/lzo"
+        style="@style/item"
+        android:text="@string/useLZO" />
+
+
+        <CheckBox
+            android:id="@+id/enableCustomConnection"
+            android:summary=""
+            android:text="@string/custom_config_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/custom_option_warning"
+            />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textMultiLine"
+        android:ems="10"
+        android:id="@+id/editText"
+        android:layout_gravity="center_horizontal" />
+
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/main/src/main/res/layout/vpn_remote_collasped.xml b/main/src/main/res/layout/vpn_remote_collasped.xml
new file mode 100644
index 00000000..93ac1f9a
--- /dev/null
+++ b/main/src/main/res/layout/vpn_remote_collasped.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/address">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="Medium Text"
+        android:id="@+id/textView"
+        android:layout_gravity="right" />
+</LinearLayout>
+\ No newline at end of file
diff --git a/main/src/main/res/menu/configmenu.xml b/main/src/main/res/menu/configmenu.xml
index 5c274f4e..8b16e39e 100644
--- a/main/src/main/res/menu/configmenu.xml
+++ b/main/src/main/res/menu/configmenu.xml
@@ -8,7 +8,7 @@
 
     <item
         android:id="@+id/sendConfig"
-        android:icon="@android:drawable/ic_menu_share"
+        android:icon="@drawable/ic_menu_share"
         android:showAsAction="ifRoom|withText"
         android:title="@string/send_config"
         android:titleCondensed="@string/send"/>
diff --git a/main/src/main/res/menu/import_menu.xml b/main/src/main/res/menu/import_menu.xml
index f7a5ba80..dab5422e 100644
--- a/main/src/main/res/menu/import_menu.xml
+++ b/main/src/main/res/menu/import_menu.xml
@@ -7,14 +7,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
         android:id="@+id/cancel"
-        android:icon="@android:drawable/ic_menu_close_clear_cancel"
+        android:icon="@drawable/ic_menu_close_clear_cancel"
         android:showAsAction="ifRoom|withText"
         android:title="@android:string/cancel"
         android:titleCondensed="@string/cancel"/>
     
     <item
         android:id="@+id/ok"
-        android:icon="@android:drawable/ic_menu_save"
+        android:icon="@drawable/ic_menu_save"
         android:showAsAction="ifRoom|withText"
         android:title="@string/add_profile"
         android:titleCondensed="@string/import_vpn"/>
diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml
index db408918..d8322d83 100644
--- a/main/src/main/res/menu/logmenu.xml
+++ b/main/src/main/res/menu/logmenu.xml
@@ -10,33 +10,33 @@
     <item
             android:id="@+id/toggle_time"
             android:alphabeticShortcut="t"
-            android:icon="@android:drawable/ic_menu_view"
+            android:icon="@drawable/ic_menu_view"
             android:showAsAction="withText|ifRoom"
             android:title="@string/logview_options" />
 
     <item
             android:id="@+id/clearlog"
-            android:icon="@android:drawable/ic_menu_delete"
+            android:icon="@drawable/ic_menu_delete"
             android:showAsAction="ifRoom|withText"
             android:title="@string/clear_log"
             android:titleCondensed="@string/clear"/>
     <item
             android:id="@+id/send"
-            android:icon="@android:drawable/ic_menu_share"
+            android:icon="@drawable/ic_menu_share"
             android:showAsAction="ifRoom|withText"
             android:title="@string/send_logfile"
             android:titleCondensed="@string/send"/>
 
     <item
             android:id="@+id/cancel"
-            android:icon="@android:drawable/ic_menu_close_clear_cancel"
+            android:icon="@drawable/ic_menu_close_clear_cancel"
             android:showAsAction="ifRoom|withText"
             android:title="@string/cancel_connection_long"
             android:titleCondensed="@string/cancel_connection"/>
     <item
             android:id="@+id/edit_vpn"
             android:alphabeticShortcut="e"
-            android:icon="@android:drawable/ic_menu_edit"
+            android:icon="@drawable/ic_menu_edit"
             android:showAsAction="withText|ifRoom"
             android:title="@string/edit_vpn"/>
 
diff --git a/main/src/main/res/menu/vpnpreferences_menu.xml b/main/src/main/res/menu/vpnpreferences_menu.xml
index a10fb21d..bc988363 100644
--- a/main/src/main/res/menu/vpnpreferences_menu.xml
+++ b/main/src/main/res/menu/vpnpreferences_menu.xml
@@ -8,7 +8,7 @@
     <item
         android:id="@+id/remove_vpn"
         android:alphabeticShortcut="d"
-        android:icon="@android:drawable/ic_menu_delete"
+        android:icon="@drawable/ic_menu_delete"
         android:showAsAction="withText|ifRoom"
         android:title="@string/remove_vpn"/>
     
diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/main/res/values-v21/refs.xml
new file mode 100644
index 00000000..51bee2c8
--- /dev/null
+++ b/main/src/main/res/values-v21/refs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2014 Arne Schwabe
+  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  -->
+
+<resources>
+    <drawable name="ic_menu_close_clear_cancel">@drawable/ic_close_white_48dp</drawable>
+    <drawable name="ic_menu_share">@drawable/ic_share_white_48dp </drawable>
+    <drawable name="ic_menu_save">@drawable/ic_check_white_48dp</drawable>
+    <drawable name="ic_menu_view">@drawable/ic_filter_list_white_48dp</drawable>
+    <drawable name="ic_menu_delete">@drawable/ic_delete_white_48dp</drawable>
+    <drawable name="ic_menu_edit">@drawable/ic_edit_white_48dp</drawable>
+    <drawable name="ic_menu_import">@drawable/ic_archive_white_48dp</drawable>
+    <drawable name="vpn_item_edit">@drawable/ic_edit_white_48dp</drawable>
+    <drawable name="ic_menu_add">@drawable/ic_add_circle_outline_white_48dp</drawable>
+</resources>
+\ No newline at end of file
diff --git a/main/src/main/res/values-v21/styles.xml b/main/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..892b6cb0
--- /dev/null
+++ b/main/src/main/res/values-v21/styles.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2014 Arne Schwabe
+  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  -->
+
+<resources>
+
+    <!-- http://www.google.de/design/spec/style/color.html#color-color-palette -->
+    <style name="appstyle" parent="android:Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+    </style>
+</resources>
diff --git a/main/src/main/res/values/colours.xml b/main/src/main/res/values/colours.xml
new file mode 100644
index 00000000..9cd16cb0
--- /dev/null
+++ b/main/src/main/res/values/colours.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2014 Arne Schwabe
+  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  -->
+
+<resources>
+    <!-- Indigo -->
+    <color name="primary">#3F51B5</color>
+    <color name="primary_dark">#303F9F</color>
+    <color name="accent">#FFA726</color>
+</resources>
+\ No newline at end of file
diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml
new file mode 100644
index 00000000..d03a7a57
--- /dev/null
+++ b/main/src/main/res/values/refs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2014 Arne Schwabe
+  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  -->
+
+<resources>
+    <drawable name="ic_menu_close_clear_cancel">@android:drawable/ic_menu_close_clear_cancel</drawable>
+    <drawable name="ic_menu_share">@android:drawable/ic_menu_share </drawable>
+    <drawable name="ic_menu_save">@android:drawable/ic_menu_save</drawable>
+    <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
+    <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
+    <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
+    <drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>
+    <drawable name="vpn_item_edit">@drawable/vpn_item_settings </drawable>
+    <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
+</resources>
+\ No newline at end of file
diff --git a/main/src/main/res/values/styles.xml b/main/src/main/res/values/styles.xml
index f67a51d1..a60e29b8 100644
--- a/main/src/main/res/values/styles.xml
+++ b/main/src/main/res/values/styles.xml
@@ -5,6 +5,10 @@
   -->
 
 <resources>
+    <style name="appstyle" parent="android:Theme.DeviceDefault.Light">
+
+    </style>
+
 
     <style name="item">
         <item name="android:layout_width">match_parent</item>