diff --git a/applications/fpvviewer/fpvv_mainform.lfm b/applications/fpvviewer/fpvv_mainform.lfm
index 9ffb46a5e..d4952c8c7 100644
--- a/applications/fpvviewer/fpvv_mainform.lfm
+++ b/applications/fpvviewer/fpvv_mainform.lfm
@@ -141,13 +141,13 @@ object frmFPVViewer: TfrmFPVViewer
       OnClick = buttonRenderingTestClick
       TabOrder = 4
     end
-    object Button1: TButton
+    object buttonConvertToSVG: TButton
       Left = 360
       Height = 25
       Top = 41
       Width = 120
       Caption = 'Convert to SVG'
-      OnClick = Button1Click
+      OnClick = buttonConvertToSVGClick
       TabOrder = 5
     end
     object btnContourLines: TButton
@@ -197,13 +197,13 @@ object frmFPVViewer: TfrmFPVViewer
       Caption = 'X adjustment:'
       ParentColor = False
     end
-    object Button2: TButton
+    object buttonViewFPVTokens: TButton
       Left = 312
       Height = 25
       Top = 70
       Width = 168
       Caption = 'View FPVectorial Tokens'
-      OnClick = Button2Click
+      OnClick = buttonViewFPVTokensClick
       TabOrder = 9
     end
     object Label4: TLabel
diff --git a/applications/fpvviewer/fpvv_mainform.pas b/applications/fpvviewer/fpvv_mainform.pas
index 4d7a62b25..41c6958ec 100644
--- a/applications/fpvviewer/fpvv_mainform.pas
+++ b/applications/fpvviewer/fpvv_mainform.pas
@@ -21,8 +21,8 @@ type
     btnSearchInTokens: TButton;
     btnViewDXFTokens: TButton;
     btnVisualize: TButton;
-    Button1: TButton;
-    Button2: TButton;
+    buttonConvertToSVG: TButton;
+    buttonViewFPVTokens: TButton;
     buttonAutoFit: TButton;
     buttonPrint: TButton;
     buttonAdjust: TButton;
@@ -52,8 +52,8 @@ type
     procedure btnSearchInTokensClick(Sender: TObject);
     procedure btnVisualizeClick(Sender: TObject);
     procedure btnViewDXFTokensClick(Sender: TObject);
-    procedure Button1Click(Sender: TObject);
-    procedure Button2Click(Sender: TObject);
+    procedure buttonConvertToSVGClick(Sender: TObject);
+    procedure buttonViewFPVTokensClick(Sender: TObject);
     procedure buttonAdjustClick(Sender: TObject);
     procedure buttonAutoFitClick(Sender: TObject);
     procedure buttonPrintClick(Sender: TObject);
@@ -293,7 +293,7 @@ begin
   end;
 end;
 
-procedure TfrmFPVViewer.Button1Click(Sender: TObject);
+procedure TfrmFPVViewer.buttonConvertToSVGClick(Sender: TObject);
 var
   Vec: TvVectorialDocument;
 begin
@@ -306,38 +306,9 @@ begin
   end;
 end;
 
-procedure TfrmFPVViewer.Button2Click(Sender: TObject);
-var
-  Vec: TvVectorialDocument;
-  i: Integer;
-  lCurPage: TvVectorialPage;
+procedure TfrmFPVViewer.buttonViewFPVTokensClick(Sender: TObject);
 begin
-  // First check the in input
-  //if not CheckInput() then Exit;
-
   notebook.PageIndex := 1;
-
-  {Vec := TvVectorialDocument.Create;
-  try
-    // some formats like HTML need an input of control size to render themselves
-    Vec.Width := Drawer.Width;
-    Vec.Height := Drawer.Height;
-
-    // read
-    Vec.ReadFromFile(editFileName.FileName);
-
-    // Generate the positioning info
-    for i := 0 to Vec.GetPageCount()-1 do
-    begin
-      if Vec.GetPageAsVectorial(i) <> nil then
-        Vec.GetPageAsVectorial(i).PositionEntitySubparts(Canvas, 0, 0);
-    end;
-
-    TokensTreeView.Items.Clear;
-    Vec.GenerateDebugTree(@FPVDebugAddItemProc);
-  finally
-    Vec.Free;
-  end; }
 end;
 
 procedure TfrmFPVViewer.buttonAdjustClick(Sender: TObject);
@@ -385,6 +356,10 @@ begin
     spinAdjustX.Value := lDeltaX;
     spinAdjustY.Value := lDeltaY;
     spinScale.Value := lZoom;
+
+    spinAdjustXChange(nil);
+    spinAdjustYChange(nil);
+    spinScaleChange(nil);
   finally
     Render_FreeFile();
   end;