X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9d9efd1c1ded9c225c16be80f4b648018839f3ef..HEAD:/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index 7c5f2b28..a01a7f9b 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -21,7 +21,7 @@
 
 package com.owncloud.android.ui.dialog;
 
-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -60,8 +60,8 @@ public class ConflictsResolveDialog extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         String remotepath = getArguments().getString("remotepath");
-        return new AlertDialog.Builder(getActivity())
-                   .setIcon(DisplayUtils.getSeasonalIconId())
+        return new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog)
+                   .setIcon(R.drawable.ic_warning)
                    .setTitle(R.string.conflict_title)
                    .setMessage(String.format(getString(R.string.conflict_message), remotepath))
                    .setPositiveButton(R.string.conflict_use_local_version,