diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index 8d78c7db..ea4ff8d0 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -24,6 +24,7 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
@@ -308,6 +309,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 	@Override
 	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
 
+		String timeFormat = tinyDB.getString("dateFormat");
 		IssueComments issueComment = issuesComments.get(position);
 
 		holder.issueComment = issueComment;
@@ -323,15 +325,30 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 		new Markdown(ctx, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment);
 
-		StringBuilder informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "pretty", ctx));
+		StringBuilder informationBuilder = null;
+		if(issueComment.getCreated_at() != null) {
 
-		if(!issueComment.getCreated_at().equals(issueComment.getUpdated_at())) {
+			if(timeFormat.equals("pretty")) {
 
-			informationBuilder.append(ctx.getString(R.string.colorfulBulletSpan))
-				.append(ctx.getString(R.string.modifiedText));
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "pretty", ctx));
+				holder.information
+					.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()), ctx));
+			}
+			else if(timeFormat.equals("normal")) {
+
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "normal", ctx));
+			}
+
+			if(!issueComment.getCreated_at().equals(issueComment.getUpdated_at())) {
+
+				if(informationBuilder != null) {
+
+					informationBuilder.append(ctx.getString(R.string.colorfulBulletSpan)).append(ctx.getString(R.string.modifiedText));
+				}
+			}
 		}
 
-		holder.information.setText(informationBuilder.toString());
+		holder.information.setText(informationBuilder);
 
 		Bundle bundle1 = new Bundle();
 		bundle1.putAll(bundle);
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 650d8b18..d46c028c 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -210,16 +210,16 @@
                                 android:gravity="start"
                                 android:text="@string/createdText"
                                 android:visibility="gone"
-                                android:textColor="?attr/primaryTextColor"
-                                android:textSize="12sp" />
+                                android:textColor="?attr/hintColor"
+                                android:textSize="14sp" />
 
                             <TextView
                                 android:id="@+id/issueModified"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:textColor="?attr/primaryTextColor"
+                                android:textColor="?attr/hintColor"
                                 android:layout_toEndOf="@+id/issueCreatedTime"
-                                android:textSize="12sp"
+                                android:textSize="14sp"
                                 android:visibility="gone"
                                 android:text="@string/modifiedText" />
 
diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml
index f57893b3..39525079 100644
--- a/app/src/main/res/layout/list_issue_comments.xml
+++ b/app/src/main/res/layout/list_issue_comments.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:padding="20dp">
+    android:padding="16dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,7 +48,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textColor="?attr/hintColor"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
         </LinearLayout>
 
         <ImageView
@@ -66,7 +66,7 @@
         android:id="@+id/comment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="12dp"
         android:textColor="?attr/primaryTextColor"
         android:textIsSelectable="true"
         android:autoLink="web"