diff --git a/README.md b/README.md
index b7568b8..fa95741 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Add this to your module's `build.gradle` file:
 ```gradle
 dependencies {
 	...
-	implementation 'com.github.Dan629pl:nordan-material-dialog-android:1.0.4'
+	implementation 'com.github.Dan629pl:nordan-material-dialog-android:1.0.5'
 }
 ```
 <h1>Nordan Alert Dialog</h1>
diff --git a/app/build.gradle b/app/build.gradle
index 8b795a5..cc08055 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
-        versionName "Nordan Material Dialog v1.0.1"
+        versionName "Nordan Material Dialog v1.0.5"
     }
 
     buildTypes {
diff --git a/app/src/main/java/com/nordan/dialog/NordanAlertDialog.java b/app/src/main/java/com/nordan/dialog/NordanAlertDialog.java
index e312488..927a644 100644
--- a/app/src/main/java/com/nordan/dialog/NordanAlertDialog.java
+++ b/app/src/main/java/com/nordan/dialog/NordanAlertDialog.java
@@ -2,15 +2,19 @@
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.View;
 import android.view.Window;
 import android.widget.ImageView.ScaleType;
 import android.widget.RelativeLayout;
+
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textview.MaterialTextView;
+
 import java.util.Optional;
+
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import pl.droidsonroids.gif.GifImageView;
@@ -26,11 +30,13 @@ public static class Builder {
         private String negativeBtnText;
         private Activity activity;
         private Animation animation;
-        private int icon;
+        private int headerIconResource;
+        private int dialogAccentColor;
+        private Bitmap headerIconDrawable;
         private boolean isGif;
         private NordanAlertDialogListener positiveListener;
         private NordanAlertDialogListener negativeListener;
-        private int backgroundColor;
+        private int headerColor;
         private boolean isCancelable;
         private DialogType dialogType;
 
@@ -48,8 +54,13 @@ public Builder setDialogType(DialogType dialogType) {
             return this;
         }
 
-        public Builder setBackgroundColor(int bgColor) {
-            this.backgroundColor = bgColor;
+        public Builder setDialogAccentColor(int color) {
+            this.dialogAccentColor = color;
+            return this;
+        }
+
+        public Builder setHeaderColor(int bgColor) {
+            this.headerColor = bgColor;
             return this;
         }
 
@@ -69,7 +80,13 @@ public Builder setNegativeBtnText(String negativeBtnText) {
         }
 
         public Builder setIcon(int icon, boolean isGif) {
-            this.icon = icon;
+            this.headerIconResource = icon;
+            this.isGif = isGif;
+            return this;
+        }
+
+        public Builder setIcon(Bitmap icon, boolean isGif) {
+            this.headerIconDrawable = icon;
             this.isGif = isGif;
             return this;
         }
@@ -139,15 +156,15 @@ public Dialog build() {
             } else {
                 setCustomDialog(dialog, iconImg, view);
             }
-            if (positiveBtnText != null) {
+            if (positiveBtnText != null && !positiveBtnText.isEmpty()) {
                 positiveButton.setText(positiveBtnText);
             }
-            if (negativeBtnText != null) {
+            if (negativeBtnText != null && !negativeBtnText.isEmpty()) {
                 negativeButton.setText(negativeBtnText);
             } else {
                 negativeButton.setVisibility(View.GONE);
             }
-            if (positiveListener != null) {
+            if (positiveListener != null && positiveBtnText != null && !positiveBtnText.isEmpty()) {
                 positiveButton.setOnClickListener(click -> {
                     positiveListener.onClick();
                     dialog.dismiss();
@@ -155,7 +172,7 @@ public Dialog build() {
             } else {
                 positiveButton.setOnClickListener(click -> dialog.dismiss());
             }
-            if (negativeListener != null) {
+            if (negativeListener != null && negativeBtnText != null && !negativeBtnText.isEmpty()) {
                 negativeButton.setVisibility(View.VISIBLE);
                 negativeButton.setOnClickListener(view1 -> {
                     negativeListener.onClick();
@@ -164,6 +181,10 @@ public Dialog build() {
             } else {
                 negativeButton.setOnClickListener(click -> dialog.dismiss());
             }
+            if (dialogAccentColor > 0) {
+                positiveButton.setBackgroundColor(activity.getColor(dialogAccentColor));
+                negativeButton.setTextColor(activity.getColor(dialogAccentColor));
+            }
             return dialog;
         }
 
@@ -199,20 +220,20 @@ private void setInformationDialog(GifImageView iconImg, View view) {
 
         private void setCustomDialog(Dialog dialog, GifImageView iconImg, View view) {
             RelativeLayout relativeHeader = dialog.findViewById(R.id.relative_header);
-            if (icon == 0 && backgroundColor == 0) {
+            if (headerIconResource == 0 && headerColor == 0 && headerIconDrawable == null) {
                 relativeHeader.setVisibility(View.GONE);
                 return;
             }
-            if (icon != 0) {
-                iconImg.setImageResource(icon);
+            if (headerIconResource != 0) {
+                iconImg.setImageResource(headerIconResource);
                 iconImg.setVisibility(View.VISIBLE);
                 if (isGif) {
                     relativeHeader.getLayoutParams().height = 250;
                     iconImg.setScaleType(ScaleType.CENTER_CROP);
                 }
             }
-            if (backgroundColor != 0) {
-                view.setBackgroundColor(backgroundColor);
+            if (headerColor != 0) {
+                view.setBackgroundColor(headerColor);
             }
         }
 
diff --git a/app/src/main/java/com/nordan/dialog/NordanLoadingDialog.java b/app/src/main/java/com/nordan/dialog/NordanLoadingDialog.java
index 5c8d164..250d456 100644
--- a/app/src/main/java/com/nordan/dialog/NordanLoadingDialog.java
+++ b/app/src/main/java/com/nordan/dialog/NordanLoadingDialog.java
@@ -5,8 +5,12 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.Window;
+import android.widget.ProgressBar;
+
 import com.google.android.material.textview.MaterialTextView;
+
 import java.util.Optional;
+
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
@@ -14,6 +18,10 @@
 public class NordanLoadingDialog {
 
     public static Dialog createLoadingDialog(Activity activity, String loadingText) {
+        return createLoadingDialog(activity, loadingText, 0);
+    }
+
+    public static Dialog createLoadingDialog(Activity activity, String loadingText, int accentColor) {
         Dialog loadingDialog = new Dialog(activity);
         loadingDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         Optional.ofNullable(loadingDialog.getWindow())
@@ -21,6 +29,10 @@ public static Dialog createLoadingDialog(Activity activity, String loadingText)
         loadingDialog.setCancelable(false);
         loadingDialog.setContentView(R.layout.nordan_loading_dialog);
         ((MaterialTextView) loadingDialog.findViewById(R.id.loading_text)).setText(loadingText);
+        ProgressBar loadingBar = loadingDialog.findViewById(R.id.progress_bar);
+        if (accentColor > 0) {
+            loadingBar.getIndeterminateDrawable().setColorFilter(activity.getColor(accentColor), android.graphics.PorterDuff.Mode.MULTIPLY);
+        }
         return loadingDialog;
     }
 }
diff --git a/app/src/main/res/layout/nordan_alert_dialog.xml b/app/src/main/res/layout/nordan_alert_dialog.xml
index bab98b3..64d5fc4 100644
--- a/app/src/main/res/layout/nordan_alert_dialog.xml
+++ b/app/src/main/res/layout/nordan_alert_dialog.xml
@@ -34,38 +34,38 @@
           android:visibility="gone" />
       </RelativeLayout>
       <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/relative_header"
-        android:padding="16dp">
-        <com.google.android.material.textview.MaterialTextView
-          android:id="@+id/title"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_centerHorizontal="true"
-          android:elegantTextHeight="true"
-          android:fontFamily="@font/product_sans_bold"
-          android:gravity="center"
-          android:paddingLeft="16dp"
-          android:paddingRight="16dp"
+          android:layout_below="@+id/relative_header"
+          android:padding="12dp">
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/product_sans_bold"
+            android:gravity="center"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
           android:text="@string/dialog_tittle"
           android:textAlignment="center"
           android:textColor="@color/grayFontColor"
           android:textSize="18sp" />
         <com.google.android.material.textview.MaterialTextView
-          android:id="@+id/message"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_below="@+id/title"
-          android:layout_marginTop="16dp"
-          android:elegantTextHeight="true"
-          android:fontFamily="@font/product_sans_regular"
-          android:gravity="center"
-          android:paddingLeft="10dp"
-          android:paddingRight="10dp"
-          android:text="@string/dialog_message"
-          android:textAlignment="center"
-          android:textSize="16sp" />
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/title"
+            android:layout_marginTop="10dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/product_sans_regular"
+            android:gravity="center"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:text="@string/dialog_message"
+            android:textAlignment="center"
+            android:textSize="16sp" />
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -76,11 +76,10 @@
           android:orientation="horizontal"
           android:weightSum="100">
           <com.google.android.material.button.MaterialButton
-            android:id="@+id/negativeBtn"
-            style="@style/NordanDialogButtonTheme"
-            android:layout_marginEnd="20dp"
-            android:layout_weight="50"
-            android:text="@android:string/cancel" />
+              android:id="@+id/negativeBtn"
+              style="@style/NordanDialogButtonTextTheme"
+              android:layout_weight="50"
+              android:text="@android:string/cancel" />
           <com.google.android.material.button.MaterialButton
             android:id="@+id/positiveBtn"
             style="@style/NordanDialogButtonTheme"
diff --git a/app/src/main/res/layout/nordan_loading_dialog.xml b/app/src/main/res/layout/nordan_loading_dialog.xml
index 8755296..43631f4 100644
--- a/app/src/main/res/layout/nordan_loading_dialog.xml
+++ b/app/src/main/res/layout/nordan_loading_dialog.xml
@@ -1,40 +1,37 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@android:color/transparent"
-  android:orientation="vertical">
-  <com.google.android.material.card.MaterialCardView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
-    app:cardBackgroundColor="@android:color/white"
-    app:cardCornerRadius="10dp"
-    app:cardUseCompatPadding="true">
-    <LinearLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:gravity="center"
-      android:minWidth="150dp"
-      android:minHeight="150dp"
-      android:orientation="vertical">
-      <include
-        android:id="@+id/progress_bar"
-        layout="@layout/main_progress_bar"
-        android:visibility="visible" />
-      <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/loading_text"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@android:color/transparent"
+                android:orientation="vertical">
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:fontFamily="@font/product_sans_regular"
-        android:gravity="center"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:text="Loading…"
-        android:textAlignment="center"
-        android:textSize="20sp" />
-    </LinearLayout>
-  </com.google.android.material.card.MaterialCardView>
+        android:layout_centerInParent="true"
+        app:cardBackgroundColor="@android:color/white"
+        app:cardCornerRadius="10dp"
+        app:cardUseCompatPadding="true">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="12dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+            <include
+                android:id="@+id/progress_bar"
+                layout="@layout/main_progress_bar"
+                android:visibility="visible" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/loading_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:fontFamily="@font/product_sans_regular"
+                android:gravity="center"
+                android:text="Loading…"
+                android:textAlignment="center"
+                android:textSize="24sp" />
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 8d96752..c9dfe00 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -5,30 +5,27 @@
     <item name="colorAccent">@color/colorRed</item>
   </style>
 
-
-  <style name="NordanDialogButtonTheme" parent="Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="singleLine">true</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:elegantTextHeight">true</item>
-    <item name="android:textColor">@color/grayFontColor</item>
-    <item name="fontFamily">@font/product_sans_bold</item>
-  </style>
-
-  <style name="NordanButtonTheme" parent="Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="singleLine">true</item>
-    <item name="android:elegantTextHeight">true</item>
-    <item name="android:textColor">@color/grayFontColor</item>
-    <item name="fontFamily">@font/product_sans_regular</item>
-  </style>
-
-  <style name="NordanTextBase">
-    <item name="android:gravity">center</item>
-    <item name="android:elegantTextHeight">true</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
+    <style name="NordanDialogButtonTheme">
+        <item name="singleLine">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:elegantTextHeight">true</item>
+        <item name="fontFamily">@font/product_sans_bold</item>
+    </style>
+
+    <style name="NordanDialogButtonTextTheme" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="singleLine">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:elegantTextHeight">true</item>
+        <item name="fontFamily">@font/product_sans_bold</item>
+    </style>
+
+    <style name="NordanTextBase">
+        <item name="android:gravity">center</item>
+        <item name="android:elegantTextHeight">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
   </style>
 
   <style name="NordanTextRegular" parent="NordanTextBase">
diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle
index 3acfd86..6467355 100644
--- a/sampleapp/build.gradle
+++ b/sampleapp/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
-        versionName "Nordan Material Dialog v1.1.5"
+        versionName "Nordan Material Dialog v1.0.5"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -25,6 +25,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "com.github.skydoves:colorpickerpreference:2.0.0"
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.10'
     implementation 'com.google.android.material:material:1.1.0'
     implementation project(path: ':app')
diff --git a/sampleapp/src/main/java/com/nordan/sampleapp/DialogCreator.java b/sampleapp/src/main/java/com/nordan/sampleapp/DialogCreator.java
index f0fdce8..232fe1c 100644
--- a/sampleapp/src/main/java/com/nordan/sampleapp/DialogCreator.java
+++ b/sampleapp/src/main/java/com/nordan/sampleapp/DialogCreator.java
@@ -1,15 +1,157 @@
 package com.nordan.sampleapp;
 
 import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.textfield.TextInputEditText;
+import com.nordan.dialog.Animation;
+import com.nordan.dialog.NordanAlertDialog;
+import com.skydoves.colorpickerview.ColorPickerDialog;
+import com.skydoves.colorpickerview.listeners.ColorEnvelopeListener;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class DialogCreator extends AppCompatActivity {
 
+    //Dialog controllers
+    private Spinner spinnerAnimation;
+    private TextInputEditText editTextPosBtn;
+    private TextInputEditText editTextNegBtn;
+    private TextInputEditText editTextTittle;
+    private TextInputEditText editTextMessage;
+    private MaterialCheckBox checkBoxCancellable;
+    private ImageView imageViewColorPicker;
+    private ImageView imageViewAccentColor;
+
+    //Dialog config
+    private boolean cancellable;
+    private String btnPos;
+    private String btnNeg;
+    private Animation animation;
+    private int headerColor;
+    private int accentColor;
+    private int icon;
+    private boolean isGif;
+    private String tittle;
+    private String message;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dialog_creator_activity);
+        initControllers();
+        setupControllers();
+    }
+
+    private void setupControllers() {
+        final List<String> animations = Arrays.stream(Animation.values())
+                .map(Enum::toString)
+                .collect(Collectors.toList());
+        animations.add(0, getString(R.string.none));
+        ArrayAdapter<String> animationListAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, animations);
+        spinnerAnimation.setAdapter(animationListAdapter);
+        imageViewColorPicker.setOnClickListener(click -> showHeaderColorPicker());
+        imageViewAccentColor.setOnClickListener(click -> showAccentColorPicker());
+        imageViewAccentColor.setBackgroundColor(getColor(R.color.colorPrimary));
+    }
+
+    private void showAccentColorPicker() {
+        new ColorPickerDialog.Builder(this)
+                .setPositiveButton("Pick", (ColorEnvelopeListener) (envelope, fromUser) -> setupAccentDialogColor(envelope.getColor()))
+                .setNegativeButton("Cancel", (dialogInterface, i) -> dialogInterface.dismiss())
+                .attachAlphaSlideBar(true)
+                .attachBrightnessSlideBar(true)
+                .show();
+    }
+
+    private void setupAccentDialogColor(int color) {
+        accentColor = color;
+        imageViewAccentColor.setBackgroundColor(color);
+    }
+
+    private void showHeaderColorPicker() {
+        new ColorPickerDialog.Builder(this)
+                .setPositiveButton("Pick", (ColorEnvelopeListener) (envelope, fromUser) -> setupHeaderDialogColor(envelope.getColor()))
+                .setNegativeButton("Cancel", (dialogInterface, i) -> dialogInterface.dismiss())
+                .attachAlphaSlideBar(true)
+                .attachBrightnessSlideBar(true)
+                .show();
+    }
+
+    private void setupHeaderDialogColor(int color) {
+        headerColor = color;
+        imageViewColorPicker.setBackgroundColor(color);
+    }
+
+    private void initControllers() {
+        spinnerAnimation = findViewById(R.id.spinner_animation);
+        findViewById(R.id.btn_reset).setOnClickListener(click -> clearDialogCreator());
+        findViewById(R.id.btn_show).setOnClickListener(click -> showDialog());
+        editTextPosBtn = findViewById(R.id.text_pos_btn);
+        editTextNegBtn = findViewById(R.id.text_neg_btn);
+        editTextTittle = findViewById(R.id.text_dialog_tittle);
+        editTextMessage = findViewById(R.id.text_dialog_message);
+        checkBoxCancellable = findViewById(R.id.checkbox_cancellable);
+        imageViewColorPicker = findViewById(R.id.image_header_color);
+        imageViewAccentColor = findViewById(R.id.accent_color);
+    }
+
+    private void clearDialogCreator() {
+        editTextPosBtn.getText().clear();
+        editTextNegBtn.getText().clear();
+        editTextTittle.getText().clear();
+        editTextMessage.getText().clear();
+        checkBoxCancellable.setChecked(false);
+        spinnerAnimation.setSelection(0);
+        imageViewColorPicker.setBackgroundColor(getColor(R.color.transparent));
+        headerColor = 0;
+        imageViewAccentColor.setBackgroundColor(getColor(R.color.colorPrimary));
+        accentColor = 0;
+        editTextPosBtn.clearFocus();
+        editTextNegBtn.clearFocus();
+        editTextTittle.clearFocus();
+        editTextMessage.clearFocus();
+    }
+
+    private void showDialog() {
+        setupDialog();
+        new NordanAlertDialog.Builder(this)
+                .setTitle(tittle)
+                .setMessage(message)
+                .setPositiveBtnText(btnPos)
+                .setNegativeBtnText(btnNeg)
+                .setAnimation(animation)
+                .onPositiveClicked(() -> Toast.makeText(this, "Clicked positive", Toast.LENGTH_SHORT).show())
+                .onNegativeClicked(() -> Toast.makeText(this, "Clicked negative", Toast.LENGTH_SHORT).show())
+                .isCancellable(cancellable)
+                .setHeaderColor(headerColor)
+                .setDialogAccentColor(accentColor)
+                .setIcon(icon, isGif)
+                .build().show();
+    }
+
+//    private void showLoadingDialog() {
+//        Dialog loading = NordanLoadingDialog.createLoadingDialog(this, "Logowanie…");
+//        loading.show();
+//        new Handler().postDelayed(loading::hide, 3000);
+//    }
+
+    private void setupDialog() {
+        btnPos = editTextPosBtn.getText().toString();
+        btnNeg = editTextNegBtn.getText().toString();
+        tittle = editTextTittle.getText().toString();
+        message = editTextMessage.getText().toString();
+        cancellable = checkBoxCancellable.isChecked();
+        String selectedAnimation = (String) spinnerAnimation.getSelectedItem();
+        animation = selectedAnimation.equalsIgnoreCase(getString(R.string.none)) ? null : Animation.valueOf(selectedAnimation);
     }
 }
diff --git a/sampleapp/src/main/res/drawable/ic_twotone_colorize_24.xml b/sampleapp/src/main/res/drawable/ic_twotone_colorize_24.xml
new file mode 100644
index 0000000..fb774f2
--- /dev/null
+++ b/sampleapp/src/main/res/drawable/ic_twotone_colorize_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="@color/grayFontColor"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="@android:color/white"
+        android:pathData="M15.896,9.023l-0.92,-0.92L17.67,5.41l0.92,0.92z"
+        android:strokeAlpha="0.3" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.71,5.63l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29s-0.51,0.1 -0.7,0.29l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3,16.25L3,21h4.75l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,-0.4 0.4,-1.03 0.01,-1.42zM6.92,19L5,17.08l8.06,-8.06 1.92,1.92L6.92,19zM15.9,9.03l-0.93,-0.93 2.69,-2.69 0.92,0.92 -2.68,2.7z" />
+</vector>
diff --git a/sampleapp/src/main/res/layout/dialog_creator_activity.xml b/sampleapp/src/main/res/layout/dialog_creator_activity.xml
index dddcbfa..3f53ddb 100644
--- a/sampleapp/src/main/res/layout/dialog_creator_activity.xml
+++ b/sampleapp/src/main/res/layout/dialog_creator_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
     <com.google.android.material.textview.MaterialTextView
@@ -8,51 +9,231 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
+        android:layout_margin="20dp"
         android:fontFamily="@font/product_sans_bold"
         android:text="@string/dialog_creator"
         android:textAlignment="center"
         android:textColor="@color/grayFontColor"
         android:textSize="30sp" />
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/table_buttons"
         android:layout_below="@id/tittle"
-        android:layout_margin="15dp"
-        android:orientation="vertical">
-        <LinearLayout
+        android:overScrollMode="never">
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:id="@+id/linear_animation"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/product_sans_regular"
-                android:text="@string/animation"
-                android:textColor="@color/grayFontColor"
-                android:textSize="20sp" />
-            <Spinner
-                android:id="@+id/spinner_animation"
-                style="@style/Widget.AppCompat.DropDownItem.Spinner"
-                android:layout_width="200dp"
-                android:layout_height="match_parent"
-                android:prompt="@string/none"
-                android:spinnerMode="dialog" />
-        </LinearLayout>
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp">
-            <com.google.android.material.textfield.TextInputEditText
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:elegantTextHeight="true"
+                    android:fontFamily="@font/product_sans_regular"
+                    android:text="@string/animation"
+                    android:textColor="@color/grayFontColor"
+                    android:textSize="20sp" />
+                <Spinner
+                    android:id="@+id/spinner_animation"
+                    style="@style/Widget.AppCompat.DropDownItem.Spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+            </LinearLayout>
+            <RelativeLayout
+                android:id="@+id/relative_cancellable"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/linear_animation"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:layout_toStartOf="@id/checkbox_cancellable"
+                    android:elegantTextHeight="true"
+                    android:fontFamily="@font/product_sans_regular"
+                    android:text="@string/cancellable"
+                    android:textColor="@color/grayFontColor"
+                    android:textSize="20sp" />
+                <com.google.android.material.checkbox.MaterialCheckBox
+                    android:id="@+id/checkbox_cancellable"
+                    style="@style/Widget.MaterialComponents.CompoundButton.CheckBox"
+                    android:layout_width="36dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    app:useMaterialThemeColors="true" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/relative_header_color_picker"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/relative_cancellable"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:layout_toStartOf="@id/card_header_color_picker"
+                    android:elegantTextHeight="true"
+                    android:fontFamily="@font/product_sans_regular"
+                    android:text="@string/header_color"
+                    android:textColor="@color/grayFontColor"
+                    android:textSize="20sp" />
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/card_header_color_picker"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_margin="2dp"
+                    android:elevation="8dp"
+                    android:innerRadius="0dp"
+                    android:shape="ring"
+                    android:thicknessRatio="2"
+                    app:cardCornerRadius="40dp"
+                    app:cardElevation="2dp">
+                    <ImageView
+                        android:id="@+id/image_header_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_centerHorizontal="true"
+                        android:adjustViewBounds="true" />
+                </com.google.android.material.card.MaterialCardView>
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/relative_accent_color_picker"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/tittle"
-                android:singleLine="true"
-                android:textSize="20sp" />
-        </com.google.android.material.textfield.TextInputLayout>
-    </LinearLayout>
+                android:layout_below="@id/relative_header_color_picker"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:layout_toStartOf="@id/card_accent_color_picker"
+                    android:elegantTextHeight="true"
+                    android:fontFamily="@font/product_sans_regular"
+                    android:text="@string/accent_color"
+                    android:textColor="@color/grayFontColor"
+                    android:textSize="20sp" />
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/card_accent_color_picker"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_margin="2dp"
+                    android:elevation="8dp"
+                    android:innerRadius="0dp"
+                    android:shape="ring"
+                    android:thicknessRatio="2"
+                    app:cardCornerRadius="40dp"
+                    app:cardElevation="2dp">
+                    <ImageView
+                        android:id="@+id/accent_color"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_centerHorizontal="true"
+                        android:adjustViewBounds="true" />
+                </com.google.android.material.card.MaterialCardView>
+            </RelativeLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/text_input_btn_pos"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/relative_accent_color_picker"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text_pos_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/positive_button_name"
+                    android:singleLine="true"
+                    android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/text_input_btn_neg"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/text_input_btn_pos"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text_neg_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/negative_button_name"
+                    android:singleLine="true"
+                    android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/text_input_dialog_tittle"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/text_input_btn_neg"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text_dialog_tittle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/tittle"
+                    android:singleLine="true"
+                    android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/text_input_dialog_tittle"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginTop="@dimen/min_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
+                android:layout_marginBottom="@dimen/min_margin_dimen">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text_dialog_message"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:hint="@string/dialog_message"
+                    android:inputType="textMultiLine"
+                    android:minLines="8"
+                    android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+        </RelativeLayout>
+    </ScrollView>
     <TableLayout
         android:id="@+id/table_buttons"
         android:layout_width="match_parent"
@@ -63,18 +244,19 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content">
             <com.google.android.material.button.MaterialButton
-                style=""
-                android:layout_width="wrap_content"
+                android:id="@+id/btn_reset"
                 android:layout_height="wrap_content"
-                android:layout_margin="20dp"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
                 android:elegantTextHeight="true"
-                android:text="Reset" />
+                android:text="@string/reset" />
             <com.google.android.material.button.MaterialButton
-                android:layout_width="wrap_content"
+                android:id="@+id/btn_show"
                 android:layout_height="wrap_content"
-                android:layout_margin="20dp"
+                android:layout_marginStart="@dimen/max_margin_dimen"
+                android:layout_marginEnd="@dimen/max_margin_dimen"
                 android:elegantTextHeight="true"
-                android:text="Show" />
+                android:text="@string/show" />
         </TableRow>
     </TableLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/sampleapp/src/main/res/values/dimens.xml b/sampleapp/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..04b2cf2
--- /dev/null
+++ b/sampleapp/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="min_margin_dimen">15dp</dimen>
+    <dimen name="max_margin_dimen">20dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/sampleapp/src/main/res/values/strings.xml b/sampleapp/src/main/res/values/strings.xml
index ad85296..b667dcb 100644
--- a/sampleapp/src/main/res/values/strings.xml
+++ b/sampleapp/src/main/res/values/strings.xml
@@ -1,9 +1,18 @@
 <resources>
-  <string name="app_name">SampleApp</string>
-  <string name="default_dialogs">Default dialogs</string>
-  <string name="create_your_dialog">Create your dialog</string>
-  <string name="dialog_creator">Dialog Creator</string>
-  <string name="tittle">Tittle</string>
-  <string name="animation">Animation</string>
-  <string name="none">None</string>
+    <string name="app_name">SampleApp</string>
+    <string name="default_dialogs">Default dialogs</string>
+    <string name="create_your_dialog">Create your dialog</string>
+    <string name="dialog_creator">Dialog Creator</string>
+    <string name="tittle">Tittle</string>
+    <string name="animation">Animation</string>
+    <string name="none">NONE</string>
+    <string name="item_tittle">Item tittle</string>
+    <string name="reset">Reset</string>
+    <string name="show">Show</string>
+    <string name="cancellable">Cancellable</string>
+    <string name="dialog_message">Message</string>
+    <string name="negative_button_name">Negative button (Optional)</string>
+    <string name="positive_button_name">Positive button (Default OK)</string>
+    <string name="header_color">Header color</string>
+    <string name="accent_color">Accent color</string>
 </resources>
\ No newline at end of file
diff --git a/sampleapp/src/main/res/values/styles.xml b/sampleapp/src/main/res/values/styles.xml
index 2171f8f..ff28293 100644
--- a/sampleapp/src/main/res/values/styles.xml
+++ b/sampleapp/src/main/res/values/styles.xml
@@ -7,5 +7,4 @@
     <item name="android:windowNoTitle">true</item>
     <item name="android:windowFullscreen">true</item>
   </style>
-
 </resources>
\ No newline at end of file