diff --git a/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java
index 3e1d39db0..77c29e603 100644
--- a/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java
+++ b/src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java
@@ -2,10 +2,7 @@ package eu.siacs.conversations.ui;
 
 import android.content.Context;
 import android.content.Intent;
-import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Menu;
@@ -15,6 +12,10 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -25,6 +26,7 @@ import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityChooseCountryBinding;
 import eu.siacs.conversations.ui.adapter.CountryAdapter;
 import eu.siacs.conversations.utils.PhoneNumberUtilWrapper;
+import eu.siacs.conversations.utils.ThemeHelper;
 
 public class ChooseCountryActivity extends ActionBarActivity implements CountryAdapter.OnCountryClicked {
 
@@ -70,16 +72,17 @@ public class ChooseCountryActivity extends ActionBarActivity implements CountryA
             return true;
         }
     };
-     private TextView.OnEditorActionListener mSearchDone = (v, actionId, event) -> {
-         if (countries.size() == 1) {
-             onCountryClicked(countries.get(0));
-         }
-         return true;
-     };
+    private TextView.OnEditorActionListener mSearchDone = (v, actionId, event) -> {
+        if (countries.size() == 1) {
+            onCountryClicked(countries.get(0));
+        }
+        return true;
+    };
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setTheme(ThemeHelper.find(this));
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_choose_country);
         setSupportActionBar((Toolbar) this.binding.toolbar);
         configureActionBar(getSupportActionBar());
@@ -115,9 +118,9 @@ public class ChooseCountryActivity extends ActionBarActivity implements CountryA
     private void filterCountries(String needle) {
         List<PhoneNumberUtilWrapper.Country> countries = PhoneNumberUtilWrapper.getCountries(this);
         Iterator<PhoneNumberUtilWrapper.Country> iterator = countries.iterator();
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             final PhoneNumberUtilWrapper.Country country = iterator.next();
-            if(needle != null && !country.getName().toLowerCase(Locale.getDefault()).contains(needle.toLowerCase(Locale.getDefault()))) {
+            if (needle != null && !country.getName().toLowerCase(Locale.getDefault()).contains(needle.toLowerCase(Locale.getDefault()))) {
                 iterator.remove();
             }
         }
diff --git a/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java
index a15419eba..30acdd2ed 100644
--- a/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java
+++ b/src/quicksy/java/eu/siacs/conversations/ui/EnterNameActivity.java
@@ -20,7 +20,7 @@ public class EnterNameActivity extends XmppActivity implements XmppConnectionSer
 
     private Account account;
 
-    private AtomicBoolean setNick = new AtomicBoolean(false);
+    private final AtomicBoolean setNick = new AtomicBoolean(false);
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {