diff --git a/lib/screens/main_screen/annotation_dialog.dart b/lib/screens/main_screen/annotation_dialog.dart
index 10dfb45..a08a416 100644
--- a/lib/screens/main_screen/annotation_dialog.dart
+++ b/lib/screens/main_screen/annotation_dialog.dart
@@ -30,14 +30,14 @@ class _AnnotationDialogState extends State<AnnotationDialog> {
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
           Padding(
-            padding: const EdgeInsets.all(MEDIUM_SPACE),
+            padding: const EdgeInsets.all(SMALL_SPACE),
             child: Column(
               children: <Widget>[
                 Text(
                   localizations.mainScreenAnnotationDialogTitle,
                   style: getTitleTextStyle(context),
                 ),
-                const SizedBox(height: MEDIUM_SPACE),
+                const SizedBox(height: SMALL_SPACE),
                 Text(
                   localizations.mainScreenAnnotationDialogExplanation,
                   style: getBodyTextTextStyle(context),
diff --git a/lib/screens/main_screen/record_button.dart b/lib/screens/main_screen/record_button.dart
index 3239816..c55a7a1 100644
--- a/lib/screens/main_screen/record_button.dart
+++ b/lib/screens/main_screen/record_button.dart
@@ -85,9 +85,9 @@ class _RecordButtonState extends State<RecordButton> {
           animateToVideoIcon = false;
         });
 
-        HapticFeedback.lightImpact();
-
         if (widget.active) {
+          HapticFeedback.lightImpact();
+
           widget.onVideoEnd();
         }
       },
diff --git a/lib/widgets/raw_memory_display.dart b/lib/widgets/raw_memory_display.dart
index 955a51b..ca9f734 100644
--- a/lib/widgets/raw_memory_display.dart
+++ b/lib/widgets/raw_memory_display.dart
@@ -21,10 +21,7 @@ class RawMemoryDisplay extends StatefulWidget {
     this.onVideoControllerInitialized,
     this.file,
     this.data,
-  })  : assert(data != null || file != null),
-        assert((type == MemoryType.photo) ||
-            (type == MemoryType.video && data != null)),
-        super(key: key);
+  }) : super(key: key);
 
   @override
   State<RawMemoryDisplay> createState() => _RawMemoryDisplayState();