diff --git a/app/build.gradle b/app/build.gradle
index 1a5b225..624ba93 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ android {
     buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId 'com.blogspot.e_kanivets.moneytracker'
-        minSdkVersion 17
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdkVersion 29
 
         versionCode 31
         versionName '2.0.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b50798..26d811e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.blogspot.e_kanivets.moneytracker">
 
-    <!-- Used only for Dropbox backup -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:name=".MtApp"
         android:allowBackup="true"
@@ -32,7 +29,7 @@
             android:name=".activity.record.AddRecordActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default"
-            android:windowSoftInputMode="stateVisible" />
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".activity.account.AddAccountActivity"
             android:label="@string/title_add_account"
@@ -98,15 +95,19 @@
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
-                <data android:scheme="db-5lqugcckdy9y6lj" />
-
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="db-5lqugcckdy9y6lj" />
             </intent-filter>
         </activity>
 
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="955ae4864ae2a833aeda5b62631512524288adf8" />
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.blogspot.e_kanivets.moneytracker"
@@ -117,10 +118,8 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="955ae4864ae2a833aeda5b62631512524288adf8" />
-
     </application>
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.kt
index 7b02025..2a051d6 100644
--- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.kt
+++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.kt
@@ -4,6 +4,9 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.DatePickerDialog
 import android.app.TimePickerDialog
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.support.v4.content.ContextCompat
 import android.text.InputFilter
 import android.text.Spanned
 import android.text.format.DateFormat
@@ -29,6 +32,7 @@ import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy
 import com.blogspot.e_kanivets.moneytracker.util.CategoryAutoCompleter
 import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator
 import com.blogspot.e_kanivets.moneytracker.util.validator.RecordValidator
+import kotlinx.android.synthetic.main.activity_add_record.*
 import kotlinx.android.synthetic.main.content_add_record.*
 import java.util.*
 import javax.inject.Inject
@@ -103,9 +107,21 @@ class AddRecordActivity : BaseBackActivity() {
         tvDate.setOnClickListener { selectDate() }
         tvTime.setOnClickListener { selectTime() }
 
+        if (type == Record.TYPE_EXPENSE) {
+            fabDone.backgroundTintList = (getColorForFab(R.color.red_light))
+        } else {
+            fabDone.backgroundTintList = (getColorForFab(R.color.green_light))
+        }
+
+        fabDone.setOnClickListener { tryRecord() }
+
         updateDateAndTime()
     }
 
+    private fun getColorForFab(color: Int): ColorStateList {
+        return ColorStateList.valueOf(ContextCompat.getColor(this, color))
+    }
+
     private fun initCategoryAutocomplete() {
         val categoryAutoCompleteAdapter = CategoryAutoCompleteAdapter(
                 this, R.layout.view_category_item, autoCompleter)
@@ -145,21 +161,16 @@ class AddRecordActivity : BaseBackActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_done -> {
-                tryRecord()
-                return true
-            }
-
+        return when (item.itemId) {
             R.id.action_delete -> {
                 if (recordController.delete(record)) {
                     setResult(Activity.RESULT_OK)
                     finish()
                 }
-                return true
+                true
             }
 
-            else -> return super.onOptionsItemSelected(item)
+            else -> super.onOptionsItemSelected(item)
         }
     }
 
@@ -284,8 +295,7 @@ class AddRecordActivity : BaseBackActivity() {
     private class SemicolonInputFilter : InputFilter {
 
         override fun filter(source: CharSequence?, start: Int, end: Int, dest: Spanned, dstart: Int, dend: Int): CharSequence? {
-            return if (source != null && ";" == source.toString()) ""
-            else null
+            return if (source != null && ";" == source.toString()) "" else null
         }
     }
 
diff --git a/app/src/main/res/layout/activity_add_record.xml b/app/src/main/res/layout/activity_add_record.xml
index 9ae1631..4833356 100644
--- a/app/src/main/res/layout/activity_add_record.xml
+++ b/app/src/main/res/layout/activity_add_record.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".activity.record.AddRecordActivity">
 
     <android.support.design.widget.AppBarLayout
@@ -20,6 +21,13 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_add_record" />
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fabDone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:src="@drawable/ic_done"
+        android:layout_margin="@dimen/normal_margin" />
 
+    <include layout="@layout/content_add_record" />
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_add_record.xml b/app/src/main/res/menu/menu_add_record.xml
index da5eafd..bf39684 100644
--- a/app/src/main/res/menu/menu_add_record.xml
+++ b/app/src/main/res/menu/menu_add_record.xml
@@ -8,10 +8,4 @@
         android:title="@string/delete"
         tools:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/action_done"
-        android:icon="@drawable/ic_done"
-        android:title="@string/add"
-        tools:showAsAction="ifRoom" />
-
 </menu>
\ No newline at end of file