diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
index 4738acf0..1c8ecc05 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
@@ -158,6 +158,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
 			val colors = arrayOf(R.color.green_light).toIntArray()
 			dataSet.setColors(colors, context)
 			dataSet.setDrawCircles(false)
+			dataSet.setDrawValues(false)
 			val lineData = LineData(listOf(dataSet))
 
 			this.chartView = when (stat.graphType) {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
index e5f6e8a9..deefb062 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
@@ -1,31 +1,29 @@
 package net.pokeranalytics.android.ui.graph
 
 import android.content.Context
-import android.graphics.Typeface
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import com.github.mikephil.charting.charts.BarLineChartBase
 import com.github.mikephil.charting.components.XAxis
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.extensions.px
 
+
+
 fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) {
 
 	// X Axis
 	this.xAxis.axisLineColor = ContextCompat.getColor(context, R.color.chart_default)
 	this.xAxis.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px)
-	this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default)
-	this.xAxis.labelCount = 4
 	this.xAxis.position = XAxis.XAxisPosition.BOTTOM
-
-	this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default)
-	this.xAxis.typeface = Typeface.DEFAULT
-	this.xAxis.labelCount = 4
-	this.xAxis.position = XAxis.XAxisPosition.BOTTOM
-
 	this.xAxis.setDrawLabels(true)
 	this.xAxis.setDrawGridLines(true)
-	this.xAxis.granularity = 1.0f
 	this.xAxis.isGranularityEnabled = true
+	this.xAxis.granularity = 1.0f
+	this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default)
+	this.xAxis.typeface = ResourcesCompat.getFont(context, R.font.roboto_medium)
+	this.xAxis.labelCount = 4
+	this.xAxis.textSize = 12f
 	this.xAxis.isEnabled = true
 
 	// Y Axis
@@ -41,12 +39,14 @@ fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) {
 	this.axisLeft.granularity = 1.0f
 
 	this.axisLeft.textColor = ContextCompat.getColor(context, R.color.chart_default)
-	this.axisLeft.typeface = Typeface.DEFAULT
-	this.axisLeft.labelCount =
-		if (small) 1 else 7 // @todo not great if interval is [0..2] for number of records as we get decimals
+	this.axisLeft.typeface = ResourcesCompat.getFont(context, R.font.roboto_medium)
+	this.axisLeft.labelCount = if (small) 1 else 7 // @todo not great if interval is [0..2] for number of records as we get decimals
+	this.axisLeft.textSize = 12f
 
 	this.axisRight.isEnabled = false
 	this.legend.isEnabled = false
+	this.data.isHighlightEnabled = !small
+	this.description.isEnabled = false
 
 
 // @todo
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index 7a062a13..c36d8028 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -329,6 +329,7 @@ enum class RowViewType(private var layoutRes: Int) {
 					val colors = arrayOf(R.color.green_light).toIntArray()
 					dataSet.setColors(colors, context)
 					dataSet.setDrawCircles(false)
+					dataSet.setDrawValues(false)
 					val lineData = LineData(listOf(dataSet))
 
 					val chartView = when (row.stat.graphType) {
@@ -348,7 +349,7 @@ enum class RowViewType(private var layoutRes: Int) {
 						it.addView(chartView)
 					}
 
-					chartView.setStyle(false, context)
+					chartView.setStyle(true, context)
 					chartView.setTouchEnabled(false)
 					chartView.highlightValue((entries.size - 1).toFloat(), 0)
 				}