diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
index af58f305..46b548b8 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
@@ -64,7 +64,6 @@ import org.nuclearfog.twidda.backend.utils.EmojiUtils;
 import org.nuclearfog.twidda.backend.utils.ErrorUtils;
 import org.nuclearfog.twidda.backend.utils.LinkUtils;
 import org.nuclearfog.twidda.backend.utils.StringUtils;
-import org.nuclearfog.twidda.config.Configuration;
 import org.nuclearfog.twidda.config.GlobalSettings;
 import org.nuclearfog.twidda.model.Card;
 import org.nuclearfog.twidda.model.Location;
@@ -1097,7 +1096,7 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
 	 * set emojis, replace emoji tags with images
 	 */
 	private void onStatusTextUpdate(@NonNull EmojiResult result) {
-		if (settings.getLogin().getConfiguration() == Configuration.MASTODON && result.images != null) {
+		if (result.images != null) {
 			Spannable spannable = EmojiUtils.addEmojis(getApplicationContext(), result.spannable, result.images);
 			status_text.setText(spannable);
 		}
@@ -1107,7 +1106,7 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
 	 * set emojis, replace emoji tags with images
 	 */
 	private void onUsernameUpdate(@NonNull EmojiResult result) {
-		if (settings.getLogin().getConfiguration() == Configuration.MASTODON && result.images != null) {
+		if (result.images != null) {
 			Spannable spannable = EmojiUtils.addEmojis(getApplicationContext(), result.spannable, result.images);
 			username.setText(spannable);
 		}
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java
index 1bc266b0..7bb14443 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java
@@ -25,7 +25,6 @@ import org.nuclearfog.twidda.backend.async.UserFilterLoader.FilterParam;
 import org.nuclearfog.twidda.backend.async.UserFilterLoader.FilterResult;
 import org.nuclearfog.twidda.backend.utils.AppStyles;
 import org.nuclearfog.twidda.backend.utils.ErrorUtils;
-import org.nuclearfog.twidda.config.Configuration;
 import org.nuclearfog.twidda.config.GlobalSettings;
 import org.nuclearfog.twidda.ui.adapter.viewpager.UserAdapter;
 import org.nuclearfog.twidda.ui.views.TabSelector;
@@ -137,7 +136,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
 				toolbar.setTitle(R.string.userlist_following);
 				adapter = new UserAdapter(this, id, UserAdapter.FOLLOWING);
 				viewPager.setAdapter(adapter);
-				if (settings.getLogin().getConfiguration() == Configuration.MASTODON && settings.getLogin().getId() == id) {
+				if (settings.getLogin().getId() == id) {
 					tabSelector.addTabIcons(R.array.user_hashtag_following);
 					tabSelector.addViewPager(viewPager);
 					tabSelector.addOnTabSelectedListener(this);
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/SearchAdapter.java b/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/SearchAdapter.java
index bd89b827..cf60a794 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/SearchAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/SearchAdapter.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
 
 import androidx.fragment.app.FragmentActivity;
 
-import org.nuclearfog.twidda.config.Configuration;
 import org.nuclearfog.twidda.ui.fragments.ListFragment;
 import org.nuclearfog.twidda.ui.fragments.StatusFragment;
 import org.nuclearfog.twidda.ui.fragments.TrendFragment;
@@ -37,7 +36,7 @@ public class SearchAdapter extends ViewPagerAdapter {
 
 		fragments.add(statusFragment);
 		fragments.add(userFragment);
-		if (!search.startsWith("#") && settings.getLogin().getConfiguration() == Configuration.MASTODON) {
+		if (!search.startsWith("#")) {
 			ListFragment hashtagFragment = new TrendFragment();
 			Bundle paramHashtag = new Bundle();
 			paramHashtag.putInt(TrendFragment.KEY_MODE, TrendFragment.MODE_SEARCH);
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/UserAdapter.java b/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/UserAdapter.java
index 068f2356..9e104cfd 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/UserAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/adapter/viewpager/UserAdapter.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
 
 import androidx.fragment.app.FragmentActivity;
 
-import org.nuclearfog.twidda.config.Configuration;
 import org.nuclearfog.twidda.ui.fragments.DomainFragment;
 import org.nuclearfog.twidda.ui.fragments.ListFragment;
 import org.nuclearfog.twidda.ui.fragments.TrendFragment;
@@ -61,8 +60,7 @@ public class UserAdapter extends ViewPagerAdapter {
 				ListFragment following = new UserFragment();
 				following.setArguments(paramFollowing);
 				fragments.add(following);
-
-				if (settings.getLogin().getConfiguration() == Configuration.MASTODON && settings.getLogin().getId() == id) {
+				if (settings.getLogin().getId() == id) {
 					Bundle paramTrend = new Bundle();
 					paramTrend.putInt(TrendFragment.KEY_MODE, TrendFragment.MODE_FOLLOW);
 					ListFragment hashtagFollowing = new TrendFragment();
@@ -127,9 +125,8 @@ public class UserAdapter extends ViewPagerAdapter {
 				blockList.setArguments(paramBlockList);
 				fragments.add(blockList);
 
-				if (settings.getLogin().getConfiguration() == Configuration.MASTODON) {
-					fragments.add(new DomainFragment());
-				}
+				ListFragment domainFragment = new DomainFragment();
+				fragments.add(domainFragment);
 				break;
 		}
 	}