diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index f6be8d480b78f149ba833c5454996d9ccdb3b030..89c6d58abc6abe97cce06c1d41487ea720ecc105 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -43,7 +43,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
@@ -86,8 +85,6 @@ public abstract class XmppActivity extends ActionBarActivity {
 	protected boolean registeredListeners = false;
 
 	protected int mColorRed;
-	protected int mColorOrange;
-	protected int mColorGreen;
 
 	protected static final String FRAGMENT_TAG_DIALOG = "dialog";
 
@@ -407,8 +404,6 @@ public abstract class XmppActivity extends ActionBarActivity {
 		this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
 
 		mColorRed = ContextCompat.getColor(this, R.color.red800);
-		mColorOrange = ContextCompat.getColor(this, R.color.orange500);
-		mColorGreen = ContextCompat.getColor(this, R.color.green500);
 
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
@@ -769,10 +764,6 @@ public abstract class XmppActivity extends ActionBarActivity {
 		return this.mColorRed;
 	}
 
-	public int getOnlineColor() {
-		return this.mColorGreen;
-	}
-
 	public int getPixel(int dp) {
 		DisplayMetrics metrics = getResources().getDisplayMetrics();
 		return ((int) (dp * metrics.density));
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 71d7f5dd4342ca6c0280386568d9690eebcc2e42..77334955e0d0d2f23a4b35fa5193c6c5998042e2 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.SwitchCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -60,18 +61,18 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 		}
 		TextView statusView = view.findViewById(R.id.account_status);
 		ImageView imageView = view.findViewById(R.id.account_image);
-		loadAvatar(account,imageView);
+		loadAvatar(account, imageView);
 		statusView.setText(getContext().getString(account.getStatus().getReadableId()));
 		switch (account.getStatus()) {
 			case ONLINE:
-				statusView.setTextColor(activity.getOnlineColor());
+				statusView.setTextColor(Color.get(activity, R.attr.TextColorOnline));
 				break;
 			case DISABLED:
 			case CONNECTING:
-				statusView.setTextColor(Color.get(activity,android.R.attr.textColorSecondary));
+				statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary));
 				break;
 			default:
-				statusView.setTextColor(activity.getWarningTextColor());
+				statusView.setTextColor(Color.get(activity, R.attr.TextColorError));
 				break;
 		}
 		final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status);
@@ -85,7 +86,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 		}
 		tglAccountState.setOnCheckedChangeListener((compoundButton, b) -> {
 			if (b == isDisabled && activity instanceof ManageAccountActivity) {
-				((ManageAccountActivity) activity).onClickTglAccountState(account,b);
+				((ManageAccountActivity) activity).onClickTglAccountState(account, b);
 			}
 		});
 		return view;
@@ -119,7 +120,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 
 	public void loadAvatar(Account account, ImageView imageView) {
 		if (cancelPotentialWork(account, imageView)) {
-			final Bitmap bm = activity.avatarService().get(account,activity.getPixel(48),true);
+			final Bitmap bm = activity.avatarService().get(account, activity.getPixel(48), true);
 			if (bm != null) {
 				cancelPotentialWork(account, imageView);
 				imageView.setImageBitmap(bm);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 65e05cf7dca99c7c0c3b9ad4012708b94bf6eb33..e6f486a30ff653215febf85e526c5220ec812889 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -302,7 +302,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 				break;
 		}
 		if (error && type == SENT) {
-			viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring);
+			viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Warning);
 		} else {
 			if (darkBackground) {
 				viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark);
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 625ab3c68aaf035dc4007972c49b4e65d9d4b5cf..f1eeeaddf64b6ca41865910df63562a9ba2dc375 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -20,6 +20,9 @@
     <attr name="activity_background_search" format="reference"/>
     <attr name="activity_background_no_results" format="reference"/>
 
+    <attr name="TextColorOnline" format="reference|color"/>
+    <attr name="TextColorError" format="reference|color"/>
+
     <attr name="ic_send_cancel_offline" format="reference"/>
     <attr name="ic_send_location_offline" format="reference"/>
     <attr name="ic_send_photo_offline" format="reference"/>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index da37f6a3f7453321e267fb5a3e75ff6e9f74f68b..073d3af80e9e11a9ff53b6cd16cdce407619ca02 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -91,7 +91,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption">
+    <style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">@color/red800</item>
     </style>
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 26f1bc214e742fd0a3174fadc0f077cdc066180e..d032bcaa81823e0b44c58bf7ebf1605f7ae94a95 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -10,6 +10,8 @@
         <item name="color_background_primary">@color/grey50</item>
         <item name="color_background_secondary">@color/grey200</item>
         <item name="color_warning">@color/red_a700</item>
+        <item name="TextColorOnline">@color/green500</item>
+        <item name="TextColorError">@color/red800</item>
 
         <item name="activity_background_search">@drawable/search_background_light</item>
         <item name="activity_background_no_results">@drawable/no_results_background_light</item>
@@ -106,6 +108,9 @@
         <item name="activity_background_no_results">@drawable/no_results_background_dark</item>
         <item name="color_warning">@color/red_a100</item>
 
+        <item name="TextColorOnline">@color/green500</item>
+        <item name="TextColorError">@color/red500</item>
+
         <item name="EmojiColor">@color/white</item>
 
         <item name="windowActionModeOverlay">true</item>