diff --git a/applications/plugins/totp/.clang-format b/applications/plugins/totp/.clang-format
deleted file mode 100644
index 4b76f7fa4..000000000
--- a/applications/plugins/totp/.clang-format
+++ /dev/null
@@ -1,191 +0,0 @@
----
-Language:        Cpp
-AccessModifierOffset: -4
-AlignAfterOpenBracket: AlwaysBreak
-AlignArrayOfStructures: None
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveBitFields: None
-AlignConsecutiveDeclarations: None
-AlignEscapedNewlines: Left
-AlignOperands:   Align
-AlignTrailingComments: false
-AllowAllArgumentsOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortEnumsOnASingleLine: true
-AllowShortBlocksOnASingleLine: Never
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
-AttributeMacros:
-  - __capability
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: Never
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  BeforeLambdaBody: false
-  BeforeWhile:     false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: true
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeComma
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: false
-ColumnLimit:     99
-CommentPragmas:  '^ IWYU pragma:'
-QualifierAlignment: Leave
-CompactNamespaces: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DeriveLineEnding: true
-DerivePointerAlignment: false
-DisableFormat:   false
-EmptyLineAfterAccessModifier: Never
-EmptyLineBeforeAccessModifier: LogicalBlock
-ExperimentalAutoDetectBinPacking: false
-PackConstructorInitializers: BinPack
-BasedOnStyle:    ''
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-AllowAllConstructorInitializersOnNextLine: true
-FixNamespaceComments: false
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IfMacros:
-  - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
-IndentCaseLabels: false
-IndentCaseBlocks: false
-IndentGotoLabels: true
-IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
-IndentRequires:  false
-IndentWidth:     4
-IndentWrappedFunctionNames: true
-InsertTrailingCommas: None
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-LambdaBodyIndentation: Signature
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 4
-ObjCBreakBeforeNestedBlockParam: true
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 10
-PenaltyBreakBeforeFirstCallParameter: 30
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakOpenParenthesis: 0
-PenaltyBreakString: 10
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
-PointerAlignment: Left
-PPIndentWidth:   -1
-ReferenceAlignment: Pointer
-ReflowComments:  false
-RemoveBracesLLVM: false
-SeparateDefinitionBlocks: Leave
-ShortNamespaceLines: 1
-SortIncludes:    Never
-SortJavaStaticImport: Before
-SortUsingDeclarations: false
-SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCaseColon: false
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: Never
-SpaceBeforeParensOptions:
-  AfterControlStatements: false
-  AfterForeachMacros: false
-  AfterFunctionDefinitionName: false
-  AfterFunctionDeclarationName: false
-  AfterIfMacros:   false
-  AfterOverloadedOperator: false
-  BeforeNonEmptyParentheses: false
-SpaceAroundPointerQualifiers: Default
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  Never
-SpacesInConditionalStatement: false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInLineCommentPrefix:
-  Minimum:         1
-  Maximum:         -1
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
-BitFieldColonSpacing: Both
-Standard:        c++03
-StatementAttributeLikeMacros:
-  - Q_EMIT
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        4
-UseCRLF:         false
-UseTab:          Never
-WhitespaceSensitiveMacros:
-  - STRINGIZE
-  - PP_STRINGIZE
-  - BOOST_PP_STRINGIZE
-  - NS_SWIFT_NAME
-  - CF_SWIFT_NAME
-...
-
diff --git a/applications/plugins/totp/scenes/add_new_token/totp_input_text.c b/applications/plugins/totp/scenes/add_new_token/totp_input_text.c
index 811cd2976..e3a7f68a6 100644
--- a/applications/plugins/totp/scenes/add_new_token/totp_input_text.c
+++ b/applications/plugins/totp/scenes/add_new_token/totp_input_text.c
@@ -2,16 +2,6 @@
 #include <gui/view_i.h>
 #include "../../types/common.h"
 
-size_t strnlen(const char* s, size_t maxlen) {
-    size_t len;
-
-    for(len = 0; len < maxlen; len++, s++) {
-        if(!*s) break;
-    }
-
-    return len;
-}
-
 void view_draw(View* view, Canvas* canvas) {
     furi_assert(view);
     if(view->draw_callback) {
@@ -42,14 +32,10 @@ static void commit_text_input_callback(void* context) {
     InputTextSceneState* text_input_state = (InputTextSceneState*)context;
     if(text_input_state->callback != 0) {
         InputTextSceneCallbackResult* result = malloc(sizeof(InputTextSceneCallbackResult));
-        result->user_input_length =
-            strnlen(text_input_state->text_input_buffer, INPUT_BUFFER_SIZE);
+        result->user_input_length = strlen(text_input_state->text_input_buffer);
         result->user_input = malloc(result->user_input_length + 1);
         result->callback_data = text_input_state->callback_data;
-        strlcpy(
-            result->user_input,
-            text_input_state->text_input_buffer,
-            result->user_input_length + 1);
+        strcpy(result->user_input, text_input_state->text_input_buffer);
         text_input_state->callback(result);
     }
 }
diff --git a/applications/plugins/totp/scenes/add_new_token/totp_input_text.h b/applications/plugins/totp/scenes/add_new_token/totp_input_text.h
index dda0dc301..a73a227b5 100644
--- a/applications/plugins/totp/scenes/add_new_token/totp_input_text.h
+++ b/applications/plugins/totp/scenes/add_new_token/totp_input_text.h
@@ -10,7 +10,7 @@
 
 typedef struct {
     char* user_input;
-    size_t user_input_length;
+    uint8_t user_input_length;
     void* callback_data;
 } InputTextSceneCallbackResult;
 
diff --git a/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c b/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c
index cc4e6a69d..fc39b66cd 100644
--- a/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c
+++ b/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.c
@@ -25,9 +25,9 @@ typedef enum {
 
 typedef struct {
     char* token_name;
-    size_t token_name_length;
+    uint8_t token_name_length;
     char* token_secret;
-    size_t token_secret_length;
+    uint8_t token_secret_length;
     bool saved;
     Control selected_control;
     InputTextSceneContext* token_name_input_context;
@@ -35,12 +35,12 @@ typedef struct {
     InputTextSceneState* input_state;
     uint32_t input_started_at;
     int16_t current_token_index;
-    int16_t screen_y_offset;
+    int32_t screen_y_offset;
     TokenHashAlgo algo;
     TokenDigitsCount digits_count;
 } SceneState;
 
-void totp_scene_add_new_token_init(const PluginState* plugin_state) {
+void totp_scene_add_new_token_init(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
 
@@ -235,10 +235,7 @@ bool totp_scene_add_new_token_handle_event(PluginEvent* const event, PluginState
 
                     if(token_secret_set) {
                         tokenInfo->name = malloc(scene_state->token_name_length + 1);
-                        strlcpy(
-                            tokenInfo->name,
-                            scene_state->token_name,
-                            scene_state->token_name_length + 1);
+                        strcpy(tokenInfo->name, scene_state->token_name);
                         tokenInfo->algo = scene_state->algo;
                         tokenInfo->digits = scene_state->digits_count;
 
@@ -311,6 +308,6 @@ void totp_scene_add_new_token_deactivate(PluginState* plugin_state) {
     plugin_state->current_scene_state = NULL;
 }
 
-void totp_scene_add_new_token_free(const PluginState* plugin_state) {
+void totp_scene_add_new_token_free(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
diff --git a/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.h b/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.h
index 7a0b0e68a..b65c567a2 100644
--- a/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.h
+++ b/applications/plugins/totp/scenes/add_new_token/totp_scene_add_new_token.h
@@ -10,11 +10,11 @@ typedef struct {
     uint8_t current_token_index;
 } TokenAddEditSceneContext;
 
-void totp_scene_add_new_token_init(const PluginState* plugin_state);
+void totp_scene_add_new_token_init(PluginState* plugin_state);
 void totp_scene_add_new_token_activate(
     PluginState* plugin_state,
     const TokenAddEditSceneContext* context);
 void totp_scene_add_new_token_render(Canvas* const canvas, PluginState* plugin_state);
 bool totp_scene_add_new_token_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_add_new_token_deactivate(PluginState* plugin_state);
-void totp_scene_add_new_token_free(const PluginState* plugin_state);
+void totp_scene_add_new_token_free(PluginState* plugin_state);
diff --git a/applications/plugins/totp/scenes/app_settings/totp_app_settings.c b/applications/plugins/totp/scenes/app_settings/totp_app_settings.c
index ea9a11e9b..cdb775a8d 100644
--- a/applications/plugins/totp/scenes/app_settings/totp_app_settings.c
+++ b/applications/plugins/totp/scenes/app_settings/totp_app_settings.c
@@ -16,7 +16,7 @@ typedef struct {
     Control selected_control;
 } SceneState;
 
-void totp_scene_app_settings_init(const PluginState* plugin_state) {
+void totp_scene_app_settings_init(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
 
@@ -53,7 +53,7 @@ static void two_digit_to_str(int8_t num, char* str) {
 }
 
 void totp_scene_app_settings_render(Canvas* const canvas, PluginState* plugin_state) {
-    const SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
+    SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
 
     canvas_set_font(canvas, FontPrimary);
     canvas_draw_str_aligned(canvas, 0, 0, AlignLeft, AlignTop, "Timezone offset");
@@ -90,9 +90,7 @@ void totp_scene_app_settings_render(Canvas* const canvas, PluginState* plugin_st
         scene_state->selected_control == ConfirmButton);
 }
 
-bool totp_scene_app_settings_handle_event(
-    const PluginEvent* const event,
-    PluginState* plugin_state) {
+bool totp_scene_app_settings_handle_event(PluginEvent* const event, PluginState* plugin_state) {
     if(event->type == EventTypeKey) {
         SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
         if(event->input.type == InputTypePress) {
@@ -173,6 +171,6 @@ void totp_scene_app_settings_deactivate(PluginState* plugin_state) {
     plugin_state->current_scene_state = NULL;
 }
 
-void totp_scene_app_settings_free(const PluginState* plugin_state) {
+void totp_scene_app_settings_free(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
\ No newline at end of file
diff --git a/applications/plugins/totp/scenes/app_settings/totp_app_settings.h b/applications/plugins/totp/scenes/app_settings/totp_app_settings.h
index e965d79b7..b97de3390 100644
--- a/applications/plugins/totp/scenes/app_settings/totp_app_settings.h
+++ b/applications/plugins/totp/scenes/app_settings/totp_app_settings.h
@@ -10,13 +10,11 @@ typedef struct {
     uint8_t current_token_index;
 } AppSettingsSceneContext;
 
-void totp_scene_app_settings_init(const PluginState* plugin_state);
+void totp_scene_app_settings_init(PluginState* plugin_state);
 void totp_scene_app_settings_activate(
     PluginState* plugin_state,
     const AppSettingsSceneContext* context);
 void totp_scene_app_settings_render(Canvas* const canvas, PluginState* plugin_state);
-bool totp_scene_app_settings_handle_event(
-    const PluginEvent* const event,
-    PluginState* plugin_state);
+bool totp_scene_app_settings_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_app_settings_deactivate(PluginState* plugin_state);
-void totp_scene_app_settings_free(const PluginState* plugin_state);
\ No newline at end of file
+void totp_scene_app_settings_free(PluginState* plugin_state);
\ No newline at end of file
diff --git a/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c b/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c
index 652ca283b..4ed79accd 100644
--- a/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c
+++ b/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.c
@@ -28,7 +28,7 @@ void totp_scene_authenticate_activate(PluginState* plugin_state) {
 }
 
 void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_state) {
-    const SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
+    SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
 
     int v_shift = 0;
     if(scene_state->code_length > 0) {
@@ -73,9 +73,7 @@ void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_st
     }
 }
 
-bool totp_scene_authenticate_handle_event(
-    const PluginEvent* const event,
-    PluginState* plugin_state) {
+bool totp_scene_authenticate_handle_event(PluginEvent* const event, PluginState* plugin_state) {
     if(event->type == EventTypeKey) {
         if(event->input.type == InputTypeLong && event->input.key == InputKeyBack) {
             return false;
@@ -158,6 +156,6 @@ void totp_scene_authenticate_deactivate(PluginState* plugin_state) {
     plugin_state->current_scene_state = NULL;
 }
 
-void totp_scene_authenticate_free(const PluginState* plugin_state) {
+void totp_scene_authenticate_free(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
diff --git a/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.h b/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.h
index c54152f62..f1199a425 100644
--- a/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.h
+++ b/applications/plugins/totp/scenes/authenticate/totp_scene_authenticate.h
@@ -9,8 +9,6 @@
 void totp_scene_authenticate_init(PluginState* plugin_state);
 void totp_scene_authenticate_activate(PluginState* plugin_state);
 void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_state);
-bool totp_scene_authenticate_handle_event(
-    const PluginEvent* const event,
-    PluginState* plugin_state);
+bool totp_scene_authenticate_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_authenticate_deactivate(PluginState* plugin_state);
-void totp_scene_authenticate_free(const PluginState* plugin_state);
+void totp_scene_authenticate_free(PluginState* plugin_state);
diff --git a/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c b/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c
index 7b5f7391b..674bcd41e 100644
--- a/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c
+++ b/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.c
@@ -9,7 +9,6 @@
 #include "../../services/totp/totp.h"
 #include "../../services/config/config.h"
 #include "../../services/crypto/crypto.h"
-#include "../../services/crypto/memset_s.h"
 #include "../scene_director.h"
 #include "../token_menu/totp_scene_token_menu.h"
 
@@ -96,7 +95,7 @@ void update_totp_params(PluginState* const plugin_state) {
     }
 }
 
-void totp_scene_generate_token_init(const PluginState* plugin_state) {
+void totp_scene_generate_token_init(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
 
@@ -181,7 +180,7 @@ void totp_scene_generate_token_render(Canvas* const canvas, PluginState* plugin_
                              ->data);
 
         if(tokenInfo->token != NULL && tokenInfo->token_length > 0) {
-            size_t key_length;
+            uint8_t key_length;
             uint8_t* key = totp_crypto_decrypt(
                 tokenInfo->token, tokenInfo->token_length, &plugin_state->iv[0], &key_length);
 
@@ -196,7 +195,7 @@ void totp_scene_generate_token_render(Canvas* const canvas, PluginState* plugin_
                     TOKEN_LIFETIME),
                 scene_state->last_code,
                 tokenInfo->digits);
-            memset_s(key, sizeof(key), 0, key_length);
+            memset(key, 0, key_length);
             free(key);
         } else {
             i_token_to_str(0, scene_state->last_code, tokenInfo->digits);
@@ -266,9 +265,7 @@ void totp_scene_generate_token_render(Canvas* const canvas, PluginState* plugin_
     }
 }
 
-bool totp_scene_generate_token_handle_event(
-    const PluginEvent* const event,
-    PluginState* plugin_state) {
+bool totp_scene_generate_token_handle_event(PluginEvent* const event, PluginState* plugin_state) {
     if(event->type == EventTypeKey) {
         if(event->input.type == InputTypeLong && event->input.key == InputKeyBack) {
             return false;
@@ -317,10 +314,11 @@ void totp_scene_generate_token_deactivate(PluginState* plugin_state) {
     if(plugin_state->current_scene_state == NULL) return;
     SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
 
+    free(scene_state->last_code);
     free(scene_state);
     plugin_state->current_scene_state = NULL;
 }
 
-void totp_scene_generate_token_free(const PluginState* plugin_state) {
+void totp_scene_generate_token_free(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
diff --git a/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.h b/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.h
index e4ca818b6..1284c7b41 100644
--- a/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.h
+++ b/applications/plugins/totp/scenes/generate_token/totp_scene_generate_token.h
@@ -10,13 +10,11 @@ typedef struct {
     uint8_t current_token_index;
 } GenerateTokenSceneContext;
 
-void totp_scene_generate_token_init(const PluginState* plugin_state);
+void totp_scene_generate_token_init(PluginState* plugin_state);
 void totp_scene_generate_token_activate(
     PluginState* plugin_state,
     const GenerateTokenSceneContext* context);
 void totp_scene_generate_token_render(Canvas* const canvas, PluginState* plugin_state);
-bool totp_scene_generate_token_handle_event(
-    const PluginEvent* const event,
-    PluginState* plugin_state);
+bool totp_scene_generate_token_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_generate_token_deactivate(PluginState* plugin_state);
-void totp_scene_generate_token_free(const PluginState* plugin_state);
+void totp_scene_generate_token_free(PluginState* plugin_state);
diff --git a/applications/plugins/totp/scenes/scene_director.c b/applications/plugins/totp/scenes/scene_director.c
index 5265123f5..d4ddd1768 100644
--- a/applications/plugins/totp/scenes/scene_director.c
+++ b/applications/plugins/totp/scenes/scene_director.c
@@ -88,7 +88,7 @@ void totp_scene_director_render(Canvas* const canvas, PluginState* const plugin_
     }
 }
 
-void totp_scene_director_dispose(const PluginState* const plugin_state) {
+void totp_scene_director_dispose(PluginState* const plugin_state) {
     totp_scene_generate_token_free(plugin_state);
     totp_scene_authenticate_free(plugin_state);
     totp_scene_add_new_token_free(plugin_state);
diff --git a/applications/plugins/totp/scenes/scene_director.h b/applications/plugins/totp/scenes/scene_director.h
index cc06029d3..3c25afff6 100644
--- a/applications/plugins/totp/scenes/scene_director.h
+++ b/applications/plugins/totp/scenes/scene_director.h
@@ -12,5 +12,5 @@ void totp_scene_director_activate_scene(
 void totp_scene_director_deactivate_active_scene(PluginState* const plugin_state);
 void totp_scene_director_init_scenes(PluginState* const plugin_state);
 void totp_scene_director_render(Canvas* const canvas, PluginState* const plugin_state);
-void totp_scene_director_dispose(const PluginState* const plugin_state);
+void totp_scene_director_dispose(PluginState* const plugin_state);
 bool totp_scene_director_handle_event(PluginEvent* const event, PluginState* const plugin_state);
diff --git a/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c b/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c
index c4286ded9..22c37dc2c 100644
--- a/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c
+++ b/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.c
@@ -21,7 +21,7 @@ typedef struct {
     int16_t current_token_index;
 } SceneState;
 
-void totp_scene_token_menu_init(const PluginState* plugin_state) {
+void totp_scene_token_menu_init(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
 
@@ -38,7 +38,7 @@ void totp_scene_token_menu_activate(
 }
 
 void totp_scene_token_menu_render(Canvas* const canvas, PluginState* plugin_state) {
-    const SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
+    SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
     if(scene_state->current_token_index < 0) {
         ui_control_button_render(
             canvas,
@@ -84,7 +84,7 @@ void totp_scene_token_menu_render(Canvas* const canvas, PluginState* plugin_stat
     }
 }
 
-bool totp_scene_token_menu_handle_event(const PluginEvent* const event, PluginState* plugin_state) {
+bool totp_scene_token_menu_handle_event(PluginEvent* const event, PluginState* plugin_state) {
     if(event->type == EventTypeKey) {
         SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
         if(event->input.type == InputTypePress) {
@@ -192,6 +192,6 @@ void totp_scene_token_menu_deactivate(PluginState* plugin_state) {
     plugin_state->current_scene_state = NULL;
 }
 
-void totp_scene_token_menu_free(const PluginState* plugin_state) {
+void totp_scene_token_menu_free(PluginState* plugin_state) {
     UNUSED(plugin_state);
 }
diff --git a/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.h b/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.h
index 52e33e728..0b117cb25 100644
--- a/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.h
+++ b/applications/plugins/totp/scenes/token_menu/totp_scene_token_menu.h
@@ -10,11 +10,11 @@ typedef struct {
     uint8_t current_token_index;
 } TokenMenuSceneContext;
 
-void totp_scene_token_menu_init(const PluginState* plugin_state);
+void totp_scene_token_menu_init(PluginState* plugin_state);
 void totp_scene_token_menu_activate(
     PluginState* plugin_state,
     const TokenMenuSceneContext* context);
 void totp_scene_token_menu_render(Canvas* const canvas, PluginState* plugin_state);
-bool totp_scene_token_menu_handle_event(const PluginEvent* const event, PluginState* plugin_state);
+bool totp_scene_token_menu_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_token_menu_deactivate(PluginState* plugin_state);
-void totp_scene_token_menu_free(const PluginState* plugin_state);
+void totp_scene_token_menu_free(PluginState* plugin_state);
diff --git a/applications/plugins/totp/services/cli/cli.c b/applications/plugins/totp/services/cli/cli.c
index 76e58a02d..3a7afdd96 100644
--- a/applications/plugins/totp/services/cli/cli.c
+++ b/applications/plugins/totp/services/cli/cli.c
@@ -9,7 +9,7 @@
 #include "commands/timezone/timezone.h"
 #include "commands/help/help.h"
 
-static void totp_cli_print_unknown_command(const FuriString* unknown_command) {
+static void totp_cli_print_unknown_command(FuriString* unknown_command) {
     TOTP_CLI_PRINTF(
         "Command \"%s\" is unknown. Use \"" TOTP_CLI_COMMAND_HELP
         "\" command to get list of available commands.",
diff --git a/applications/plugins/totp/services/cli/cli_helpers.c b/applications/plugins/totp/services/cli/cli_helpers.c
index 4a0b8b352..81a1e4b77 100644
--- a/applications/plugins/totp/services/cli/cli_helpers.c
+++ b/applications/plugins/totp/services/cli/cli_helpers.c
@@ -1,7 +1,7 @@
 #include "cli_helpers.h"
 #include <cli/cli.h>
 
-bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli) {
+bool totp_cli_ensure_authenticated(PluginState* plugin_state, Cli* cli) {
     if(plugin_state->current_scene == TotpSceneAuthentication) {
         TOTP_CLI_PRINTF("Pleases enter PIN on your flipper device\r\n");
 
@@ -11,6 +11,7 @@ bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli) {
         }
 
         TOTP_CLI_DELETE_LAST_LINE();
+        fflush(stdout);
 
         if(plugin_state->current_scene == TotpSceneAuthentication) {
             return false;
diff --git a/applications/plugins/totp/services/cli/cli_helpers.h b/applications/plugins/totp/services/cli/cli_helpers.h
index 9b19f926b..216925e50 100644
--- a/applications/plugins/totp/services/cli/cli_helpers.h
+++ b/applications/plugins/totp/services/cli/cli_helpers.h
@@ -13,28 +13,16 @@
 #define DOCOPT_OPTIONS "[options]"
 #define DOCOPT_DEFAULT(val) "[default: " val "]"
 
-#define TOTP_CLI_PRINTF(format, ...)                                        \
-    do {                                                                    \
-        _Pragma(STRINGIFY(GCC diagnostic push))                             \
-            _Pragma(STRINGIFY(GCC diagnostic ignored "-Wdouble-promotion")) \
-                printf(format, ##__VA_ARGS__);                              \
-        _Pragma(STRINGIFY(GCC diagnostic pop))                              \
-    } while(false)
-
-#define TOTP_CLI_DELETE_LAST_LINE()    \
-    TOTP_CLI_PRINTF("\033[A\33[2K\r"); \
-    fflush(stdout)
-
-#define TOTP_CLI_DELETE_CURRENT_LINE() \
-    TOTP_CLI_PRINTF("\33[2K\r");       \
-    fflush(stdout)
-
-#define TOTP_CLI_DELETE_LAST_CHAR() \
-    TOTP_CLI_PRINTF("\b \b");       \
-    fflush(stdout)
+#define TOTP_CLI_PRINTF(format, ...)                                 \
+    _Pragma(STRINGIFY(GCC diagnostic push));                         \
+    _Pragma(STRINGIFY(GCC diagnostic ignored "-Wdouble-promotion")); \
+    printf(format, ##__VA_ARGS__);                                   \
+    _Pragma(STRINGIFY(GCC diagnostic pop));
 
+#define TOTP_CLI_DELETE_LAST_LINE() TOTP_CLI_PRINTF("\033[A\33[2K\r")
+#define TOTP_CLI_DELETE_CURRENT_LINE() TOTP_CLI_PRINTF("\33[2K\r")
 #define TOTP_CLI_PRINT_INVALID_ARGUMENTS() \
     TOTP_CLI_PRINTF(                       \
         "Invalid command arguments. use \"help\" command to get list of available commands")
 
-bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli);
+bool totp_cli_ensure_authenticated(PluginState* plugin_state, Cli* cli);
diff --git a/applications/plugins/totp/services/cli/commands/add/add.c b/applications/plugins/totp/services/cli/commands/add/add.c
index c1ce42617..41ff5b860 100644
--- a/applications/plugins/totp/services/cli/commands/add/add.c
+++ b/applications/plugins/totp/services/cli/commands/add/add.c
@@ -14,7 +14,7 @@
 #define TOTP_CLI_COMMAND_ADD_ARG_DIGITS_PREFIX "-d"
 #define TOTP_CLI_COMMAND_ADD_ARG_UNSECURE_PREFIX "-u"
 
-static bool token_info_set_digits_from_str(TokenInfo* token_info, const FuriString* str) {
+static bool token_info_set_digits_from_str(TokenInfo* token_info, FuriString* str) {
     switch(furi_string_get_char(str, 0)) {
     case '6':
         token_info->digits = TOTP_6_DIGITS;
@@ -27,7 +27,7 @@ static bool token_info_set_digits_from_str(TokenInfo* token_info, const FuriStri
     return false;
 }
 
-static bool token_info_set_algo_from_str(TokenInfo* token_info, const FuriString* str) {
+static bool token_info_set_algo_from_str(TokenInfo* token_info, FuriString* str) {
     if(furi_string_cmpi_str(str, TOTP_CONFIG_TOKEN_ALGO_SHA1_NAME) == 0) {
         token_info->algo = SHA1;
         return true;
@@ -79,16 +79,10 @@ void totp_cli_command_add_docopt_options() {
         TOTP_CLI_COMMAND_ADD_ARG_UNSECURE_PREFIX) "             Show console user input as-is without masking\r\n");
 }
 
-static void furi_string_secure_free(FuriString* str) {
-    for(long i = furi_string_size(str) - 1; i >= 0; i--) {
-        furi_string_set_char(str, i, '\0');
-    }
-
-    furi_string_free(str);
-}
-
 void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cli* cli) {
     FuriString* temp_str = furi_string_alloc();
+    const char* temp_cstr;
+
     TokenInfo* token_info = token_info_alloc();
 
     // Reading token name
@@ -99,9 +93,9 @@ void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cl
         return;
     }
 
-    size_t temp_cstr_len = furi_string_size(temp_str);
-    token_info->name = malloc(temp_cstr_len + 1);
-    strlcpy(token_info->name, furi_string_get_cstr(temp_str), temp_cstr_len + 1);
+    temp_cstr = furi_string_get_cstr(temp_str);
+    token_info->name = malloc(strlen(temp_cstr) + 1);
+    strcpy(token_info->name, temp_cstr);
 
     // Read optional arguments
     bool mask_user_input = true;
@@ -152,15 +146,13 @@ void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cl
     uint8_t c;
     while(cli_read(cli, &c, 1) == 1) {
         if(c == CliSymbolAsciiEsc) {
-            // Some keys generating escape-sequences
-            // We need to ignore them as we case about alpha-numerics only
             uint8_t c2;
             cli_read_timeout(cli, &c2, 1, 0);
             cli_read_timeout(cli, &c2, 1, 0);
         } else if(c == CliSymbolAsciiETX) {
             TOTP_CLI_DELETE_CURRENT_LINE();
-            TOTP_CLI_PRINTF("Cancelled by user\r\n");
-            furi_string_secure_free(temp_str);
+            TOTP_CLI_PRINTF("Cancelled by user");
+            furi_string_free(temp_str);
             token_info_free(token_info);
             return;
         } else if((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
@@ -174,7 +166,8 @@ void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cl
         } else if(c == CliSymbolAsciiBackspace || c == CliSymbolAsciiDel) {
             size_t temp_str_size = furi_string_size(temp_str);
             if(temp_str_size > 0) {
-                TOTP_CLI_DELETE_LAST_CHAR();
+                TOTP_CLI_PRINTF("\b \b");
+                fflush(stdout);
                 furi_string_left(temp_str, temp_str_size - 1);
             }
         } else if(c == CliSymbolAsciiCR) {
@@ -183,26 +176,25 @@ void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cl
         }
     }
 
+    temp_cstr = furi_string_get_cstr(temp_str);
+
     TOTP_CLI_DELETE_LAST_LINE();
 
     if(!totp_cli_ensure_authenticated(plugin_state, cli)) {
-        furi_string_secure_free(temp_str);
+        furi_string_free(temp_str);
         token_info_free(token_info);
         return;
     }
 
-    if(!token_info_set_secret(
-           token_info,
-           furi_string_get_cstr(temp_str),
-           furi_string_size(temp_str),
-           plugin_state->iv)) {
+    if(!token_info_set_secret(token_info, temp_cstr, strlen(temp_cstr), plugin_state->iv)) {
         TOTP_CLI_PRINTF("Token secret seems to be invalid and can not be parsed\r\n");
-        furi_string_secure_free(temp_str);
+        furi_string_free(temp_str);
         token_info_free(token_info);
         return;
     }
 
-    furi_string_secure_free(temp_str);
+    furi_string_reset(temp_str);
+    furi_string_free(temp_str);
 
     bool load_generate_token_scene = false;
     if(plugin_state->current_scene == TotpSceneGenerateToken) {
diff --git a/applications/plugins/totp/services/config/config.c b/applications/plugins/totp/services/config/config.c
index bb6cffde0..0854d79ad 100644
--- a/applications/plugins/totp/services/config/config.c
+++ b/applications/plugins/totp/services/config/config.c
@@ -10,7 +10,7 @@
 #define CONFIG_FILE_PATH CONFIG_FILE_DIRECTORY_PATH "/totp.conf"
 #define CONFIG_FILE_BACKUP_PATH CONFIG_FILE_PATH ".backup"
 
-static uint8_t token_info_get_digits_as_int(const TokenInfo* token_info) {
+static uint8_t token_info_get_digits_as_int(TokenInfo* token_info) {
     switch(token_info->digits) {
     case TOTP_6_DIGITS:
         return 6;
@@ -32,7 +32,7 @@ static void token_info_set_digits_from_int(TokenInfo* token_info, uint8_t digits
     }
 }
 
-static char* token_info_get_algo_as_cstr(const TokenInfo* token_info) {
+static char* token_info_get_algo_as_cstr(TokenInfo* token_info) {
     switch(token_info->algo) {
     case SHA1:
         return TOTP_CONFIG_TOKEN_ALGO_SHA1_NAME;
@@ -45,7 +45,7 @@ static char* token_info_get_algo_as_cstr(const TokenInfo* token_info) {
     return NULL;
 }
 
-static void token_info_set_algo_from_str(TokenInfo* token_info, const FuriString* str) {
+static void token_info_set_algo_from_str(TokenInfo* token_info, FuriString* str) {
     if(furi_string_cmpi_str(str, TOTP_CONFIG_TOKEN_ALGO_SHA1_NAME) == 0) {
         token_info->algo = SHA1;
     } else if(furi_string_cmpi_str(str, TOTP_CONFIG_TOKEN_ALGO_SHA256_NAME) == 0) {
@@ -152,7 +152,7 @@ FlipperFormat* totp_open_config_file(Storage* storage) {
     return fff_data_file;
 }
 
-void totp_config_file_save_new_token_i(FlipperFormat* file, const TokenInfo* token_info) {
+void totp_config_file_save_new_token_i(FlipperFormat* file, TokenInfo* token_info) {
     flipper_format_seek_to_end(file);
     flipper_format_write_string_cstr(file, TOTP_CONFIG_KEY_TOKEN_NAME, token_info->name);
     bool token_is_valid = token_info->token != NULL && token_info->token_length > 0;
@@ -170,7 +170,7 @@ void totp_config_file_save_new_token_i(FlipperFormat* file, const TokenInfo* tok
     flipper_format_write_uint32(file, TOTP_CONFIG_KEY_TOKEN_DIGITS, &digits_count_as_uint32, 1);
 }
 
-void totp_config_file_save_new_token(const TokenInfo* token_info) {
+void totp_config_file_save_new_token(TokenInfo* token_info) {
     Storage* cfg_storage = totp_open_storage();
     FlipperFormat* file = totp_open_config_file(cfg_storage);
 
@@ -190,7 +190,7 @@ void totp_config_file_update_timezone_offset(float new_timezone_offset) {
     totp_close_storage();
 }
 
-void totp_full_save_config_file(const PluginState* const plugin_state) {
+void totp_full_save_config_file(PluginState* const plugin_state) {
     Storage* storage = totp_open_storage();
     FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
 
@@ -209,7 +209,7 @@ void totp_full_save_config_file(const PluginState* const plugin_state) {
     flipper_format_write_bool(fff_data_file, TOTP_CONFIG_KEY_PINSET, &plugin_state->pin_set, 1);
     ListNode* node = plugin_state->tokens_list;
     while(node != NULL) {
-        const TokenInfo* token_info = node->data;
+        TokenInfo* token_info = node->data;
         totp_config_file_save_new_token_i(fff_data_file, token_info);
         node = node->next;
     }
@@ -343,9 +343,9 @@ TokenLoadingResult totp_config_file_load_tokens(PluginState* const plugin_state)
 
         TokenInfo* tokenInfo = token_info_alloc();
 
-        size_t temp_cstr_len = furi_string_size(temp_str);
-        tokenInfo->name = (char*)malloc(temp_cstr_len + 1);
-        strlcpy(tokenInfo->name, furi_string_get_cstr(temp_str), temp_cstr_len + 1);
+        const char* temp_cstr = furi_string_get_cstr(temp_str);
+        tokenInfo->name = (char*)malloc(strlen(temp_cstr) + 1);
+        strcpy(tokenInfo->name, temp_cstr);
 
         uint32_t secret_bytes_count;
         if(!flipper_format_get_value_count(
@@ -355,11 +355,9 @@ TokenLoadingResult totp_config_file_load_tokens(PluginState* const plugin_state)
 
         if(secret_bytes_count == 1) { // Plain secret key
             if(flipper_format_read_string(fff_data_file, TOTP_CONFIG_KEY_TOKEN_SECRET, temp_str)) {
+                temp_cstr = furi_string_get_cstr(temp_str);
                 if(token_info_set_secret(
-                       tokenInfo,
-                       furi_string_get_cstr(temp_str),
-                       furi_string_size(temp_str),
-                       &plugin_state->iv[0])) {
+                       tokenInfo, temp_cstr, strlen(temp_cstr), &plugin_state->iv[0])) {
                     FURI_LOG_W(LOGGING_TAG, "Token \"%s\" has plain secret", tokenInfo->name);
                 } else {
                     tokenInfo->token = NULL;
diff --git a/applications/plugins/totp/services/config/config.h b/applications/plugins/totp/services/config/config.h
index d452ad4b3..76cb40b2c 100644
--- a/applications/plugins/totp/services/config/config.h
+++ b/applications/plugins/totp/services/config/config.h
@@ -16,8 +16,8 @@ Storage* totp_open_storage();
 void totp_close_storage();
 FlipperFormat* totp_open_config_file(Storage* storage);
 void totp_close_config_file(FlipperFormat* file);
-void totp_full_save_config_file(const PluginState* const plugin_state);
+void totp_full_save_config_file(PluginState* const plugin_state);
 void totp_config_file_load_base(PluginState* const plugin_state);
 TokenLoadingResult totp_config_file_load_tokens(PluginState* const plugin_state);
-void totp_config_file_save_new_token(const TokenInfo* token_info);
+void totp_config_file_save_new_token(TokenInfo* token_info);
 void totp_config_file_update_timezone_offset(float new_timezone_offset);
diff --git a/applications/plugins/totp/services/crypto/crypto.c b/applications/plugins/totp/services/crypto/crypto.c
index 79e41e6fd..ade2f9f49 100644
--- a/applications/plugins/totp/services/crypto/crypto.c
+++ b/applications/plugins/totp/services/crypto/crypto.c
@@ -3,7 +3,6 @@
 #include <furi_hal.h>
 #include "../config/config.h"
 #include "../../types/common.h"
-#include "memset_s.h"
 
 #define CRYPTO_KEY_SLOT 2
 #define CRYPTO_VERIFY_KEY "FFF_Crypto_pass"
@@ -12,13 +11,13 @@
 
 uint8_t* totp_crypto_encrypt(
     const uint8_t* plain_data,
-    const size_t plain_data_length,
+    const uint8_t plain_data_length,
     const uint8_t* iv,
-    size_t* encrypted_data_length) {
+    uint8_t* encrypted_data_length) {
     uint8_t* encrypted_data;
     size_t remain = plain_data_length % CRYPTO_ALIGNMENT_FACTOR;
     if(remain) {
-        size_t plain_data_aligned_length = plain_data_length - remain + CRYPTO_ALIGNMENT_FACTOR;
+        uint8_t plain_data_aligned_length = plain_data_length - remain + CRYPTO_ALIGNMENT_FACTOR;
         uint8_t* plain_data_aligned = malloc(plain_data_aligned_length);
         memset(plain_data_aligned, 0, plain_data_aligned_length);
         memcpy(plain_data_aligned, plain_data, plain_data_length);
@@ -30,7 +29,7 @@ uint8_t* totp_crypto_encrypt(
         furi_hal_crypto_encrypt(plain_data_aligned, encrypted_data, plain_data_aligned_length);
         furi_hal_crypto_store_unload_key(CRYPTO_KEY_SLOT);
 
-        memset_s(plain_data_aligned, sizeof(plain_data_aligned), 0, plain_data_aligned_length);
+        memset(plain_data_aligned, 0, plain_data_aligned_length);
         free(plain_data_aligned);
     } else {
         encrypted_data = malloc(plain_data_length);
@@ -46,9 +45,9 @@ uint8_t* totp_crypto_encrypt(
 
 uint8_t* totp_crypto_decrypt(
     const uint8_t* encrypted_data,
-    const size_t encrypted_data_length,
+    const uint8_t encrypted_data_length,
     const uint8_t* iv,
-    size_t* decrypted_data_length) {
+    uint8_t* decrypted_data_length) {
     *decrypted_data_length = encrypted_data_length;
     uint8_t* decrypted_data = malloc(*decrypted_data_length);
     furi_hal_crypto_store_load_key(CRYPTO_KEY_SLOT, iv);
@@ -57,7 +56,7 @@ uint8_t* totp_crypto_decrypt(
     return decrypted_data;
 }
 
-void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t pin_length) {
+void totp_crypto_seed_iv(PluginState* plugin_state, uint8_t* pin, uint8_t pin_length) {
     if(plugin_state->crypto_verify_data == NULL) {
         FURI_LOG_D(LOGGING_TAG, "Generating new IV");
         furi_hal_random_fill_buf(&plugin_state->base_iv[0], TOTP_IV_SIZE);
@@ -119,8 +118,8 @@ void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t
 }
 
 bool totp_crypto_verify_key(const PluginState* plugin_state) {
-    size_t decrypted_key_length;
-    const uint8_t* decrypted_key = totp_crypto_decrypt(
+    uint8_t decrypted_key_length;
+    uint8_t* decrypted_key = totp_crypto_decrypt(
         plugin_state->crypto_verify_data,
         plugin_state->crypto_verify_data_length,
         &plugin_state->iv[0],
diff --git a/applications/plugins/totp/services/crypto/crypto.h b/applications/plugins/totp/services/crypto/crypto.h
index f0a28f798..9fc319659 100644
--- a/applications/plugins/totp/services/crypto/crypto.h
+++ b/applications/plugins/totp/services/crypto/crypto.h
@@ -4,13 +4,13 @@
 
 uint8_t* totp_crypto_encrypt(
     const uint8_t* plain_data,
-    const size_t plain_data_length,
+    const uint8_t plain_data_length,
     const uint8_t* iv,
-    size_t* encrypted_data_length);
+    uint8_t* encrypted_data_length);
 uint8_t* totp_crypto_decrypt(
     const uint8_t* encrypted_data,
-    const size_t encrypted_data_length,
+    const uint8_t encrypted_data_length,
     const uint8_t* iv,
-    size_t* decrypted_data_length);
-void totp_crypto_seed_iv(PluginState* plugin_state, const uint8_t* pin, uint8_t pin_length);
+    uint8_t* decrypted_data_length);
+void totp_crypto_seed_iv(PluginState* plugin_state, uint8_t* pin, uint8_t pin_length);
 bool totp_crypto_verify_key(const PluginState* plugin_state);
\ No newline at end of file
diff --git a/applications/plugins/totp/services/crypto/memset_s.c b/applications/plugins/totp/services/crypto/memset_s.c
deleted file mode 100644
index 81c285c0d..000000000
--- a/applications/plugins/totp/services/crypto/memset_s.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "memset_s.h"
-
-#define RSIZE_MAX 0x7fffffffffffffffUL
-
-errno_t memset_s(void* s, rsize_t smax, int c, rsize_t n) {
-    if(!s || smax > RSIZE_MAX) {
-        return EINVAL;
-    }
-
-    errno_t violation_present = 0;
-    if(n > smax) {
-        n = smax;
-        violation_present = EINVAL;
-    }
-
-    volatile unsigned char* v = s;
-    for(rsize_t i = 0u; i < n; ++i) {
-        *v++ = (unsigned char)c;
-    }
-
-    return violation_present;
-}
\ No newline at end of file
diff --git a/applications/plugins/totp/services/crypto/memset_s.h b/applications/plugins/totp/services/crypto/memset_s.h
deleted file mode 100644
index 2889e23b2..000000000
--- a/applications/plugins/totp/services/crypto/memset_s.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <errno.h>
-#include <stdint.h>
-#include <string.h>
-
-#ifndef _RSIZE_T_DECLARED
-typedef uint64_t rsize_t;
-#define _RSIZE_T_DECLARED
-#endif
-#ifndef _ERRNOT_DECLARED
-typedef int16_t errno_t;
-#define _ERRNOT_DECLARED
-#endif
-
-errno_t memset_s(void* s, rsize_t smax, int c, rsize_t n);
\ No newline at end of file
diff --git a/applications/plugins/totp/services/totp/totp.c b/applications/plugins/totp/services/totp/totp.c
index 68531e171..90e49367d 100644
--- a/applications/plugins/totp/services/totp/totp.c
+++ b/applications/plugins/totp/services/totp/totp.c
@@ -42,14 +42,14 @@ uint32_t otp_generate(
     TOTP_ALGO algo,
     uint8_t digits,
     const uint8_t* plain_secret,
-    size_t plain_secret_length,
+    uint8_t plain_secret_length,
     uint64_t input) {
     uint8_t* hmac = malloc(64);
     memset(hmac, 0, 64);
 
     uint64_t input_swapped = swap_uint64(input);
 
-    int hmac_len = (*algo)(plain_secret, plain_secret_length, (uint8_t*)&input_swapped, 8, hmac);
+    int hmac_len = (*(algo))(plain_secret, plain_secret_length, (uint8_t*)&input_swapped, 8, hmac);
     if(hmac_len == 0) {
         free(hmac);
         return OTP_ERROR;
@@ -80,7 +80,7 @@ uint32_t totp_at(
     TOTP_ALGO algo,
     uint8_t digits,
     const uint8_t* plain_secret,
-    size_t plain_secret_length,
+    uint8_t plain_secret_length,
     uint64_t for_time,
     float timezone,
     uint8_t interval) {
@@ -96,9 +96,9 @@ uint32_t totp_at(
 
 static int totp_algo_sha1(
     const uint8_t* key,
-    size_t key_length,
+    uint8_t key_length,
     const uint8_t* input,
-    size_t input_length,
+    uint8_t input_length,
     uint8_t* output) {
     hmac_sha1(key, key_length, input, input_length, output);
     return HMAC_SHA1_RESULT_SIZE;
@@ -106,9 +106,9 @@ static int totp_algo_sha1(
 
 static int totp_algo_sha256(
     const uint8_t* key,
-    size_t key_length,
+    uint8_t key_length,
     const uint8_t* input,
-    size_t input_length,
+    uint8_t input_length,
     uint8_t* output) {
     hmac_sha256(key, key_length, input, input_length, output);
     return HMAC_SHA256_RESULT_SIZE;
@@ -116,9 +116,9 @@ static int totp_algo_sha256(
 
 static int totp_algo_sha512(
     const uint8_t* key,
-    size_t key_length,
+    uint8_t key_length,
     const uint8_t* input,
-    size_t input_length,
+    uint8_t input_length,
     uint8_t* output) {
     hmac_sha512(key, key_length, input, input_length, output);
     return HMAC_SHA512_RESULT_SIZE;
diff --git a/applications/plugins/totp/services/totp/totp.h b/applications/plugins/totp/services/totp/totp.h
index 431ca11aa..31e70e01b 100644
--- a/applications/plugins/totp/services/totp/totp.h
+++ b/applications/plugins/totp/services/totp/totp.h
@@ -17,9 +17,9 @@
 */
 typedef int (*TOTP_ALGO)(
     const uint8_t* key,
-    size_t key_length,
+    uint8_t key_length,
     const uint8_t* input,
-    size_t input_length,
+    uint8_t input_length,
     uint8_t* output);
 
 /*
@@ -47,7 +47,7 @@ uint32_t totp_at(
     TOTP_ALGO algo,
     uint8_t digits,
     const uint8_t* plain_secret,
-    size_t plain_secret_length,
+    uint8_t plain_secret_length,
     uint64_t for_time,
     float timezone,
     uint8_t interval);
diff --git a/applications/plugins/totp/services/ui/ui_controls.c b/applications/plugins/totp/services/ui/ui_controls.c
index b01036f2e..7f6a4dd4d 100644
--- a/applications/plugins/totp/services/ui/ui_controls.c
+++ b/applications/plugins/totp/services/ui/ui_controls.c
@@ -5,11 +5,7 @@
 #define TEXT_BOX_HEIGHT 13
 #define TEXT_BOX_MARGIN 4
 
-void ui_control_text_box_render(
-    Canvas* const canvas,
-    int16_t y,
-    const char* text,
-    bool is_selected) {
+void ui_control_text_box_render(Canvas* const canvas, int8_t y, char* text, bool is_selected) {
     if(y < -TEXT_BOX_HEIGHT) {
         return;
     }
@@ -48,7 +44,7 @@ void ui_control_select_render(
     int16_t x,
     int16_t y,
     uint8_t width,
-    const char* text,
+    char* text,
     bool is_selected) {
     if(y < -TEXT_BOX_HEIGHT) {
         return;
@@ -103,7 +99,7 @@ void ui_control_button_render(
     int16_t y,
     uint8_t width,
     uint8_t height,
-    const char* text,
+    char* text,
     bool is_selected) {
     if(y < -height) {
         return;
diff --git a/applications/plugins/totp/services/ui/ui_controls.h b/applications/plugins/totp/services/ui/ui_controls.h
index ef3af5f55..e86b3e5d9 100644
--- a/applications/plugins/totp/services/ui/ui_controls.h
+++ b/applications/plugins/totp/services/ui/ui_controls.h
@@ -3,23 +3,19 @@
 #include <inttypes.h>
 #include <gui/gui.h>
 
-void ui_control_text_box_render(
-    Canvas* const canvas,
-    int16_t y,
-    const char* text,
-    bool is_selected);
+void ui_control_text_box_render(Canvas* const canvas, int8_t y, char* text, bool is_selected);
 void ui_control_button_render(
     Canvas* const canvas,
     int16_t x,
     int16_t y,
     uint8_t width,
     uint8_t height,
-    const char* text,
+    char* text,
     bool is_selected);
 void ui_control_select_render(
     Canvas* const canvas,
     int16_t x,
     int16_t y,
     uint8_t width,
-    const char* text,
+    char* text,
     bool is_selected);
diff --git a/applications/plugins/totp/totp_app.c b/applications/plugins/totp/totp_app.c
index f296a734b..ede8416b6 100644
--- a/applications/plugins/totp/totp_app.c
+++ b/applications/plugins/totp/totp_app.c
@@ -154,22 +154,22 @@ int32_t totp_app() {
         if(plugin_state->changing_scene) continue;
         FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
 
-        PluginState* plugin_state_m = acquire_mutex_block(&state_mutex);
+        PluginState* plugin_state = acquire_mutex_block(&state_mutex);
 
         if(event_status == FuriStatusOk) {
             if(event.type == EventTypeKey) {
                 last_user_interaction_time = furi_get_tick();
             }
 
-            processing = totp_scene_director_handle_event(&event, plugin_state_m);
+            processing = totp_scene_director_handle_event(&event, plugin_state);
         } else if(
-            plugin_state_m->pin_set && plugin_state_m->current_scene != TotpSceneAuthentication &&
+            plugin_state->pin_set && plugin_state->current_scene != TotpSceneAuthentication &&
             furi_get_tick() - last_user_interaction_time > IDLE_TIMEOUT) {
-            totp_scene_director_activate_scene(plugin_state_m, TotpSceneAuthentication, NULL);
+            totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
         }
 
         view_port_update(view_port);
-        release_mutex(&state_mutex, plugin_state_m);
+        release_mutex(&state_mutex, plugin_state);
     }
 
     view_port_enabled_set(view_port, false);
diff --git a/applications/plugins/totp/types/plugin_state.h b/applications/plugins/totp/types/plugin_state.h
index 26e7e244b..98afe53cf 100644
--- a/applications/plugins/totp/types/plugin_state.h
+++ b/applications/plugins/totp/types/plugin_state.h
@@ -22,7 +22,7 @@ typedef struct {
     uint8_t tokens_count;
 
     uint8_t* crypto_verify_data;
-    size_t crypto_verify_data_length;
+    uint8_t crypto_verify_data_length;
     bool pin_set;
     uint8_t iv[TOTP_IV_SIZE];
     uint8_t base_iv[TOTP_IV_SIZE];
diff --git a/applications/plugins/totp/types/token_info.c b/applications/plugins/totp/types/token_info.c
index 2a37c4d44..09ad1230a 100644
--- a/applications/plugins/totp/types/token_info.c
+++ b/applications/plugins/totp/types/token_info.c
@@ -5,7 +5,6 @@
 #include "common.h"
 #include "../services/base32/base32.h"
 #include "../services/crypto/crypto.h"
-#include "../services/crypto/memset_s.h"
 
 TokenInfo* token_info_alloc() {
     TokenInfo* tokenInfo = malloc(sizeof(TokenInfo));
@@ -24,7 +23,7 @@ void token_info_free(TokenInfo* token_info) {
 bool token_info_set_secret(
     TokenInfo* token_info,
     const char* base32_token_secret,
-    size_t token_secret_length,
+    uint8_t token_secret_length,
     uint8_t* iv) {
     uint8_t* plain_secret = malloc(token_secret_length);
     int plain_secret_length =
@@ -38,7 +37,7 @@ bool token_info_set_secret(
         result = false;
     }
 
-    memset_s(plain_secret, sizeof(plain_secret), 0, token_secret_length);
+    memset(plain_secret, 0, token_secret_length);
     free(plain_secret);
     return result;
 }
diff --git a/applications/plugins/totp/types/token_info.h b/applications/plugins/totp/types/token_info.h
index 3d0f0ec61..e40c6e9bf 100644
--- a/applications/plugins/totp/types/token_info.h
+++ b/applications/plugins/totp/types/token_info.h
@@ -8,7 +8,7 @@ typedef enum { TOTP_6_DIGITS, TOTP_8_DIGITS } TokenDigitsCount;
 
 typedef struct {
     uint8_t* token;
-    size_t token_length;
+    uint8_t token_length;
     char* name;
     TokenHashAlgo algo;
     TokenDigitsCount digits;
@@ -19,6 +19,6 @@ void token_info_free(TokenInfo* token_info);
 bool token_info_set_secret(
     TokenInfo* token_info,
     const char* base32_token_secret,
-    size_t token_secret_length,
+    uint8_t token_secret_length,
     uint8_t* iv);
 uint8_t token_info_get_digits_count(TokenInfo* token_info);