fix conflict

app/build.gradle

@@ -44,7 +44,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1500
-        version "1.53"
+        version "1.54-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 

app/src/main/res/layout/danar_fragment.xml

@@ -672,30 +672,42 @@
 
                 <Button
                     android:id="@+id/danar_viewprofile"
+                    style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:drawableTop="@drawable/icon_danarprofile"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/danar_viewprofile" />
 
+
                 <Button
                     android:id="@+id/danar_history"
+                    style="@style/ButtonSmallFontStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:drawableTop="@drawable/icon_danarhistory"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/danar_history" />
 
+                <Button
+                    android:id="@+id/danar_stats"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/icon_danarstats"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/danar_stats" />
+                
             </LinearLayout>
 
-            <Button
-                android:id="@+id/danar_stats"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/danar_stats" />
-
         </LinearLayout>
 
-
     </RelativeLayout>
 
 </FrameLayout>