diff --git a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
index 8d9cf3fe..19d7a05a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
@@ -3,54 +3,31 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.Spanned;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.squareup.picasso.Picasso;
-import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.core.CorePlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import io.noties.markwon.ext.tables.TablePlugin;
-import io.noties.markwon.ext.tasklist.TaskListPlugin;
-import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
-import io.noties.markwon.image.DefaultMediaDecoder;
-import io.noties.markwon.image.ImageItem;
-import io.noties.markwon.image.ImagesPlugin;
-import io.noties.markwon.image.SchemeHandler;
-import io.noties.markwon.image.gif.GifMediaDecoder;
-import io.noties.markwon.image.svg.SvgMediaDecoder;
-import io.noties.markwon.linkify.LinkifyPlugin;
 
 /**
  * Author M M Arif
@@ -130,8 +107,6 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         private TextView issueNumber;
         private ImageView issueAssigneeAvatar;
         private TextView issueTitle;
-        private TextView issueDescription;
-        //private ImageView issueState;
         private TextView issueCreatedTime;
         private TextView issueCommentsCount;
         private ImageView issueType;
@@ -143,9 +118,8 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             issueNumber = itemView.findViewById(R.id.issueNumber);
             issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
             issueTitle = itemView.findViewById(R.id.issueTitle);
-            issueDescription = itemView.findViewById(R.id.issueDescription);
             issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-            //issueState = itemView.findViewById(R.id.issueStatus);
+            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
             issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
             issueType = itemView.findViewById(R.id.issueType);
 
@@ -165,7 +139,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
                 }
             });
-            issueDescription.setOnClickListener(new View.OnClickListener() {
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
 
@@ -191,68 +165,6 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
-            final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
-                    .usePlugin(CorePlugin.create())
-                    .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                        @Override
-                        public void configureImages(@NonNull ImagesPlugin plugin) {
-                            plugin.addSchemeHandler(new SchemeHandler() {
-                                @NonNull
-                                @Override
-                                public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
-
-                                    final int resourceId = context.getResources().getIdentifier(
-                                            raw.substring("drawable://".length()),
-                                            "drawable",
-                                            context.getPackageName());
-
-                                    final Drawable drawable = context.getDrawable(resourceId);
-
-                                    assert drawable != null;
-                                    return ImageItem.withResult(drawable);
-                                }
-
-                                @NonNull
-                                @Override
-                                public Collection<String> supportedSchemes() {
-                                    return Collections.singleton("drawable");
-                                }
-                            });
-                            plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                            plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
-                            plugin.addMediaDecoder(SvgMediaDecoder.create());
-                            plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
-                            plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                        }
-                    }))
-                    .usePlugin(new AbstractMarkwonPlugin() {
-                        @Override
-                        public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                            builder
-                                    .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                    .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                    .linkColor(context.getResources().getColor(R.color.lightBlue));
-                        }
-                    })
-                    .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                        @Override
-                        public void configureImages(@NonNull ImagesPlugin plugin) {
-                            plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                                @Nullable
-                                @Override
-                                public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                                    return null;
-                                }
-                            });
-                        }
-                    }))
-                    .usePlugin(TablePlugin.create(context))
-                    .usePlugin(TaskListPlugin.create(context))
-                    .usePlugin(HtmlPlugin.create())
-                    .usePlugin(StrikethroughPlugin.create())
-                    .usePlugin(LinkifyPlugin.create())
-                    .build();
-
             if (!issuesModel.getUser().getFull_name().equals("")) {
                 issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
             } else {
@@ -260,9 +172,9 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             }
 
             if (issuesModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
             } else {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
             }
 
             if (issuesModel.getPull_request() == null) {
@@ -273,28 +185,12 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypePullRequest), context));
             }
 
-            issueTitle.setText(context.getResources().getString(R.string.hash) + issuesModel.getNumber() + " " + issuesModel.getTitle());
+            String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+            issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
+
             issueNumber.setText(String.valueOf(issuesModel.getNumber()));
             issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
 
-            if (!issuesModel.getBody().equals("")) {
-                String cleanIssueDescription = issuesModel.getBody().trim();
-                issueDescription.setVisibility(View.VISIBLE);
-                Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-                markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(context, bodyWithMD, cleanIssueDescription));
-            }
-            else {
-                issueDescription.setText("");
-                issueDescription.setVisibility(View.GONE);
-            }
-            /*if (issuesModel.getState().equals("open")) {
-                issueState.setImageResource(R.drawable.ic_issue_open);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextOpen), context));
-            } else {
-                issueState.setImageResource(R.drawable.ic_issue_closed);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextClosed), context));
-            }*/
-
             switch (timeFormat) {
                 case "pretty": {
                     PrettyTime prettyTime = new PrettyTime(new Locale(locale));
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
index 5a872ef8..5e6a8960 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@@ -3,54 +3,31 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.Spanned;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.squareup.picasso.Picasso;
-import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.core.CorePlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import io.noties.markwon.ext.tables.TablePlugin;
-import io.noties.markwon.ext.tasklist.TaskListPlugin;
-import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
-import io.noties.markwon.image.DefaultMediaDecoder;
-import io.noties.markwon.image.ImageItem;
-import io.noties.markwon.image.ImagesPlugin;
-import io.noties.markwon.image.SchemeHandler;
-import io.noties.markwon.image.gif.GifMediaDecoder;
-import io.noties.markwon.image.svg.SvgMediaDecoder;
-import io.noties.markwon.linkify.LinkifyPlugin;
 
 /**
  * Author M M Arif
@@ -130,8 +107,6 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         private TextView issueNumber;
         private ImageView issueAssigneeAvatar;
         private TextView issueTitle;
-        private TextView issueDescription;
-        //private ImageView issueState;
         private TextView issueCreatedTime;
         private TextView issueCommentsCount;
         private ImageView issueType;
@@ -143,9 +118,8 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             issueNumber = itemView.findViewById(R.id.issueNumber);
             issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
             issueTitle = itemView.findViewById(R.id.issueTitle);
-            issueDescription = itemView.findViewById(R.id.issueDescription);
             issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-            //issueState = itemView.findViewById(R.id.issueStatus);
+            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
             issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
             issueType = itemView.findViewById(R.id.issueType);
 
@@ -165,7 +139,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
                 }
             });
-            issueDescription.setOnClickListener(new View.OnClickListener() {
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
 
@@ -191,68 +165,6 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
-            final Markwon markwon = Markwon.builder(Objects.requireNonNull(context))
-                    .usePlugin(CorePlugin.create())
-                    .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                        @Override
-                        public void configureImages(@NonNull ImagesPlugin plugin) {
-                            plugin.addSchemeHandler(new SchemeHandler() {
-                                @NonNull
-                                @Override
-                                public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
-
-                                    final int resourceId = context.getResources().getIdentifier(
-                                            raw.substring("drawable://".length()),
-                                            "drawable",
-                                            context.getPackageName());
-
-                                    final Drawable drawable = context.getDrawable(resourceId);
-
-                                    assert drawable != null;
-                                    return ImageItem.withResult(drawable);
-                                }
-
-                                @NonNull
-                                @Override
-                                public Collection<String> supportedSchemes() {
-                                    return Collections.singleton("drawable");
-                                }
-                            });
-                            plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                            plugin.addMediaDecoder(SvgMediaDecoder.create(context.getResources()));
-                            plugin.addMediaDecoder(SvgMediaDecoder.create());
-                            plugin.defaultMediaDecoder(DefaultMediaDecoder.create(context.getResources()));
-                            plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                        }
-                    }))
-                    .usePlugin(new AbstractMarkwonPlugin() {
-                        @Override
-                        public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                            builder
-                                    .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                    .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                    .linkColor(context.getResources().getColor(R.color.lightBlue));
-                        }
-                    })
-                    .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                        @Override
-                        public void configureImages(@NonNull ImagesPlugin plugin) {
-                            plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                                @Nullable
-                                @Override
-                                public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                                    return null;
-                                }
-                            });
-                        }
-                    }))
-                    .usePlugin(TablePlugin.create(context))
-                    .usePlugin(TaskListPlugin.create(context))
-                    .usePlugin(HtmlPlugin.create())
-                    .usePlugin(StrikethroughPlugin.create())
-                    .usePlugin(LinkifyPlugin.create())
-                    .build();
-
             if (!issuesModel.getUser().getFull_name().equals("")) {
                 issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
             } else {
@@ -260,9 +172,9 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             }
 
             if (issuesModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
             } else {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(100, 0)).resize(200, 200).centerCrop().into(issueAssigneeAvatar);
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
             }
 
             if (issuesModel.getPull_request() == null) {
@@ -273,28 +185,12 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypePullRequest), context));
             }
 
-            issueTitle.setText(context.getResources().getString(R.string.hash) + issuesModel.getNumber() + " " + issuesModel.getTitle());
+            String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+            issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
+
             issueNumber.setText(String.valueOf(issuesModel.getNumber()));
             issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
 
-            if (!issuesModel.getBody().equals("")) {
-                String cleanIssueDescription = issuesModel.getBody().trim();
-                issueDescription.setVisibility(View.VISIBLE);
-                Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-                markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(context, bodyWithMD, cleanIssueDescription));
-            }
-            else {
-                issueDescription.setText("");
-                issueDescription.setVisibility(View.GONE);
-            }
-            /*if (issuesModel.getState().equals("open")) {
-                issueState.setImageResource(R.drawable.ic_issue_open);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextOpen), context));
-            } else {
-                issueState.setImageResource(R.drawable.ic_issue_closed);
-                issueState.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueStatusTextClosed), context));
-            }*/
-
             switch (timeFormat) {
                 case "pretty": {
                     PrettyTime prettyTime = new PrettyTime(new Locale(locale));
diff --git a/app/src/main/res/drawable/ic_comment_16.xml b/app/src/main/res/drawable/ic_comment_16.xml
new file mode 100644
index 00000000..186a57d7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_comment_16.xml
@@ -0,0 +1,5 @@
+<vector android:height="16dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>
+</vector>
diff --git a/app/src/main/res/font/opensanssemibold.ttf b/app/src/main/res/font/opensanssemibold.ttf
deleted file mode 100644
index 99db86aa..00000000
Binary files a/app/src/main/res/font/opensanssemibold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/roboto.ttf b/app/src/main/res/font/roboto.ttf
new file mode 100644
index 00000000..2b6392ff
Binary files /dev/null and b/app/src/main/res/font/roboto.ttf differ
diff --git a/app/src/main/res/layout/repo_detail_issues_list.xml b/app/src/main/res/layout/repo_detail_issues_list.xml
index d5048866..a2687dae 100644
--- a/app/src/main/res/layout/repo_detail_issues_list.xml
+++ b/app/src/main/res/layout/repo_detail_issues_list.xml
@@ -1,119 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/relativeLayoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:id="@+id/relativeLayoutMainFrame"
-    android:background="@color/backgroundColor">
+    android:layout_margin="15dp"
+    android:theme="@style/AppTheme"
+    tools:context=".activities.RepoDetailActivity">
 
-    <RelativeLayout
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/relativeLayoutFrame"
+    <TextView
+        android:id="@+id/issueNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"/>
+
+    <ImageView
+        android:id="@+id/assigneeAvatar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:contentDescription="@string/generalImgContentText"
+        android:src="@drawable/ic_android" />
+
+    <LinearLayout
+        android:id="@+id/infoSection"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="15dp"
-        android:theme="@style/AppTheme"
-        tools:context=".activities.RepoDetailActivity">
-
-        <TextView
-            android:id="@+id/issueNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="invisible"/>
-
-        <ImageView
-            android:id="@+id/assigneeAvatar"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginEnd="15dp"
-            android:contentDescription="@string/generalImgContentText"
-            android:src="@drawable/ic_android" />
-
-        <TextView
-            android:layout_marginTop="10dp"
-            android:id="@+id/issueCommentsCount"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:width="16dp"
-            android:height="16dp"
-            android:layout_marginEnd="15dp"
-            android:layout_below="@+id/assigneeAvatar"
-            android:drawableTop="@drawable/ic_comment"
-            android:gravity="center"
-            android:textColor="@color/colorWhite"
-            android:textSize="14sp" />
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/assigneeAvatar"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/infoSection"
+            android:id="@+id/frameIssueNameStatus"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/assigneeAvatar"
-            android:orientation="vertical">
+            android:layout_marginBottom="10dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/issueTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight=".65"
+                android:gravity="top|center_vertical"
+                android:textAlignment="gravity"
+                android:text="@string/strFilter"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_weight=".08"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/issueType"
+                android:layout_width="16dp"
+                android:layout_height="21dp"
+                android:layout_marginTop="5dp"
+                android:layout_gravity="center_horizontal"
+                android:contentDescription="@string/generalImgContentText"
+                android:src="@drawable/ic_issues" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/frameCreatedDate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
 
             <LinearLayout
-                android:id="@+id/frameIssueNameStatus"
-                android:layout_width="match_parent"
+                android:id="@+id/frameCommentsCount"
+                android:layout_width="0dp"
+                android:layout_weight=".25"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/issueTitle"
-                    android:layout_width="0dp"
-                    android:layout_weight=".82"
+                    android:id="@+id/issueCommentsCount"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_weight=".08"
-                    android:layout_height="wrap_content" />
-
-                <ImageView
-                    android:id="@+id/issueType"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:gravity="start"
+                    android:drawablePadding="5dp"
+                    android:drawableStart="@drawable/ic_comment_16"
                     android:layout_gravity="center_horizontal"
-                    android:contentDescription="@string/generalImgContentText"
-                    android:src="@drawable/ic_issues" />
+                    android:textColor="@color/colorWhite"
+                    android:textSize="12sp" />
 
             </LinearLayout>
 
             <TextView
-                android:id="@+id/issueDescription"
-                android:layout_width="match_parent"
+                android:id="@+id/issueCreatedTime"
+                android:layout_width="0dp"
+                android:layout_weight=".15"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
+                android:gravity="end"
                 android:textColor="@color/colorWhite"
-                android:textSize="16sp"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:id="@+id/frameCreatedDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/issueCreatedAtText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/createdText"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/issueCreatedTime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorWhite"
-                    android:textSize="12sp" />
-
-            </LinearLayout>
+                android:textSize="12sp" />
 
         </LinearLayout>
 
-    </RelativeLayout>
+    </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index addf9fff..b380981f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -32,6 +32,7 @@
     <string name="pageTitleStarredRepos">Favoriten</string>
     <string name="pageTitleCreateTeam">Team erstellen</string>
     <string name="pageTitleAddEmail">E-Mail Adresse hinzufügen</string>
+    <string name="pageTitleNewFile">New File</string>
     <!-- page titles -->
 
     <string name="appVersion">Version\u0020:\u0020</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1c445ceb..4865492e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -33,6 +33,7 @@
     <string name="pageTitleStarredRepos">Starred Repositories</string>
     <string name="pageTitleCreateTeam">Create Team</string>
     <string name="pageTitleAddEmail">Add Email Address</string>
+    <string name="pageTitleNewFile">New File</string>
     <!-- page titles -->
 
     <string name="appVersion">Version\u0020:\u0020</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 06ba6e80..bc585d51 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -33,6 +33,7 @@
     <string name="pageTitleStarredRepos">Избранные репозитории</string>
     <string name="pageTitleCreateTeam">Создать команду</string>
     <string name="pageTitleAddEmail">Добавить адрес эл. почты</string>
+    <string name="pageTitleNewFile">New File</string>
     <!-- page titles -->
 
     <string name="appVersion">Версия\u0020:\u0020</string>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c1335fe6..3d46f876 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -5,7 +5,7 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimary</item>
-        <item name="android:fontFamily">@font/sourcecodeproregular</item>
+        <item name="android:fontFamily">@font/roboto</item>
         <item name="android:windowBackground">@color/colorPrimary</item>
     </style>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e69e917..67651196 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,7 +161,7 @@
 
     <string name="timeAtText">at</string>
     <string name="hash">#</string>
-    <string name="createdText">Created\u0020</string>
+    <string name="createdText">Opened\u0020</string>
     <string name="dueDateText">Due Date</string>
     <string name="issueStatusTextOpen">Status: open</string>
     <string name="issueStatusOpen">open</string>
@@ -175,7 +175,7 @@
     <string name="issueTitleWithId">#%1$d %2$s</string>
     <string name="issueMilestone">Milestone %1$s</string>
     <string name="dueDate">Due %1$s</string>
-    <string name="createdTime">Created %1$s</string>
+    <string name="createdTime">Opened %1$s</string>
     <string name="assignedTo">Assigned to: %1$s</string>
     <string name="commentButtonText">Comment</string>
     <string name="commentEmptyError">Please write your comment</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ab9a81e4..2fa70ea1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:fontFamily">@font/sourcecodeproregular</item>
+        <item name="android:fontFamily">@font/roboto</item>
         <item name="drawerArrowStyle">@style/DrawerIcon</item>
         <item name="colorControlHighlight">#123456</item>
     </style>