diff --git a/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java
deleted file mode 100644
index 1f3be00403ac27420cf53b45f7227b6929c353de..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/adapters/SectionsPagerAdapter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-
-package cx.ring.adapters;
-
-import java.util.ArrayList;
-import java.util.Locale;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import cx.ring.R;
-import cx.ring.fragments.CallListFragment;
-import cx.ring.fragments.DialingFragment;
-import cx.ring.fragments.HistoryFragment;
-import com.astuetz.PagerSlidingTabStrip;
-
-import android.content.Context;
-import android.support.v13.app.FragmentStatePagerAdapter;
-import android.util.Log;
-
-public class SectionsPagerAdapter extends FragmentStatePagerAdapter implements PagerSlidingTabStrip.IconTabProvider {
-
- private static final String TAG = SectionsPagerAdapter.class.getSimpleName();
- Context mContext;
- private final ArrayList<Fragment> fragments = new ArrayList<>();
-
- public SectionsPagerAdapter(Context c, FragmentManager fm) {
- super(fm);
- mContext = c;
- fragments.add(new DialingFragment());
- fragments.add(new CallListFragment());
- fragments.add(new HistoryFragment());
- }
-
- @Override
- public Fragment getItem(int i) {
-
- return fragments.get(i);
- }
-
- public String getClassName(int i) {
- String name;
-
- switch (i) {
- case 0:
- name = DialingFragment.class.getName();
- break;
- case 1:
- name = CallListFragment.class.getName();
- break;
- case 2:
- name = HistoryFragment.class.getName();
- break;
-
- default:
- Log.e(TAG, "getClassName: unknown fragment position " + i);
- return null;
- }
-
- // Log.w(TAG, "getClassName: name=" + name);
- return name;
- }
-
- @Override
- public int getCount() {
- return fragments.size();
- }
-
- @Override
- public CharSequence getPageTitle(int position) {
-
- switch (position) {
- case 0:
- return mContext.getString(R.string.title_section0).toUpperCase(Locale.getDefault());
- case 1:
- return mContext.getString(R.string.title_section1).toUpperCase(Locale.getDefault());
- case 2:
- return mContext.getString(R.string.title_section2).toUpperCase(Locale.getDefault());
- default:
- Log.e(TAG, "getPageTitle: unknown tab position " + position);
- break;
- }
- return null;
- }
-
- @Override
- public int getPageIconResId(int position) {
- switch (position) {
- case 0:
- return R.drawable.ic_action_dial_pad_light;
- case 1:
- return R.drawable.ic_action_call;
- case 2:
- return R.drawable.ic_action_time;
- default:
- Log.e(TAG, "getPageTitle: unknown tab position " + position);
- break;
- }
- return 0;
- }
-}
\ No newline at end of file
diff --git a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
index bd93dd18a34a78b38a5b56bc461ce7c741d4dd6c..8e5822b59ba81bcb7abbb215c10c1b2f045cbce4 100644
--- a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
@@ -50,14 +50,11 @@ import android.view.MenuItem;
import cx.ring.R;
import cx.ring.fragments.AdvancedAccountFragment;
import cx.ring.fragments.AudioManagementFragment;
-import cx.ring.fragments.HomeFragment;
-import cx.ring.fragments.MenuFragment;
import cx.ring.fragments.NestedSettingsFragment;
import cx.ring.fragments.SecurityAccountFragment;
import cx.ring.model.account.Account;
import cx.ring.service.ISipService;
import cx.ring.service.LocalService;
-import cx.ring.service.SipService;
import com.astuetz.PagerSlidingTabStrip;
import java.util.ArrayList;
import java.util.Locale;
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java
deleted file mode 100644
index b0c58d865205bedc153e37573ec77d43729c84a4..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
- *
- * Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
- */
-package cx.ring.fragments;
-
-import cx.ring.R;
-import cx.ring.adapters.SectionsPagerAdapter;
-import cx.ring.client.HomeActivity;
-
-import com.astuetz.PagerSlidingTabStrip;
-
-import android.app.Activity;
-import android.app.Fragment;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class HomeFragment extends Fragment {
- static final String TAG = HomeFragment.class.getSimpleName();
-
- /**
- * The {@link ViewPager} that will host the section contents.
- */
- ViewPager mViewPager;
- SectionsPagerAdapter mSectionsPagerAdapter;
-
- @Override
- public void onResume() {
- super.onResume();
- ((HomeActivity)getActivity()).setToolbarState(false, R.string.app_name);
- }
-
- @Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
- }
-
- @Override
- public void onDetach() {
- super.onDetach();
- }
-
- @Override
- public void onCreate(Bundle savedBundle) {
- super.onCreate(savedBundle);
- mSectionsPagerAdapter = new SectionsPagerAdapter(getActivity(), getChildFragmentManager());
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.frag_home, container, false);
-
- // Set up the ViewPager with the sections adapter.
- mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
- mViewPager.setPageTransformer(true, new ZoomOutPageTransformer(0.7f));
-
- mViewPager.setOffscreenPageLimit(2);
- mViewPager.setAdapter(mSectionsPagerAdapter);
- mViewPager.setCurrentItem(1);
-
- final PagerSlidingTabStrip strip = PagerSlidingTabStrip.class.cast(rootView.findViewById(R.id.pts_main));
-
- strip.setViewPager(mViewPager);
-
- return rootView;
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- }
-
- public class ZoomOutPageTransformer implements ViewPager.PageTransformer {
- private static final float MIN_ALPHA = .6f;
-
- public ZoomOutPageTransformer(float scalingStart) {
- super();
- }
-
- @Override
- public void transformPage(View page, float position) {
- final float normalizedposition = Math.abs(Math.abs(position) - 1);
- page.setAlpha(MIN_ALPHA + (1.f - MIN_ALPHA) * normalizedposition);
- }
- }
-
- public SectionsPagerAdapter getSectionsPagerAdapter() {
- return mSectionsPagerAdapter;
- }
-
- public ViewPager getViewPager() {
- return mViewPager;
- }
-}
\ No newline at end of file
diff --git a/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java b/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
index 76fd929dacf7e05805e01d556f1cd34578500449..cf3400e5255fccf7a8bdcde7479ad5261b5ae786 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/SipNotifications.java
@@ -153,7 +153,7 @@ public class SipNotifications {
Builder nb = new NotificationCompat.Builder(context);
nb.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_launcher));
- nb.setSmallIcon(R.drawable.ic_action_call);
+ nb.setSmallIcon(R.drawable.ic_call_white_24dp);
nb.setTicker(tickerText);
nb.setWhen(when);
diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png
deleted file mode 100644
index 01f21fd6cc6fe75f84d6a26e8d7c7ae9c48f5eaf..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-hdpi/ic_action_call.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png
deleted file mode 100644
index 4d9c098263973cba6f4b267f1e6f5c1ac6b0b561..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-hdpi/ic_action_chat.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png
deleted file mode 100644
index b2340a6d1e6e103b83134d0fe907433e7b718a6c..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png
deleted file mode 100644
index aeb903b34615f03134c80de891fa4022598bbf63..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-hdpi/ic_action_dial_pad_light.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png
deleted file mode 100644
index 2dcfc0de0c340978d21e6d9ec5d9dc53061d7e0e..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-mdpi/ic_action_call.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png
deleted file mode 100644
index d3232818eda02d44d994ab3661965db3be828837..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-mdpi/ic_action_chat.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png
deleted file mode 100644
index c8c6ab18ea0881817a0a024424a4396a2f5170c8..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png
deleted file mode 100644
index 97054c21c4b8d9d16df777fcce650d11fc2a0827..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-mdpi/ic_action_dial_pad_light.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png
deleted file mode 100644
index 2030e3112dae8aa2f4ffbde81aadcfd3118023fe..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_call.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png
deleted file mode 100644
index 09ef91dc47e2257dbc72fae14a6ee31f758b0ab8..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_chat.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png
deleted file mode 100644
index 73f8bc07c45d8efd2a274e1fb130914b61aebcae..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png
deleted file mode 100644
index b7c772aaa9d5f21535ba97b32255d300542b7fea..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_dial_pad_light.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png
deleted file mode 100644
index dd00fb1d2f51616a4c1df64bb501ebe45575352a..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_call.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png
deleted file mode 100644
index 7472f809878a20a4d23c911572bc99534aa43672..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_chat.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png
deleted file mode 100644
index 649f86b6545090f4a6cb86fadd864db72eceb860..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png b/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png
deleted file mode 100644
index 934e55df2ad5fd2e54b8c4f142d68f0b7dd646d0..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_dial_pad_light.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/layout/frag_call.xml b/ring-android/app/src/main/res/layout/frag_call.xml
index fae787b81aa9dcc13dde9e317bb0da5fa47cac1d..26a2bb74ea684eb28f8492ecbe03360ea3f291e5 100644
--- a/ring-android/app/src/main/res/layout/frag_call.xml
+++ b/ring-android/app/src/main/res/layout/frag_call.xml
@@ -134,7 +134,7 @@
android:layout_gravity="left"
android:layout_marginLeft="15dp"
android:layout_marginRight="10dp"
- android:src="@drawable/ic_action_call" />
+ android:src="@drawable/ic_call_white_24dp" />
<TextView
android:id="@+id/call_status_txt"
diff --git a/ring-android/app/src/main/res/layout/frag_dialing.xml b/ring-android/app/src/main/res/layout/frag_dialing.xml
index a31bb4021320f38085598d5d40478b8483d4cdf0..f0c6b9592114e554fc39a5acba1ee55def824ea5 100644
--- a/ring-android/app/src/main/res/layout/frag_dialing.xml
+++ b/ring-android/app/src/main/res/layout/frag_dialing.xml
@@ -40,7 +40,7 @@
android:layout_weight="30"
android:background="@drawable/item_keyboard_choice_selector"
android:contentDescription="@string/dial_numeric_pad"
- android:drawableLeft="@drawable/ic_action_dial_pad_light"
+ android:drawableLeft="@drawable/ic_dialpad_white_24dp"
android:text="123"
android:textColor="@color/white"
android:textSize="15sp" />
@@ -71,7 +71,7 @@
android:layout_height="100dp"
android:layout_centerHorizontal="true"
android:background="@drawable/call_button"
- android:src="@drawable/ic_action_call" />
+ android:src="@drawable/ic_call_white_24dp" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
index 4d2647e47ce6a6d0170deb20f0700f3f7c65215f..17008dbdf8de6252930f16dd51d67dcbb387c546 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -79,7 +79,7 @@ as that of the covered work.
android:layout_margin="5dp"
android:background="@null"
android:contentDescription="@string/contact_quick_call_description"
- android:src="@drawable/ic_action_call" />
+ android:src="@drawable/ic_call_white_24dp" />
<ImageButton
android:id="@+id/quick_message"
@@ -88,7 +88,7 @@ as that of the covered work.
android:layout_margin="5dp"
android:background="@null"
android:contentDescription="@string/contact_quick_msg_description"
- android:src="@drawable/ic_action_chat" />
+ android:src="@drawable/ic_call_white_24dp" />
</LinearLayout>
</RelativeLayout>