diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aca6ff07..2b9d2881 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
             android:theme="@style/SplashTheme">
 
             <intent-filter>
+                <action android:name="com.simplemobiletools.clock.TOGGLE_STOPWATCH" />
                 <action android:name="android.intent.action.SHOW_ALARMS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
index 8e9739a5..7ebb5d68 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
@@ -1,7 +1,11 @@
 package com.simplemobiletools.clock.activities
 
+import android.annotation.SuppressLint
 import android.content.Intent
+import android.content.pm.ShortcutInfo
 import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Icon
+import android.graphics.drawable.LayerDrawable
 import android.os.Bundle
 import android.view.WindowManager
 import android.widget.ImageView
@@ -69,8 +73,44 @@ class MainActivity : SimpleActivity() {
         }
 
         setupTabColors()
+        checkShortcuts()
     }
 
+    @SuppressLint("NewApi")
+    private fun checkShortcuts() {
+        val appIconColor = config.appIconColor
+        if (isNougatMR1Plus() && config.lastHandledShortcutColor != appIconColor) {
+            val launchDialpad = getLaunchStopwatchShortcut(appIconColor)
+
+            try {
+                shortcutManager.dynamicShortcuts = listOf(launchDialpad)
+                config.lastHandledShortcutColor = appIconColor
+            } catch (ignored: Exception) {
+            }
+        }
+    }
+
+    @SuppressLint("NewApi")
+    private fun getLaunchStopwatchShortcut(appIconColor: Int): ShortcutInfo {
+        val newEvent = getString(R.string.start_stopwatch)
+        val drawable = resources.getDrawable(R.drawable.shortcut_stopwatch)
+        (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_stopwatch_background).applyColorFilter(appIconColor)
+        val bmp = drawable.convertToBitmap()
+
+        val intent = Intent(this, SplashActivity::class.java).apply {
+            putExtra(OPEN_TAB, TAB_STOPWATCH)
+            putExtra(TOGGLE_STOPWATCH, true)
+            action = STOPWATCH_TOGGLE_ACTION
+        }
+        return ShortcutInfo.Builder(this, STOPWATCH_SHORTCUT_ID)
+            .setShortLabel(newEvent)
+            .setLongLabel(newEvent)
+            .setIcon(Icon.createWithBitmap(bmp))
+            .setIntent(intent)
+            .build()
+    }
+
+
     override fun onPause() {
         super.onPause()
         storeStateVariables()
@@ -106,6 +146,11 @@ class MainActivity : SimpleActivity() {
                 val timerId = intent.getIntExtra(TIMER_ID, INVALID_TIMER_ID)
                 (view_pager.adapter as ViewPagerAdapter).updateTimerPosition(timerId)
             }
+            if (tabToOpen == TAB_STOPWATCH) {
+                if (intent.getBooleanExtra(TOGGLE_STOPWATCH, false)) {
+                    (view_pager.adapter as ViewPagerAdapter).startStopWatch()
+                }
+            }
         }
         super.onNewIntent(intent)
     }
@@ -152,7 +197,9 @@ class MainActivity : SimpleActivity() {
             val timerId = intent.getIntExtra(TIMER_ID, INVALID_TIMER_ID)
             viewPagerAdapter.updateTimerPosition(timerId)
         }
-
+        if (tabToOpen == TAB_STOPWATCH) {
+            config.toggleStopWatch = intent.getBooleanExtra(TOGGLE_STOPWATCH, false)
+        }
         view_pager.offscreenPageLimit = TABS_COUNT - 1
         view_pager.currentItem = tabToOpen
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt
index d2d8c736..cb96e549 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SplashActivity.kt
@@ -13,6 +13,13 @@ class SplashActivity : BaseSplashActivity() {
                     startActivity(this)
                 }
             }
+            intent?.action == STOPWATCH_TOGGLE_ACTION -> {
+                Intent(this, MainActivity::class.java).apply {
+                    putExtra(OPEN_TAB, TAB_STOPWATCH)
+                    putExtra(TOGGLE_STOPWATCH, intent.getBooleanExtra(TOGGLE_STOPWATCH, false))
+                    startActivity(this)
+                }
+            }
             intent.extras?.containsKey(OPEN_TAB) == true -> {
                 Intent(this, MainActivity::class.java).apply {
                     putExtra(OPEN_TAB, intent.getIntExtra(OPEN_TAB, TAB_CLOCK))
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt
index 6f795b98..f5517f93 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/ViewPagerAdapter.kt
@@ -12,6 +12,7 @@ import com.simplemobiletools.clock.helpers.TABS_COUNT
 import com.simplemobiletools.clock.helpers.TAB_ALARM
 import com.simplemobiletools.clock.helpers.TAB_CLOCK
 import com.simplemobiletools.clock.helpers.TAB_TIMER
+import com.simplemobiletools.clock.helpers.TAB_STOPWATCH
 import com.simplemobiletools.commons.models.AlarmSound
 
 class ViewPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) {
@@ -57,4 +58,8 @@ class ViewPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) {
     fun updateTimerPosition(timerId: Int) {
         (fragments[TAB_TIMER] as? TimerFragment)?.updatePosition(timerId)
     }
+
+    fun startStopWatch() {
+        (fragments[TAB_STOPWATCH] as? StopwatchFragment)?.startStopWatch()
+    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
index c59cdcaa..8b16251f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
@@ -91,6 +91,11 @@ class StopwatchFragment : Fragment() {
         if (Stopwatch.laps.isNotEmpty()) {
             updateSorting(Lap.sorting)
         }
+
+        if (requireContext().config.toggleStopwatch) {
+            requireContext().config.toggleStopwatch = false
+            startStopWatch()
+        }
     }
 
     override fun onPause() {
@@ -185,6 +190,12 @@ class StopwatchFragment : Fragment() {
         }
     }
 
+    fun startStopWatch() {
+        if (Stopwatch.state == Stopwatch.State.STOPPED) {
+            togglePlayPause()
+        }
+    }
+
     private fun updateLaps() {
         stopwatchAdapter.updateItems(Stopwatch.laps)
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt
index e8abf2b8..3421917c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import android.media.RingtoneManager
 import com.simplemobiletools.clock.extensions.gson.gson
 import com.simplemobiletools.clock.models.Alarm
-import com.simplemobiletools.clock.models.StateWrapper
 import com.simplemobiletools.clock.models.Timer
-import com.simplemobiletools.clock.models.TimerState
 import com.simplemobiletools.commons.extensions.getDefaultAlarmSound
 import com.simplemobiletools.commons.extensions.getDefaultAlarmTitle
 import com.simplemobiletools.commons.helpers.BaseConfig
@@ -49,6 +47,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getString(TIMER_LABEL, null)
         set(label) = prefs.edit().putString(TIMER_LABEL, label).apply()
 
+    var toggleStopwatch: Boolean
+        get() = prefs.getBoolean(TOGGLE_STOPWATCH, false)
+        set(toggleStopwatch) = prefs.edit().putBoolean(TOGGLE_STOPWATCH, toggleStopwatch).apply()
+
     var alarmSort: Int
         get() = prefs.getInt(ALARMS_SORT_BY, SORT_BY_CREATION_ORDER)
         set(alarmSort) = prefs.edit().putInt(ALARMS_SORT_BY, alarmSort).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
index 57590f6e..f4d5b713 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
@@ -13,6 +13,7 @@ const val TIMER_SOUND_URI = "timer_sound_uri"
 const val TIMER_SOUND_TITLE = "timer_sound_title"
 const val TIMER_CHANNEL_ID = "timer_channel_id"
 const val TIMER_LABEL = "timer_label"
+const val TOGGLE_STOPWATCH = "toggle_stopwatch"
 const val TIMER_MAX_REMINDER_SECS = "timer_max_reminder_secs"
 const val ALARM_MAX_REMINDER_SECS = "alarm_max_reminder_secs"
 const val ALARM_LAST_CONFIG = "alarm_last_config"
@@ -60,6 +61,10 @@ const val SORT_BY_DATE_AND_TIME = 2
 const val TODAY_BIT = -1
 const val TOMORROW_BIT = -2
 
+// stopwatch shortcut
+const val STOPWATCH_SHORTCUT_ID = "stopwatch_shortcut_id"
+const val STOPWATCH_TOGGLE_ACTION = "com.simplemobiletools.clock.TOGGLE_STOPWATCH"
+
 fun getDefaultTimeZoneTitle(id: Int) = getAllTimeZones().firstOrNull { it.id == id }?.title ?: ""
 
 fun getPassedSeconds(): Int {
diff --git a/app/src/main/res/drawable/shortcut_stopwatch.xml b/app/src/main/res/drawable/shortcut_stopwatch.xml
new file mode 100644
index 00000000..d1c4e8ec
--- /dev/null
+++ b/app/src/main/res/drawable/shortcut_stopwatch.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/shortcut_stopwatch_background">
+        <shape android:shape="oval">
+            <solid android:color="@color/color_primary" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="@dimen/medium_margin"
+        android:drawable="@drawable/ic_stopwatch_vector"
+        android:left="@dimen/medium_margin"
+        android:right="@dimen/medium_margin"
+        android:top="@dimen/medium_margin" />
+
+</layer-list>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a96faf7b..f399032d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">ساعة التوقيف</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">اللفه</string>
     <string name="stopwatch_stopped">تم إيقاف ساعة التوقيف</string>
     <string name="timer_stopped">تم إيقاف الموقت</string>
@@ -53,4 +54,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index ad12768f..cdf2c1cb 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Sayğac</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Dövrə</string>
     <string name="stopwatch_stopped">Saniyəölçən dayandı</string>
     <string name="timer_stopped">Sayğaç dayandı</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index f783fc80..ab9cf042 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Гадзіннік</string>
     <string name="timer">Таймер</string>
     <string name="stopwatch">Секундамер</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Круг</string>
     <string name="stopwatch_stopped">Секундамер спынены</string>
     <string name="timer_stopped">Таймер спынены</string>
@@ -51,4 +52,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 22c4300e..5c830496 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Часовник</string>
     <string name="timer">Таймер</string>
     <string name="stopwatch">Секундомер</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Обиколка</string>
     <string name="stopwatch_stopped">Секундомерът е спрян</string>
     <string name="timer_stopped">Таймерът е спрян</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 03211be9..b82317cb 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Temporitzador</string>
     <string name="stopwatch">Cronòmetre</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Volta</string>
     <string name="stopwatch_stopped">S\'ha aturat el cronòmetre</string>
     <string name="timer_stopped">S\'ha aturat el temporitzador</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index dd49e2c6..9f7ba956 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Hodiny</string>
     <string name="timer">Časovač</string>
     <string name="stopwatch">Stopky</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Mezičas</string>
     <string name="stopwatch_stopped">Stopky byly zastaveny</string>
     <string name="timer_stopped">Časovač byl zastaven</string>
@@ -50,4 +51,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 41a362f4..299123e9 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Amserydd</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Lap</string>
     <string name="stopwatch_stopped">Cafodd y stopwats ei stopio</string>
     <string name="timer_stopped">Cafodd yr amserydd ei stopio</string>
@@ -53,4 +54,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b8b3c963..376a068d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Æggeur</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Mellemtid</string>
     <string name="stopwatch_stopped">Stopuret er standset</string>
     <string name="timer_stopped">Æggeuret er standset</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7fe9142b..b07eb2fa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stoppuhr</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Runde</string>
     <string name="stopwatch_stopped">Die Stoppuhr wurde angehalten</string>
     <string name="timer_stopped">Der Timer wurde angehalten</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0030957b..3cda5721 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Ρολόι</string>
     <string name="timer">Χρονόμετρο</string>
     <string name="stopwatch">Χρονομετρητής</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Γύρος</string>
     <string name="stopwatch_stopped">Ο χρονοδιακόπτης σταμάτησε</string>
     <string name="timer_stopped">Το χρονόμετρο σταμάτησε</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 58fe0490..a000c644 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Lap</string>
     <string name="stopwatch_stopped">Stopwatch has been stopped</string>
     <string name="timer_stopped">Timer has been stopped</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 69cc1605..5e3bb024 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Reloj</string>
     <string name="timer">Temporizador</string>
     <string name="stopwatch">Cronómetro</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Vuelta</string>
     <string name="stopwatch_stopped">El cronómetro se ha detenido</string>
     <string name="timer_stopped">El temporizador se ha detenido</string>
@@ -50,4 +51,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index b11d1a74..8aaab2eb 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Taimer</string>
     <string name="stopwatch">Stopper</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Ringi aeg</string>
     <string name="stopwatch_stopped">Stopper on kinni</string>
     <string name="timer_stopped">Taimer on peatunud</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 83474f20..a25e1ca8 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Tenporizagailua</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Bira</string>
     <string name="stopwatch_stopped">Kronometroa gelditu da</string>
     <string name="timer_stopped">Tenporizagailua gelditu da</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 25315f6c..bce15101 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Ajastin</string>
     <string name="stopwatch">Ajanotto</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Kierrosaika</string>
     <string name="stopwatch_stopped">Sekuntikello pysäytetty</string>
     <string name="timer_stopped">Ajastin on pysäytetty</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9189f187..0564ae26 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Minuterie</string>
     <string name="stopwatch">Chronomètre</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Tour</string>
     <string name="stopwatch_stopped">Chronomètre arrêté</string>
     <string name="timer_stopped">La minuterie a été arrêtée</string>
@@ -50,4 +51,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 578a8924..53600d7c 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Reloxo</string>
     <string name="timer">Temporizador</string>
     <string name="stopwatch">Cronómetro</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Volta</string>
     <string name="stopwatch_stopped">O cronómetro detívose</string>
     <string name="timer_stopped">O temporizador detívose</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 144bd41f..5b99af89 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Sat</string>
     <string name="timer">Brojač</string>
     <string name="stopwatch">Štoperica</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Runda</string>
     <string name="stopwatch_stopped">Štoperica je zaustavljena</string>
     <string name="timer_stopped">Brojač je zaustavljen</string>
@@ -50,4 +51,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index fb09878a..9717162b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Időzítő</string>
     <string name="stopwatch">stopperóra</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Kör</string>
     <string name="stopwatch_stopped">A stopper leállt</string>
     <string name="timer_stopped">Az időzítő leállt</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 75885fa7..7137be2c 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Putaran</string>
     <string name="stopwatch_stopped">Stopwatch telah berhenti</string>
     <string name="timer_stopped">Timer telah berhenti</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a7edacd7..3463f23e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Contaminuti</string>
     <string name="stopwatch">Cronometro</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Parziale</string>
     <string name="stopwatch_stopped">Il cronometro è stato fermato</string>
     <string name="timer_stopped">Il contaminuti è stato fermato</string>
@@ -50,4 +51,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2210b278..1bd84713 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">טיימר</string>
     <string name="stopwatch">סטופר</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">הקפה</string>
     <string name="stopwatch_stopped">שעון העצר הופסק</string>
     <string name="timer_stopped">הטיימר הופסק</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 19aecaa8..ca4addac 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">タイマー</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">ラップ</string>
     <string name="stopwatch_stopped">ストップウォッチが停止しました</string>
     <string name="timer_stopped">タイマーが停止しました</string>
@@ -48,4 +49,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 7fe8c812..d72ee60c 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Laikmatis</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Etapas</string>
     <string name="stopwatch_stopped">Chronometras buvo sustabdytas</string>
     <string name="timer_stopped">Laikmatis buvo sustabdytas</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 34be8e3a..e520c0b3 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">ക്ലോക്ക്</string>
     <string name="timer">ടൈമർ</string>
     <string name="stopwatch">സ്റ്റോപ്പ് വാച്ച്</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">ലാപ്‌</string>
     <string name="stopwatch_stopped">സ്റ്റോപ്പ് വാച്ച് നിർത്തിയിരിക്കുന്നു</string>
     <string name="timer_stopped">ടൈമർ നിർത്തിയിരിക്കുന്നു</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 2a8f8c82..737de172 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Runde</string>
     <string name="stopwatch_stopped">Stoppeklokke er stoppet</string>
     <string name="timer_stopped">Timer er stoppet</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index fb7a785c..7454a098 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Klok</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Ronde</string>
     <string name="stopwatch_stopped">Stopwatch is gestopt</string>
     <string name="timer_stopped">Timer is gestopt</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 6ede5f60..46e5ba40 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -9,6 +9,7 @@
     <string name="no_days_selected">کوئی دن نہیں چݨے اے</string>
     <string name="timer">سماں والا</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">لیپ</string>
     <string name="stopwatch_stopped">Stopwatch has been stopped</string>
     <string name="timer_stopped">Timer has been stopped</string>
@@ -42,4 +43,4 @@
     <string name="increase_volume_gradually">ہولی ہولی آواز ودھاؤ</string>
     <string name="faq_1_title">How can I change lap sorting at the stopwatch tab\?</string>
     <string name="faq_1_text">Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f515846b..7c7ca5a5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Zegar</string>
     <string name="timer">Minutnik</string>
     <string name="stopwatch">Stoper</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Okrążenie</string>
     <string name="stopwatch_stopped">Stoper został zatrzymany</string>
     <string name="timer_stopped">Minutnik został zatrzymany</string>
@@ -51,4 +52,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1349d098..b0d24439 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Temporizador</string>
     <string name="stopwatch">Cronômetro</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Volta</string>
     <string name="stopwatch_stopped">O cronômetro foi parado</string>
     <string name="timer_stopped">O temporizador foi parado</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a39a438a..d7c816ea 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Temporizador</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Volta</string>
     <string name="stopwatch_stopped">Cronómetro parado</string>
     <string name="timer_stopped">Temporizador parado</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 4fca7637..0922e77b 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Ceas</string>
     <string name="timer">Temporizator</string>
     <string name="stopwatch">Cronometru</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Tură</string>
     <string name="stopwatch_stopped">Cronometrul a fost oprit</string>
     <string name="timer_stopped">Temporizatorul a fost oprit</string>
@@ -50,4 +51,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5399dd1f..61d84bd1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Часы</string>
     <string name="timer">Таймер</string>
     <string name="stopwatch">Секундомер</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Круг</string>
     <string name="stopwatch_stopped">Секундомер остановлен</string>
     <string name="timer_stopped">Таймер остановлен</string>
@@ -51,4 +52,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d00499b5..49a07161 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Hodinky</string>
     <string name="timer">Časovač</string>
     <string name="stopwatch">Stopky</string>
+    <string name="start_stopwatch">Spustiť stopky</string>
     <string name="lap">Okruh</string>
     <string name="stopwatch_stopped">Stopky boli zastavené</string>
     <string name="timer_stopped">Časovač bol zastavený</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 2934f5f0..40f8ec74 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="lap">Krog</string>
     <string name="app_name">Enostavna ura</string>
     <string name="app_launcher_name">Ura</string>
     <string name="time_zone">Časovne cone</string>
@@ -9,6 +8,8 @@
     <string name="clock">Ura</string>
     <string name="timer">Časovnik</string>
     <string name="stopwatch">Štoparica</string>
+    <string name="start_stopwatch">Start stopwatch</string>
+    <string name="lap">Krog</string>
     <string name="stopwatch_stopped">Štoparica se je ustavila</string>
     <string name="timer_stopped">Časovnik je bil ustavljen</string>
     <string name="max_reminder_duration">Najdaljše trajanje opomnika</string>
@@ -27,8 +28,8 @@
     <string name="add_alarm">Dodajte alarm</string>
     <string name="no_timers_found">Ni časovnikov</string>
     <string name="add_timer">Dodajte časovnik</string>
+    <!-- Timer -->
     <string name="timers_notification_msg">Tečejo časovniki</string>
-    <string name="faq_1_text">Kliknite na izbrani stolpec, da se krogi razvrstijo stolpcu. Z dodatnimi kliki preklapljate med naraščajočim in padajočim razvrščanjem.</string>
     <string name="timer_single_notification_label_msg">Časovnik za %s teče</string>
     <string name="new_timer">Nov časovnik</string>
     <plurals name="timer_notification_msg">
@@ -37,11 +38,14 @@
         <item quantity="few">%d tečejo nekateri časovniki</item>
         <item quantity="other">%d tečejo drugi časovniki</item>
     </plurals>
+    <!-- Settings -->
     <string name="clock_tab">Zavihek ura</string>
     <string name="alarm_tab">Zavihek alarm</string>
     <string name="stopwatch_tab">Zavihek štoparice</string>
     <string name="timer_tab">Zavihek časovnik</string>
     <string name="show_seconds">Prikaži sekunde</string>
     <string name="increase_volume_gradually">Povečajte postopno glasnost</string>
+    <!-- FAQ -->
     <string name="faq_1_title">Kako spremenim razvrščanje krogov v zavihku štoparica\?</string>
-</resources>
\ No newline at end of file
+    <string name="faq_1_text">Kliknite na izbrani stolpec, da se krogi razvrstijo stolpcu. Z dodatnimi kliki preklapljate med naraščajočim in padajočim razvrščanjem.</string>
+</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 3cf74c55..bf52249f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -4,6 +4,7 @@
     <string name="clock">Сат</string>
     <string name="timer">Сат</string>
     <string name="stopwatch">Штоперица</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Круг</string>
     <string name="app_name">Једноставан сат</string>
     <string name="app_launcher_name">Сат</string>
@@ -43,4 +44,4 @@
     <string name="increase_volume_gradually">Постепено повећавајте јачину звука</string>
     <string name="faq_1_title">Како могу да променим сортирање кругова на картици штоперице\?</string>
     <string name="faq_1_text">Само кликните на било коју колону, тако да ће кругови бити сортирани према датој колони. Додатним кликовима можете се пребацивати између растућег и опадајућег сортирања.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 42bdc510..9759c289 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Klocka</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stoppur</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Varv</string>
     <string name="stopwatch_stopped">Stoppuret har stoppats</string>
     <string name="timer_stopped">Timern har stoppats</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 58fe0490..a000c644 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Lap</string>
     <string name="stopwatch_stopped">Stopwatch has been stopped</string>
     <string name="timer_stopped">Timer has been stopped</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 68b5ad39..f72f3750 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Saat</string>
     <string name="timer">Zamanlayıcı</string>
     <string name="stopwatch">Kronometre</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Tur</string>
     <string name="stopwatch_stopped">Kronometre durduruldu</string>
     <string name="timer_stopped">Zamanlayıcı durduruldu</string>
@@ -49,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 56898705..b5851659 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Таймер</string>
     <string name="stopwatch">Секундомір</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Інтервал</string>
     <string name="stopwatch_stopped">Секундомір зупинено</string>
     <string name="timer_stopped">Таймер зупинено</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 10f1885c..77245351 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">时钟</string>
     <string name="timer">定时器</string>
     <string name="stopwatch">秒表</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">分段</string>
     <string name="stopwatch_stopped">秒表已停止</string>
     <string name="timer_stopped">定时器已停止</string>
@@ -48,4 +49,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c40cb023..d84ed0c9 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -7,6 +7,7 @@
     <string name="clock">Clock</string>
     <string name="timer">計時器</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">分段</string>
     <string name="stopwatch_stopped">碼錶已停止</string>
     <string name="timer_stopped">計時器已停止</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfed2d96..7f4054a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
     <string name="clock">Clock</string>
     <string name="timer">Timer</string>
     <string name="stopwatch">Stopwatch</string>
+    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Lap</string>
     <string name="stopwatch_stopped">Stopwatch has been stopped</string>
     <string name="timer_stopped">Timer has been stopped</string>
@@ -53,4 +54,5 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
+
 </resources>