diff --git a/app/build.gradle b/app/build.gradle
index cd7a8e7bb..49fad2da8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -135,7 +135,6 @@ dependencies {
 
     //Bug Report
     implementation 'ch.acra:acra-core:5.1.3'
-    implementation 'com.github.kbiakov:CodeView-Android:1.3.2'
 }
 
 repositories {
diff --git a/app/src/main/java/com/aurora/store/AuroraApplication.java b/app/src/main/java/com/aurora/store/AuroraApplication.java
index b6f1eb075..4ac543ff8 100644
--- a/app/src/main/java/com/aurora/store/AuroraApplication.java
+++ b/app/src/main/java/com/aurora/store/AuroraApplication.java
@@ -51,7 +51,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import io.github.kbiakov.codeview.classifier.CodeProcessor;
 import io.reactivex.plugins.RxJavaPlugins;
 
 @AcraCore(logcatArguments = {"-t", "200", "-v", "time"})
@@ -119,7 +118,6 @@ public class AuroraApplication extends Application {
         builder.setDeleteUnapprovedReportsOnApplicationStart(true);
 
         ACRA.init(this, builder);
-        CodeProcessor.init(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java b/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java
index d66037940..5482487a1 100644
--- a/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java
+++ b/app/src/main/java/com/aurora/store/report/AcraErrorActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -12,7 +13,6 @@ import androidx.appcompat.widget.Toolbar;
 import com.aurora.store.BuildConfig;
 import com.aurora.store.R;
 import com.aurora.store.ui.single.activity.BaseActivity;
-import com.aurora.store.util.ThemeUtil;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.Gson;
 
@@ -23,15 +23,12 @@ import org.apache.commons.lang3.StringUtils;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.github.kbiakov.codeview.CodeView;
-import io.github.kbiakov.codeview.adapters.Options;
-import io.github.kbiakov.codeview.highlight.ColorTheme;
 import lombok.SneakyThrows;
 
 public class AcraErrorActivity extends BaseActivity {
 
     @BindView(R.id.code_view)
-    CodeView codeView;
+    TextView codeView;
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
@@ -87,21 +84,10 @@ public class AcraErrorActivity extends BaseActivity {
 
             String stack_trace = crashReportData.getString(ReportField.STACK_TRACE);
 
-            codeView.setOptions(Options.Default.get(this)
-                    .withLanguage("java")
-                    .withCode(stack_trace)
-                    .withTheme(getColorTheme())
-            );
+            codeView.setText(stack_trace);
         }
     }
 
-    private ColorTheme getColorTheme() {
-        if (ThemeUtil.isLightTheme(this))
-            return ColorTheme.DEFAULT;
-        else
-            return ColorTheme.MONOKAI;
-    }
-
     @OnClick(R.id.btn_positive)
     public void btnPositiveEvent() {
         new MaterialAlertDialogBuilder(this)
diff --git a/app/src/main/res/layout/activity_bug.xml b/app/src/main/res/layout/activity_bug.xml
index 7eb31b978..af42a8667 100644
--- a/app/src/main/res/layout/activity_bug.xml
+++ b/app/src/main/res/layout/activity_bug.xml
@@ -52,12 +52,26 @@
                 android:textAppearance="@style/TextAppearance.Aurora.Line2" />
         </LinearLayout>
 
-        <io.github.kbiakov.codeview.CodeView
-            android:id="@+id/code_view"
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/layout_bottom"
-            android:layout_below="@id/layout_top" />
+            android:layout_below="@id/layout_top"
+            android:scrollbars="none">
+
+            <HorizontalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/code_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/margin_small"
+                    android:textAppearance="@style/TextAppearance.Aurora.Line3" />
+            </HorizontalScrollView>
+        </ScrollView>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/layout_bottom"